create-nocobase-app 0.8.0-alpha.8 → 0.8.1-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "0.8.0-alpha.8",
+  "version": "0.8.1-alpha.2",
   "main": "src/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -24,5 +24,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/create-nocobase-app"
   },
-  "gitHead": "d53b20e08591651692c37b8bfdf1bfe59332bbdb"
+  "gitHead": "c638b5bb2f4a21405a64559dc12942b85904e3b6"
 }

package/src/generator.js

@@ -105,6 +105,15 @@ class AppGenerator extends Generator {
         break;
     }
 
+    const keys = ['PLUGIN_PACKAGE_PREFIX', 'DB_HOST', 'DB_PORT', 'DB_DATABASE', 'DB_USER', 'DB_PASSWORD', 'DB_STORAGE'];
+
+    for (const key in env) {
+      if (keys.includes(key)) {
+        continue;
+      }
+      envs.push(`${key}=${env[key]}`);
+    }
+
     return {
       ...this.context,
       dependencies: dependencies.join(`,\n    `),
@@ -114,6 +123,7 @@ class AppGenerator extends Generator {
         APP_ENV: 'development',
         DB_DIALECT: dbDialect,
         APP_KEY: crypto.randomBytes(256).toString('base64'),
+        PLUGIN_PACKAGE_PREFIX: `@nocobase/plugin-,@nocobase/preset-,@${this.context.name}/plugin-`,
         ...env,
       },
     };

package/templates/app/.env.tpl

@@ -5,6 +5,8 @@ APP_PORT={{{env.APP_PORT}}}
 API_BASE_PATH=/api/
 API_BASE_URL=
 
+PLUGIN_PACKAGE_PREFIX={{{env.PLUGIN_PACKAGE_PREFIX}}}
+
 DB_LOGGING=off
 DB_DIALECT={{{env.DB_DIALECT}}}
 {{{envs}}}

package/templates/app/tsconfig.json.tpl

@@ -20,7 +20,7 @@
       "@{{{name}}}/app-*": [
         "packages/app/*/src"
       ],
-      "@{{{name}}}/*": [
+      "@{{{name}}}/plugin-*": [
         "packages/plugins/*/src"
       ]
     }