@nocobase/devtools 0.7.0-alpha.81 → 0.7.1-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/devtools",
-  "version": "0.7.0-alpha.81",
+  "version": "0.7.1-alpha.4",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -11,7 +11,7 @@
   ],
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "0.7.0-alpha.81",
+    "@nocobase/build": "0.7.1-alpha.4",
     "@testing-library/react": "^12.1.2",
     "@types/jest": "^26.0.0",
     "@types/koa": "^2.13.4",
@@ -62,5 +62,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/devtools"
   },
-  "gitHead": "c84bcc9188a9f8d086a6e29b6b00921da030a296"
+  "gitHead": "570d039f1904a041729c1967c0637b1109c278a8"
 }

package/umiConfig.d.ts

@@ -1,18 +1,20 @@
 export declare function getUmiConfig(): {
   define: {
-      'process.env.API_BASE_URL': string;
+    'process.env.API_BASE_URL': string;
   };
   proxy: {
-      [x: string]: {
+    [x: string]:
+      | {
           target: string;
           changeOrigin: boolean;
-      } | {
+        }
+      | {
           target: string;
           changeOrigin: boolean;
           pathRewrite: {
-              [x: string]: string;
+            [x: string]: string;
           };
-      };
+        };
   };
 };
 

package/umiConfig.js

@@ -1,6 +1,7 @@
 const { existsSync } = require('fs');
 const { resolve } = require('path');
 const packageJson = require('./package.json');
+const fs = require('fs');
 
 console.log('VERSION: ', packageJson.version);
 
@@ -44,13 +45,25 @@ function getUmiConfig() {
 }
 
 function resolveNocobasePackagesAlias(config) {
-  const clientSrc = resolve(process.cwd(), './packages/core/client/src');
-  const utilsSrc = resolve(process.cwd(), './packages/core/utils/src');
-  if (existsSync(clientSrc)) {
-    config.module.rules.get('ts-in-node_modules').include.add(clientSrc);
-    config.resolve.alias.set('@nocobase/client', clientSrc);
-    config.module.rules.get('ts-in-node_modules').include.add(utilsSrc);
-    config.resolve.alias.set('@nocobase/utils', utilsSrc);
+  const coreDir = resolve(process.cwd(), './packages/core');
+  if (!existsSync(coreDir)) {
+    return;
+  }
+  const cores = fs.readdirSync(coreDir);
+  for (const package of cores) {
+    const packageSrc = resolve(process.cwd(), './packages/core/', package, 'src');
+    if (existsSync(packageSrc)) {
+      config.module.rules.get('ts-in-node_modules').include.add(packageSrc);
+      config.resolve.alias.set(`@nocobase/${package}`, packageSrc);
+    }
+  }
+  const plugins = fs.readdirSync(resolve(process.cwd(), './packages/plugins'));
+  for (const package of plugins) {
+    const packageSrc = resolve(process.cwd(), './packages/plugins/', package, 'src');
+    if (existsSync(packageSrc)) {
+      config.module.rules.get('ts-in-node_modules').include.add(packageSrc);
+      config.resolve.alias.set(`@nocobase/plugin-${package}`, packageSrc);
+    }
   }
 }