Merge remote-tracking branch 'bp/main'

waitingsong · Apr 8, 2024 · b5ee381 · b5ee381
2 parents 03121c8 + 35092d0
commit b5ee381
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 86 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -155,14 +155,16 @@
   "workbench.editor.customLabels.enabled": true,
   "workbench.editor.customLabels.patterns": {
     "src/app/**/*.ts": "${dirname}/${filename}",
-    "test/**/*": "${dirname}/${filename}.${extname} - test",
-    "dist/**/*": "${dirname}/${filename}.${extname} - dist",
-    "packages/**/src/app/**": "${dirname(1)}/${dirname}/${filename}",
-    "packages/**/src/*": "${dirname(1)}/${dirname}/${filename}.${extname}",
-    "packages/**/test/*": "${dirname(1)}/${dirname}/${filename}.${extname}",
-    "packages/**/src/**/*": "${dirname(1)}/${dirname}/${filename}.${extname} - ${dirname(2)}",
-    "packages/**/test/**/*": "${dirname(1)}/${dirname}/${filename}.${extname} - ${dirname(2)}",
-    "packages/**/*": "${dirname(1)}/${dirname}/${filename}.${extname}",
-    "**/*": "${dirname}/${filename}.${extname}"
+    "src/**": "${dirname}/${filename}.${extname}"
+    "test/**": "${dirname}/${filename}.${extname} - test",
+    "dist/**": "${dirname}/${filename}.${extname} - dist",
+    "packages/*/src/app/**": "${dirname(1)}/${dirname}/${filename} src",
+    "packages/*/src/*.*": "${filename}.${extname} src",
+    "packages/*/test/*.*": "${filename}.${extname} test",
+    "packages/*/src/**": "${dirname}/${filename}.${extname} - src",
+    "packages/*/test/**": "${dirname}/${filename}.${extname} - test",
+    "packages/*/*.*": "${dirname}/${filename}.${extname}",
+    "packages/*/**": "${dirname(1)}/${dirname}/${filename}.${extname}",
+    "**/node_modules/**/*": "${filename}.${extname} - ${dirname(2)}/${dirname(1)}/${dirname}"
   }
 }
diff --git a/.vscode/settings.json.example b/.vscode/settings.json.example
@@ -155,14 +155,16 @@
   "workbench.editor.customLabels.enabled": true,
   "workbench.editor.customLabels.patterns": {
     "src/app/**/*.ts": "${dirname}/${filename}",
-    "test/**/*": "${dirname}/${filename}.${extname} - test",
-    "dist/**/*": "${dirname}/${filename}.${extname} - dist",
-    "packages/**/src/app/**": "${dirname(1)}/${dirname}/${filename}",
-    "packages/**/src/*": "${dirname(1)}/${dirname}/${filename}.${extname}",
-    "packages/**/test/*": "${dirname(1)}/${dirname}/${filename}.${extname}",
-    "packages/**/src/**/*": "${dirname(1)}/${dirname}/${filename}.${extname} - ${dirname(2)}",
-    "packages/**/test/**/*": "${dirname(1)}/${dirname}/${filename}.${extname} - ${dirname(2)}",
-    "packages/**/*": "${dirname(1)}/${dirname}/${filename}.${extname}",
-    "**/*": "${dirname}/${filename}.${extname}"
+    "src/**": "${dirname}/${filename}.${extname}"
+    "test/**": "${dirname}/${filename}.${extname} - test",
+    "dist/**": "${dirname}/${filename}.${extname} - dist",
+    "packages/*/src/app/**": "${dirname(1)}/${dirname}/${filename} src",
+    "packages/*/src/*.*": "${filename}.${extname} src",
+    "packages/*/test/*.*": "${filename}.${extname} test",
+    "packages/*/src/**": "${dirname}/${filename}.${extname} - src",
+    "packages/*/test/**": "${dirname}/${filename}.${extname} - test",
+    "packages/*/*.*": "${dirname}/${filename}.${extname}",
+    "packages/*/**": "${dirname(1)}/${dirname}/${filename}.${extname}",
+    "**/node_modules/**/*": "${filename}.${extname} - ${dirname(2)}/${dirname(1)}/${dirname}"
   }
 }
diff --git a/packages/mw-demo/src/index.ts b/packages/mw-demo/src/index.ts
@@ -8,14 +8,9 @@ import {
 
 export { AutoConfiguration as Configuration } from './configuration.js'
 export * from './app/index.controller.js'
+export * from './interface.js'
 export * from './lib/index.js'
 export * from './middleware/index.middleware.js'
-export {
-  getComponentConfig,
-  getMiddlewareConfig,
-} from './util/common.js'
-
-export * from './interface.js'
 
 // @ts-expect-error for midway
 declare module '@midwayjs/core/dist/interface' {

diff --git a/packages/mw-demo/src/util/common.ts b/packages/mw-demo/src/util/common.ts