@nocobase/devtools 0.8.0-alpha.9 → 0.8.1-alpha.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/devtools",
-  "version": "0.8.0-alpha.9",
+  "version": "0.8.1-alpha.3",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -11,7 +11,7 @@
   ],
   "main": "./src/index.js",
   "dependencies": {
-    "@nocobase/build": "0.8.0-alpha.9",
+    "@nocobase/build": "0.8.1-alpha.3",
     "@testing-library/react": "^12.1.2",
     "@types/jest": "^26.0.0",
     "@types/koa": "^2.13.4",
@@ -61,5 +61,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/devtools"
   },
-  "gitHead": "6afe02d59bb22df0f96a7605c9001dcc17a30d6a"
+  "gitHead": "e03df3df5962b99d9fbf5b6e33fbe2b23f14f3d3"
 }

package/umiConfig.js

@@ -1,7 +1,8 @@
 const { existsSync } = require('fs');
-const { resolve } = require('path');
+const { resolve, sep } = require('path');
 const packageJson = require('./package.json');
 const fs = require('fs');
+const glob = require('glob');
 
 console.log('VERSION: ', packageJson.version);
 
@@ -44,34 +45,49 @@ function getUmiConfig() {
   };
 }
 
-function resolveNocobasePackagesAlias(config) {
-  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);
+function getNamespace() {
+  const content = fs.readFileSync(resolve(process.cwd(), 'package.json'), 'utf-8');
+  const json = JSON.parse(content);
+  return json.name;
+}
+
+function getTsconfigPaths() {
+  const content = fs.readFileSync(resolve(process.cwd(), 'tsconfig.json'), 'utf-8');
+  const json = JSON.parse(content);
+  return json.compilerOptions.paths;
+}
+
+function getPackagePaths() {
+  const paths = getTsconfigPaths();
+  const pkgs = [];
+  for (const key in paths) {
+    if (Object.hasOwnProperty.call(paths, key)) {
+      const dir = paths[key][0];
+      if (dir.includes('*')) {
+        const files = glob.sync(dir);
+        for (const file of files) {
+          const dirname = resolve(process.cwd(), file);
+          if (existsSync(dirname)) {
+            const re = new RegExp(dir.replace('*', '(.+)'));
+            const p = dirname.substring(process.cwd().length + 1).split(sep).join('/');
+            const match = re.exec(p);
+            pkgs.push([key.replace('*', match?.[1]), dirname]);
+          }
+        }
+      } else {
+        const dirname = resolve(process.cwd(), dir);
+        pkgs.push([key, dirname]);
+      }
     }
   }
-  const samples = fs.readdirSync(resolve(process.cwd(), './packages/samples'));
-  for (const package of samples) {
-    const packageSrc = resolve(process.cwd(), './packages/samples/', package, 'src');
-    if (existsSync(packageSrc)) {
-      config.module.rules.get('ts-in-node_modules').include.add(packageSrc);
-      config.resolve.alias.set(`@nocobase/plugin-sample-${package}`, packageSrc);
-    }
+  return pkgs;
+}
+
+function resolveNocobasePackagesAlias(config) {
+  const pkgs = getPackagePaths();
+  for (const [pkg, dir] of pkgs) {
+    config.module.rules.get('ts-in-node_modules').include.add(dir);
+    config.resolve.alias.set(pkg, dir);
   }
 }