Merge branch 'master' into pics

.gitlab-ci.yml

@@ -8,17 +8,33 @@ variables:
   CONTAINER_TEST_ARM_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-arm
   CONTAINER_TEST_X86_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
   CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
-before_script:
-  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-build-x86:
+
+build_package:
   stage: build
+  tags: 
+    - linux
+  script:
+    - npm ci
+    - npm run build
+  artifacts:
+    paths:
+      - dist/
+
+.docker_op:
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
   tags:
     - docker
+
+build-x86:
+  extends: .docker_op
+  stage: build
   script:
     - TARGET_IMAGE=$CONTAINER_TEST_X86_IMAGE
     - docker build --pull -t $TARGET_IMAGE .
     - docker push $TARGET_IMAGE
 build-arm:
+  extends: .docker_op
   stage: build
   tags:
     - docker-arm
@@ -28,8 +44,6 @@ build-arm:
     - docker push $TARGET_IMAGE
 combine:
   stage: combine
-  tags:
-    - docker
   script:
     - TARGET_IMAGE=$CONTAINER_TEST_IMAGE
     - SOURCE_IMAGE_2=$CONTAINER_TEST_ARM_IMAGE
@@ -41,8 +55,6 @@ combine:
     - docker manifest push $TARGET_IMAGE
 deploy_latest:
   stage: deploy
-  tags:
-    - docker
   script:
     - TARGET_IMAGE=$CONTAINER_RELEASE_IMAGE
     - SOURCE_IMAGE=$CONTAINER_TEST_IMAGE
@@ -52,9 +64,8 @@ deploy_latest:
   only:
     - master
 deploy_tag:
+  extends: .docker_op
   stage: deploy
-  tags:
-    - docker
   script:
     - TARGET_IMAGE=$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
     - SOURCE_IMAGE=$CONTAINER_TEST_IMAGE
@@ -63,3 +74,16 @@ deploy_tag:
     - docker push $TARGET_IMAGE
   only:
     - tags
+
+deploy_npm:
+  stage: deploy
+  dependencies:
+    - build_package
+  tags:
+    - linux
+  script:
+    - apt update;apt -y install coreutils
+    - echo $NPMRC | base64 --decode > ~/.npmrc
+    - npm publish . || true
+  only:
+    - master

package.json

@@ -5,13 +5,17 @@
   "scripts": {
     "lint": "eslint --fix .",
     "build": "tsc",
-    "plugin": "node dist/install-plugin.js",
+    "plugin": "node dist/entry.js install",
+    "prod": "node dist/entry.js prod",
     "start": "koishi start"
   },
   "repository": {
     "type": "git",
     "url": "https://code.mycard.moe/3rdeye/koishi-bootstrap.git"
   },
+  "bin": {
+    "koishi-bs": "./dist/entry.js"
+  },
   "author": "Nanahira <nanahira@momobako.com>",
   "license": "MIT",
   "keywords": [],

src/entry.ts

+import { installPluginEntry } from './install-plugin';
+import { prodEntry } from './prod';
+
+const choice = process.argv[2];
+
+switch (choice) {
+  case 'install':
+    installPluginEntry();
+    break;
+  case 'prod':
+    prodEntry();
+    break;
+  default:
+    console.log(`Unknown command '${choice}'.`);
+    process.exit(1);
+}

src/install-plugin.ts

@@ -6,6 +6,7 @@ import { exec } from 'child_process';
 import { promisify } from 'util';
 import loadJsonFile from 'load-json-file';
 import path from 'path';
+import { getPackageJsonPackages } from './utils/read-package-json';
 const execAsync = promisify(exec);
 
 const logger = new Logger('bootstrap');
@@ -36,11 +37,6 @@ async function loadConfig(): Promise<KoishiConfig | undefined> {
   }
 }
 
-async function getPackageJsonPackages() {
-  const { dependencies } = await loadJsonFile<PackageConfig>('./package.json');
-  return dependencies;
-}
-
 async function checkPluginExists(
   name: string,
   allowCommunity: boolean,
@@ -143,8 +139,8 @@ async function installPlugin(name: string, info: any) {
   }
 }
 
-async function main() {
-  logger.info(`Bootstrapping`);
+export async function installPluginEntry() {
+  logger.info(`Bootstrapping...`);
   const config = await loadConfig();
   const plugins = config?.plugins;
   if (!plugins) {
@@ -161,4 +157,3 @@ async function main() {
   }
   logger.info(`Bootstrap finished.`);
 }
-main();

src/prod.ts

+import path from 'path';
+import { getPackageJsonPackages } from './utils/read-package-json';
+import fs from 'fs';
+
+async function handlePackageEntry(packageName: string, versionString: string) {
+  if (!versionString.startsWith('file:')) {
+    return;
+  }
+  console.log(`Cleaning package ${packageName}...`);
+  const packagePath = versionString.slice(5);
+  const packagesToRemove = ['koishi', '@koishijs/core', '@koishijs/utils'].map(
+    (p) => path.join(packagePath, 'node_modules', p),
+  );
+  await Promise.all(
+    packagesToRemove.map(async (path) => {
+      try {
+        await fs.promises.access(path);
+        console.log(`Removing ${path} ...`);
+        // await fs.promises.rmdir(path, { recursive: true });
+      } catch (e) {}
+    }),
+  );
+}
+
+export async function prodEntry() {
+  console.log(`Running production preparations...`);
+  const deps = await getPackageJsonPackages();
+  const entries = Object.entries(deps);
+  await Promise.all(
+    entries.map((entry) => handlePackageEntry(entry[0], entry[1])),
+  );
+  console.log(`Done.`);
+}

src/utils/read-package-json.ts

+import loadJsonFile from 'load-json-file';
+import { PackageConfig } from '../def/interfaces';
+
+export async function getPackageJsonPackages() {
+  const { dependencies } = await loadJsonFile<PackageConfig>('./package.json');
+  return dependencies;
+}