Yuki Takei 3 лет назад
Родитель
Сommit
1f7702988e

+ 7 - 4
.github/workflows/ci-slackbot-proxy.yml

@@ -48,16 +48,19 @@ jobs:
         restore-keys: |
           node_modules-${{ runner.OS }}-node${{ matrix.node-version }}-
 
-    - name: lerna bootstrap
+    - name: Install dependencies
       run: |
-        npx lerna bootstrap -- --frozen-lockfile
+        yarn --frozen-lockfile
 
     - name: yarn lint
+      working-directory: ./apps/slackbot-proxy
       run: |
-        yarn lerna run lint --scope @growi/slack --scope @growi/slackbot-proxy
+        yarn lint
+
     - name: yarn test
+      working-directory: ./apps/slackbot-proxy
       run: |
-        yarn lerna run test --scope @growi/slack --scope @growi/slackbot-proxy
+        yarn test
 
     - name: Slack Notification
       uses: weseek/ghaction-slack-notification@master

+ 1 - 1
apps/app/tsconfig.build.client.json

@@ -19,7 +19,7 @@
       "@growi/remark-growi-directive": ["../../packages/remark-growi-directive/src"],
       "@growi/remark-lsx": ["../../packages/remark-lsx/src"],
       "@growi/remark-lsx/*": ["../../packages/remark-lsx/src/*"],
-      "@growi/slack": ["../../packages/slack/src"],
+      // "@growi/slack": ["../../packages/slack/src"],
       "@growi/ui": ["../../packages/ui/src"],
 
       "debug": ["./src/server/utils/logger/alias-for-debug"]

+ 1 - 1
apps/app/tsconfig.json

@@ -17,7 +17,7 @@
       "@growi/remark-growi-directive": ["../../packages/remark-growi-directive/src"],
       "@growi/remark-lsx": ["../../packages/remark-lsx/src"],
       "@growi/remark-lsx/*": ["../../packages/remark-lsx/src/*"],
-      "@growi/slack": ["../../packages/slack/src"],
+      // "@growi/slack": ["../../packages/slack/src"],
       "@growi/ui": ["../../packages/ui/src"],
 
       "debug": ["./src/server/utils/logger/alias-for-debug"]

+ 1 - 0
packages/slack/.eslintignore

@@ -1 +1,2 @@
 /dist/**
+/types/**

+ 1 - 0
packages/slack/.gitignore

@@ -1 +1,2 @@
 /dist
+/types

+ 0 - 3
packages/slack/jest.config.js

@@ -2,9 +2,6 @@
 // https://jestjs.io/docs/en/configuration.html
 
 const MODULE_NAME_MAPPING = {
-  '^\\^/(.+)$': '<rootDir>/$1',
-  '^~/(.+)$': '<rootDir>/src/$1',
-  '^@growi/(.+)$': '<rootDir>/../$1/src',
 };
 
 module.exports = {

+ 9 - 9
packages/slack/package.json

@@ -2,16 +2,16 @@
   "name": "@growi/slack",
   "version": "6.0.7-RC.0",
   "license": "MIT",
-  "main": "dist/index.js",
-  "typings": "dist/index.d.ts",
+  "main": "dist/slack.umd.js",
+  "module": "dist/slack.mjs",
+  "types": "types/index.d.ts",
   "scripts": {
-    "build": "yarn tsc && tsc-alias -p tsconfig.build.json",
-    "clean": "npx -y shx rm -rf dist",
-    "tsc": "tsc -p tsconfig.build.json",
-    "tsc:w": "yarn tsc -w",
-    "test": "cross-env NODE_ENV=test jest --passWithNoTests",
-    "lint": "eslint src --ext .ts",
-    "lint:fix": "eslint src --ext .ts --fix"
+    "build": "vite build",
+    "clean": "npx -y shx rm -rf dist types",
+    "dev": "vite build --mode dev",
+    "watch": "yarn dev -w'",
+    "lint:js": "eslint **/*.{js,ts}",
+    "lint": "npm-run-all -p lint:*"
   },
   "dependencies": {
     "@slack/oauth": "^2.0.1",

+ 0 - 12
packages/slack/tsconfig.base.json

@@ -1,12 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/tsconfig",
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-  },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "**/*.test.ts"
-  ]
-}

+ 0 - 17
packages/slack/tsconfig.build.json

@@ -1,17 +0,0 @@
-{
-  "$schema": "http://json.schemastore.org/tsconfig",
-  "extends": "./tsconfig.base.json",
-  "compilerOptions": {
-    "rootDir": "./src",
-    "outDir": "dist",
-    "declaration": true,
-    "noResolve": false,
-    "preserveConstEnums": true,
-    "sourceMap": false,
-    "noEmit": false,
-
-    "baseUrl": ".",
-    "paths": {
-    }
-  }
-}

+ 6 - 4
packages/slack/tsconfig.json

@@ -1,11 +1,13 @@
 {
   "$schema": "http://json.schemastore.org/tsconfig",
-  "extends": "./tsconfig.base.json",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
-      "~/*": ["./src/*"],
-      "@growi/*": ["../*/src"]
+      "~/*": ["./src/*"]
     }
-  }
+  },
+  "include": [
+    "src"
+  ]
 }

+ 31 - 0
packages/slack/vite.config.ts

@@ -0,0 +1,31 @@
+import { defineConfig } from 'vite';
+import dts from 'vite-plugin-dts';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [
+    dts({ outputDir: 'types' }),
+  ],
+  build: {
+    outDir: 'dist',
+    lib: {
+      entry: 'src/index.ts',
+      name: 'slack-libs',
+      formats: ['es', 'umd'],
+    },
+    rollupOptions: {
+      external: [
+        'assert',
+        'axios',
+        'crypto',
+        'date-fns',
+        'express',
+        'extensible-custom-error',
+        'http-errors',
+        'bunyan', 'universal-bunyan',
+        'url-join',
+        /^@slack\/.*/,
+      ],
+    },
+  },
+});

+ 3 - 0
turbo.json

@@ -39,6 +39,9 @@
     "@growi/app#lint": {
       "dependsOn": ["^dev"]
     },
+    "@growi/slackbot-proxy#lint": {
+      "dependsOn": ["@growi/slack#dev"]
+    },
     "lint": {
     },