create-nocobase-app 0.7.0-alpha.3 → 0.7.0-alpha.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "0.7.0-alpha.3",
+  "version": "0.7.0-alpha.32",
   "main": "src/index.js",
   "license": "Apache-2.0",
   "licenses": [
@@ -16,6 +16,7 @@
     "commander": "^8.2.0",
     "execa": "5",
     "fs-extra": "^10.0.1",
+    "lodash": "^4.17.21",
     "ora": "^5.4.1",
     "tar": "^6.1.11"
   },
@@ -25,5 +26,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/create-nocobase-app"
   },
-  "gitHead": "b12507f6e4bcb5f1fd8285670a43fb3807d90ea0"
+  "gitHead": "fbe14de5c02aeaa460d143245abf317c4ff2e3a9"
 }

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;
@@ -53,7 +54,7 @@ const getDatabaseOptionsFromCommandOptions = (commandOptions) => {
   if (!commandOptions.dbDialect || commandOptions.dbDialect === 'sqlite' || envs['DB_STORAGE']) {
     return {
       dialect: 'sqlite',
-      storage: envs['DB_STORAGE'] || 'db.sqlite',
+      storage: envs['DB_STORAGE'] || 'storage/db/nocobase.sqlite',
     };
   }
 
@@ -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/storage/db/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

package/src/resources/files/storage/uploads/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

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/env.js

@@ -22,7 +22,7 @@ module.exports = (options) => {
 
   for (const env of Object.entries(envs)) {
     const [key, value] = env;
-    const re = new RegExp(`${key}=\\w+`);
+    const re = new RegExp(`^${key}=(.+)`, 'm');
     if (envContent.match(re)) {
       envContent = envContent.replace(re, `${key}=${value}`);
     } else {

package/src/resources/templates/env.template

@@ -1,26 +1,31 @@
+################# NOCOBASE APPLICATION #################
+
 NOCOBASE_ENV=development
+JWT_SECRET=<%= jwtSecret %>
 
 SERVER_HOST=0.0.0.0
 SERVER_PORT=3000
 
-JWT_SECRET=<%= jwtSecret %>
-
 # api base path endpoint for app(web)
 SERVER_BASE_PATH=/api/
 
 # api server access point for app(web when build)
 SERVER_BASE_URL=
 
+################# DATABASE #################
+
 DB_LOG_SQL=off
 <%= dbEnvs %>
 
+################# STORAGE (Initialization only) #################
+
 # local or ali-oss
 DEFAULT_STORAGE_TYPE=local
-STORAGE_TYPE=local
 
 # LOCAL STORAGE
 LOCAL_STORAGE_USE_STATIC_SERVER=true
 LOCAL_STORAGE_BASE_URL=
+LOCAL_STORAGE_DEST=storage/uploads
 
 # ALI OSS STORAGE
 ALI_OSS_STORAGE_BASE_URL=

package/src/resources/templates/load-src-from-npm.js

@@ -1,7 +1,7 @@
 const execa = require('execa');
 const axios = require('axios');
 const fs = require('fs');
-const fsP = require('fs/promises');
+const fsP = require('fs').promises;
 const tar = require('tar');
 const { join } = require('path');
 const crypto = require('crypto');
@@ -40,9 +40,9 @@ module.exports = async (packageName, target) => {
     cwd: target,
     strip: 1,
     k: true,
-    filter(path, entry) {
-      return !(path.startsWith('package/lib') || path.startsWith('package/esm') || path.startsWith('package/dist'));
-    },
+    // filter(path, entry) {
+    //   return !(path.startsWith('package/lib') || path.startsWith('package/esm') || path.startsWith('package/dist'));
+    // },
   });
 
   await fsP.unlink(tarballFile);

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

@@ -7,13 +7,15 @@ module.exports = (opts) => {
     workspaces: ['packages/app/*', 'packages/plugins/*'],
     license: 'MIT',
     scripts: {
-      start: 'concurrently --kill-others "npm run start-server" "npm run start-client"',
+      start: 'concurrently --kill-others "yarn start-server -s" "yarn start-client"',
       bootstrap: 'lerna bootstrap',
       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',
-      'start-client': 'cd packages/app/client && npm run start',
-      'start-server': 'npm run nocobase start',
+      'nocobase-prod': 'cross-env DOTENV_CONFIG_PATH=.env node -r dotenv/config packages/app/server/lib/index.js',
+      'start-client': 'cd packages/app/client && yarn start',
+      'start-server': 'yarn nocobase start',
+      'start-pm2': 'pm2-runtime start --node-args="-r dotenv/config" packages/app/server/lib/index.js -- start',
       build: 'lerna run build',
       'build-docs': 'dumi build',
       test: 'node ./jest.cli.js -i',
@@ -23,6 +25,11 @@ module.exports = (opts) => {
       '@types/react': '^17.0.0',
       '@types/react-dom': '^17.0.0',
     },
+    dependencies: {
+      'cross-env': '^7.0.3',
+      dotenv: '^10.0.0',
+      pm2: '^5.2.0',
+    },
     devDependencies: {
       '@testing-library/react': '^12.1.2',
       '@types/jest': '^26.0.0',
@@ -32,8 +39,6 @@ module.exports = (opts) => {
       '@typescript-eslint/eslint-plugin': '^4.9.1',
       '@typescript-eslint/parser': '^4.8.2',
       concurrently: '^7.0.0',
-      'cross-env': '^7.0.3',
-      dotenv: '^10.0.0',
       eslint: '^7.14.0',
       'eslint-config-prettier': '^7.0.0',
       'eslint-plugin-import': '^2.13.0',

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: {