create-nocobase-app 0.7.0-alpha.6 → 0.7.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "0.7.0-alpha.6",
+  "version": "0.7.0-alpha.9",
   "main": "src/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -25,5 +25,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/create-nocobase-app"
   },
-  "gitHead": "7d0087cbb3b7663ba05366ca3b80db2853669ee9"
+  "gitHead": "79d5b309fb92148162bfedfb7e304b4673faf568"
 }

package/src/create-app.js

@@ -9,6 +9,7 @@ const { join, resolve } = require('path');
 const createEnvFile = require('./resources/templates/env');
 const createPackageJson = require('./resources/templates/package.json.js');
 const createServerPackageJson = require('./resources/templates/server.package.json.js');
+const createClientPackageJson = require('./resources/templates/client.package.json.js');
 const loadSrcFromNpm = require('./resources/templates/load-src-from-npm');
 
 let envs = undefined;
@@ -135,6 +136,17 @@ async function createApp(directory, options) {
     },
   );
 
+  // write client package.json
+  await fse.writeJson(
+    join(projectPath, 'packages/app/client/package.json'),
+    createClientPackageJson({
+      projectPath,
+    }),
+    {
+      spaces: 2,
+    },
+  );
+
   // run install command
   console.log('finished');
 }

package/src/resources/files/tsconfig.jest.json

@@ -8,9 +8,7 @@
     "allowJs": true,
     "module": "commonjs",
     "target": "es6",
-    "paths": {
-      "@nocobase/*": ["./packages/*/src"]
-    }
+    "paths": {}
   },
   "exclude": ["./packages/*/esm", "./packages/*/lib"]
 }

package/src/resources/files/tsconfig.json

@@ -16,8 +16,6 @@
     "experimentalDecorators": true,
     "downlevelIteration": true,
     "baseUrl": ".",
-    "paths": {
-      "@nocobase/*": ["packages/*/src"]
-    }
+    "paths": {}
   }
 }

package/src/resources/templates/client.package.json.js

@@ -0,0 +1,16 @@
+const path = require('path');
+
+module.exports = (opts) => {
+  const { projectPath } = opts;
+  const templateJsonPath = path.join(projectPath, 'packages/app/client/package.json');
+  const templateJson = require(templateJsonPath);
+
+  return {
+    ...templateJson,
+    name: 'app-client',
+    version: '0.1.0',
+    dependencies: {
+      ...templateJson.dependencies,
+    },
+  };
+};

package/src/resources/templates/package.json.js

@@ -12,6 +12,7 @@ module.exports = (opts) => {
       clean: 'rimraf -rf packages/{app,plugins}/*/{lib,esm,dist} && lerna clean',
       nocobase:
         'cross-env DOTENV_CONFIG_PATH=.env ts-node-dev -r dotenv/config -r tsconfig-paths/register ./packages/app/server/src/index.ts',
+      'nocobase-prod': 'cross-env DOTENV_CONFIG_PATH=.env node -r dotenv/config packages/app/server/lib/index.js',
       'start-client': 'cd packages/app/client && npm run start',
       'start-server': 'npm run nocobase start',
       build: 'lerna run build',

package/src/resources/templates/server.package.json.js

@@ -27,7 +27,7 @@ module.exports = (opts) => {
 
   return {
     ...templateJson,
-    name: 'server',
+    name: 'app-server',
     version: '0.1.0',
     main: 'index.js',
     dependencies: {