create-nocobase-app 0.5.0-alpha.18 → 0.5.0-alpha.22

package/lib/AppGenerator/AppGenerator.js

@@ -37,20 +37,34 @@ function _path() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
 class AppGenerator extends _utils().Generator {
+  constructor(...args) {
+    super(...args);
+    this.tplContext = {};
+  }
+
+  setTplContext(context) {
+    this.tplContext = context;
+  }
+
   writing() {
     var _this = this;
 
     return _asyncToGenerator(function* () {
       _this.copyDirectory({
-        context: {
-          version: require('../../package').version,
-          conventionRoutes: _this.args.conventionRoutes
-        },
+        context: _objectSpread({
+          version: require('../../package').version
+        }, _this.tplContext),
         path: (0, _path().join)(__dirname, '../../templates/AppGenerator'),
         target: _this.cwd
       });

package/lib/AppGenerator/AppGenerator.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"mappings":"","sources":["AppGenerator/AppGenerator.ts"],"sourcesContent":["import { Generator } from '@umijs/utils';\nimport { join } from 'path';\n\nexport default class AppGenerator extends Generator {\n  async writing() {\n    this.copyDirectory({\n      context: {\n        version: require('../../package').version,\n        conventionRoutes: this.args.conventionRoutes,\n      },\n      path: join(__dirname, '../../templates/AppGenerator'),\n      target: this.cwd,\n    });\n  }\n}\n"],"file":"AppGenerator.js"}
+{"version":3,"names":[],"mappings":"","sources":["AppGenerator/AppGenerator.ts"],"sourcesContent":["import { Generator } from '@umijs/utils';\nimport { join } from 'path';\n\nexport default class AppGenerator extends Generator {\n  private tplContext = {};\n\n  setTplContext(context) {\n    this.tplContext = context;\n  }\n\n  async writing() {\n    this.copyDirectory({\n      context: {\n        version: require('../../package').version,\n        ...this.tplContext\n      },\n      path: join(__dirname, '../../templates/AppGenerator'),\n      target: this.cwd,\n    });\n  }\n}\n"],"file":"AppGenerator.js"}

package/lib/cli.js

@@ -20,10 +20,10 @@ function _utils() {
   return data;
 }
 
-function _fs() {
-  const data = require("fs");
+function _commander() {
+  const data = _interopRequireDefault(require("commander"));
 
-  _fs = function _fs() {
+  _commander = function _commander() {
     return data;
   };
 
@@ -31,7 +31,7 @@ function _fs() {
 }
 
 function _path() {
-  const data = require("path");
+  const data = _interopRequireDefault(require("path"));
 
   _path = function _path() {
     return data;
@@ -40,32 +40,127 @@ function _path() {
   return data;
 }
 
+function _ora() {
+  const data = _interopRequireDefault(require("ora"));
+
+  _ora = function _ora() {
+    return data;
+  };
+
+  return data;
+}
+
+var _utils2 = require("./utils");
+
+function _execa() {
+  const data = _interopRequireDefault(require("execa"));
+
+  _execa = function _execa() {
+    return data;
+  };
+
+  return data;
+}
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const args = (0, _utils().yParser)(process.argv.slice(2), {
-  alias: {
-    version: ['v'],
-    help: ['h']
-  },
-  boolean: ['version']
-});
-
-if (args.version && !args._[0]) {
-  args._[0] = 'version';
-  const local = (0, _fs().existsSync)((0, _path().join)(__dirname, '../.local')) ? _utils().chalk.cyan('@local') : '';
-
-  const _require = require('../package.json'),
-        name = _require.name,
-        version = _require.version;
-
-  console.log(`${name}@${version}${local}`);
-} else {
-  require('./').default({
-    cwd: process.cwd(),
-    args
-  }).catch(err => {
-    console.error(`Create failed, ${err.message}`);
-    console.error(err);
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+const packageJson = require('../package.json');
+
+const program = new (_commander().default.Command)(packageJson.name).version(packageJson.version).option('--simple', 'create nocobase app without install dependencies').option('--quickstart', 'create quickstart nocobase app').arguments('<project-directory>').usage(`${_utils().chalk.green('<project-directory>')}`).action( /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator(function* (directory, options) {
+    var _runner$stdout, _runner$stderr;
+
+    console.log(`Creating a new Nocobase application at ${_utils().chalk.green(directory)}.`);
+    console.log('Creating files.');
+
+    const fullPath = _path().default.join(process.cwd(), directory);
+
+    yield require('./index').default({
+      cwd: fullPath,
+      args: {},
+      tplContext: options.quickstart ? {
+        quickstart: true
+      } : {
+        quickstart: false
+      }
+    });
+
+    const cmd = _utils().chalk.cyan((0, _utils2.hasYarn)() ? 'yarn' : 'npm run');
+
+    if (options.simple) {
+      console.log();
+      console.log('Done. You can start by doing:');
+      console.log();
+      console.log(`  ${_utils().chalk.cyan('cd')} ${directory}`);
+      console.log(`  ${cmd} install`);
+      console.log(`  ${cmd} nocobase init${(0, _utils2.hasYarn)() ? '' : ' --'} --import-demo`);
+      console.log(`  ${cmd} start`);
+      console.log();
+      return;
+    }
+
+    const installPrefix = _utils().chalk.yellow('Installing dependencies:');
+
+    const loader = (0, _ora().default)(installPrefix).start();
+
+    const logInstall = (chunk = '') => {
+      loader.text = `${installPrefix} ${chunk.toString().split('\n').join(' ')}`;
+    };
+
+    const runner = (0, _utils2.runInstall)(fullPath);
+    runner === null || runner === void 0 ? void 0 : (_runner$stdout = runner.stdout) === null || _runner$stdout === void 0 ? void 0 : _runner$stdout.on('data', logInstall);
+    runner === null || runner === void 0 ? void 0 : (_runner$stderr = runner.stderr) === null || _runner$stderr === void 0 ? void 0 : _runner$stderr.on('data', logInstall);
+    yield runner;
+    loader.stop();
+    console.log(`Dependencies installed ${_utils().chalk.green('successfully')}.`);
+    console.log();
+    console.log(`Your application was created at ${_utils().chalk.green(directory)}.\n`);
+
+    if (options.quickstart) {
+      // Using Sqlite as Database
+      const prefix = _utils().chalk.yellow('Nocobase init');
+
+      const initLoader = (0, _ora().default)(prefix).start();
+
+      try {
+        const initLog = (chunk = '') => {
+          initLoader.text = `${prefix} ${chunk.toString().split('\n').join(' ')}`;
+        };
+
+        const init = (0, _utils2.runInit)(fullPath);
+        init.stderr.on('data', initLog);
+        init.stdout.on('data', initLog);
+        yield init;
+        initLoader.stop();
+      } catch (e) {
+        initLoader.stop();
+        console.log();
+        console.log(e.message);
+        process.exit(1);
+      }
+
+      console.log(`Running your application.`);
+      yield (0, _execa().default)('npm', ['run', 'start'], {
+        stdio: 'inherit',
+        cwd: fullPath
+      });
+    } else {
+      console.log();
+      console.log('You can start by doing:');
+      console.log();
+      console.log(`  ${_utils().chalk.cyan('cd')} ${directory}`);
+      console.log(`  ${cmd} nocobase init${(0, _utils2.hasYarn)() ? '' : ' --'} --import-demo`);
+      console.log(`  ${cmd} start`);
+      console.log();
+    }
   });
-}
+
+  return function (_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}()).showHelpAfterError().parse(process.argv);
 //# sourceMappingURL=cli.js.map

package/lib/cli.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"mappings":"","sources":["cli.ts"],"sourcesContent":["import { chalk, yParser } from '@umijs/utils';\nimport { existsSync } from 'fs';\nimport { join } from 'path';\n\nconst args = yParser(process.argv.slice(2), {\n  alias: {\n    version: ['v'],\n    help: ['h'],\n  },\n  boolean: ['version'],\n});\n\nif (args.version && !args._[0]) {\n  args._[0] = 'version';\n  const local = existsSync(join(__dirname, '../.local'))\n    ? chalk.cyan('@local')\n    : '';\n  const { name, version } = require('../package.json');\n  console.log(`${name}@${version}${local}`);\n} else {\n  require('./')\n    .default({\n      cwd: process.cwd(),\n      args,\n    })\n    .catch((err: Error) => {\n      console.error(`Create failed, ${err.message}`);\n      console.error(err);\n    });\n}\n"],"file":"cli.js"}
+{"version":3,"names":[],"mappings":"","sources":["cli.ts"],"sourcesContent":["import { chalk } from '@umijs/utils';\nimport commander from 'commander';\nimport path from 'path';\nimport ora from 'ora';\nimport { hasYarn, runInit, runInstall, runStart } from './utils';\nimport execa from 'execa';\n\nconst packageJson = require('../package.json');\n\nconst program = new commander.Command(packageJson.name)\n  .version(packageJson.version)\n  .option('--simple', 'create nocobase app without install dependencies')\n  .option('--quickstart', 'create quickstart nocobase app')\n  .arguments('<project-directory>')\n  .usage(`${chalk.green('<project-directory>')}`)\n  .action(async (directory, options) => {\n    console.log(\n      `Creating a new Nocobase application at ${chalk.green(directory)}.`,\n    );\n    console.log('Creating files.');\n\n    const fullPath = path.join(process.cwd(), directory);\n\n    await require('./index').default({\n      cwd: fullPath,\n      args: {},\n      tplContext: options.quickstart\n        ? { quickstart: true }\n        : { quickstart: false },\n    });\n\n    const cmd = chalk.cyan(hasYarn() ? 'yarn' : 'npm run');\n\n    if (options.simple) {\n      console.log();\n      console.log('Done. You can start by doing:');\n      console.log();\n      console.log(`  ${chalk.cyan('cd')} ${directory}`);\n      console.log(`  ${cmd} install`);\n      console.log(`  ${cmd} nocobase init${hasYarn() ? '' : ' --'} --import-demo`);\n      console.log(`  ${cmd} start`);\n      console.log();\n      return;\n    }\n\n    const installPrefix = chalk.yellow('Installing dependencies:');\n    const loader = ora(installPrefix).start();\n    const logInstall = (chunk = '') => {\n      loader.text = `${installPrefix} ${chunk\n        .toString()\n        .split('\\n')\n        .join(' ')}`;\n    };\n\n    const runner = runInstall(fullPath);\n\n    runner?.stdout?.on('data', logInstall);\n    runner?.stderr?.on('data', logInstall);\n\n    await runner;\n    loader.stop();\n    console.log(`Dependencies installed ${chalk.green('successfully')}.`);\n    console.log();\n    console.log(`Your application was created at ${chalk.green(directory)}.\\n`);\n\n    if (options.quickstart) {\n      // Using Sqlite as Database\n      const prefix = chalk.yellow('Nocobase init');\n      const initLoader = ora(prefix).start();\n\n      try {\n        const initLog = (chunk = '') => {\n          initLoader.text = `${prefix} ${chunk\n            .toString()\n            .split('\\n')\n            .join(' ')}`;\n        };\n\n        const init = runInit(fullPath);\n        init.stderr.on('data', initLog);\n        init.stdout.on('data', initLog);\n        await init;\n        initLoader.stop();\n      } catch (e) {\n        initLoader.stop();\n        console.log();\n        console.log(e.message);\n        process.exit(1);\n      }\n\n      console.log(`Running your application.`);\n      await execa('npm', ['run', 'start'], {\n        stdio: 'inherit',\n        cwd: fullPath,\n      });\n    } else {\n      console.log();\n      console.log('You can start by doing:');\n      console.log();\n      console.log(`  ${chalk.cyan('cd')} ${directory}`);\n      console.log(`  ${cmd} nocobase init${hasYarn() ? '' : ' --'} --import-demo`);\n      console.log(`  ${cmd} start`);\n      console.log();\n    }\n  })\n  .showHelpAfterError()\n  .parse(process.argv);\n"],"file":"cli.js"}

package/lib/index.js

@@ -26,12 +26,14 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var _default = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(function* ({
     cwd,
-    args
+    args,
+    tplContext
   }) {
     const generator = new _AppGenerator.default({
       cwd,
       args
     });
+    generator.setTplContext(tplContext);
     yield generator.run();
   });
 

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"names":[],"mappings":"","sources":["index.ts"],"sourcesContent":["import { yargs } from '@umijs/utils';\nimport AppGenerator from './AppGenerator/AppGenerator';\n\nexport default async ({\n  cwd,\n  args,\n}: {\n  cwd: string;\n  args: yargs.Arguments;\n}) => {\n  const generator = new AppGenerator({\n    cwd,\n    args,\n  });\n  await generator.run();\n};\n"],"file":"index.js"}
+{"version":3,"names":[],"mappings":"","sources":["index.ts"],"sourcesContent":["import { yargs } from '@umijs/utils';\nimport AppGenerator from './AppGenerator/AppGenerator';\n\nexport default async ({\n  cwd,\n  args,\n  tplContext\n}: {\n  cwd: string;\n  args: yargs.Arguments;\n  tplContext: object\n}) => {\n  const generator = new AppGenerator({\n    cwd,\n    args,\n  });\n\n  generator.setTplContext(tplContext);\n  await generator.run();\n};\n"],"file":"index.js"}

package/lib/utils/index.js

@@ -0,0 +1,62 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.hasYarn = hasYarn;
+exports.runInstall = runInstall;
+exports.runStart = runStart;
+exports.runInit = runInit;
+
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+
+  _react = function _react() {
+    return data;
+  };
+
+  return data;
+}
+
+function _execa() {
+  const data = _interopRequireDefault(require("execa"));
+
+  _execa = function _execa() {
+    return data;
+  };
+
+  return data;
+}
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function hasYarn() {
+  return (process.env.npm_config_user_agent || '').indexOf('yarn') === 0;
+}
+
+function runYarn(path, args) {
+  if (hasYarn()) {
+    return (0, _execa().default)('yarn', args, {
+      cwd: path,
+      stdin: 'ignore'
+    });
+  }
+
+  return (0, _execa().default)('npm', args, {
+    cwd: path,
+    stdin: 'ignore'
+  });
+}
+
+function runInstall(path) {
+  return runYarn(path, ['install']);
+}
+
+function runStart(path) {
+  return runYarn(path, ['run', 'start']);
+}
+
+function runInit(path) {
+  return runYarn(path, ['run', 'nocobase', 'init', hasYarn() ? '--import-demo' : '-- --import-demo']);
+}
+//# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"mappings":"","sources":["utils/index.ts"],"sourcesContent":["import execa from 'execa';\n\nexport function hasYarn() {\n  return (process.env.npm_config_user_agent || '').indexOf('yarn') === 0;\n}\n\nfunction runYarn(path: string, args: string[]) {\n  if (hasYarn()) {\n    return execa('yarn', args, {\n      cwd: path,\n      stdin: 'ignore',\n    });\n  }\n\n  return execa('npm', args, { cwd: path, stdin: 'ignore' });\n}\n\nexport function runInstall(path) {\n  return runYarn(path, ['install']);\n}\n\nexport function runStart(path) {\n  return runYarn(path, ['run', 'start']);\n}\n\nexport function runInit(path) {\n  return runYarn(path, ['run', 'nocobase', 'init', hasYarn() ? '--import-demo' : '-- --import-demo']);\n}\n"],"file":"index.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "0.5.0-alpha.18",
+  "version": "0.5.0-alpha.22",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -15,10 +15,13 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@umijs/utils": "3.5.17"
+    "@umijs/utils": "3.5.17",
+    "commander": "^8.2.0",
+    "execa": "^5.1.1",
+    "ora": "^5.4.1"
   },
   "bin": {
     "create-nocobase-app": "bin/create-nocobase-app.js"
   },
-  "gitHead": "516c1be50dbe548be18a1433ea6e0a59e28bb8b8"
+  "gitHead": "22534716700c4ade1727b6e04543725c5e4f14f2"
 }

package/templates/AppGenerator/.env.example

@@ -1,33 +1,26 @@
 ########## DOCKER COMPOSE ENV ##########
-
-DB_POSTGRES_PORT=15432
-APP_PORT=13000
-ADMINER_PORT=18080
+ADMINER_PORT=8080
+DB_MYSQL_PORT=3306
+DB_POSTGRES_PORT=5432
+VERDACCIO_PORT=4873
+APP_PORT=13001
+API_PORT=13002
 
 ########## NOCOBASE ENV ##########
 
 # DATABASE
+DB_DIALECT=sqlite
+DB_STORAGE=db.sqlite
 
-DB_DIALECT=postgres
-DB_DATABASE=nocobase
-DB_USER=nocobase
-DB_PASSWORD=nocobase
-# set to 'on' to enable log
-DB_LOG_SQL=
-
-# for localhost
-DB_PORT=15432
-DB_HOST=localhost
-
-# for docker
+# DB_DIALECT=postgres
+# DB_HOST=localhost
 # DB_PORT=5432
-# DB_HOST=postgres
-
-# API & APP
+# DB_DATABASE=nocobase
+# DB_USER=nocobase
+# DB_PASSWORD=nocobase
 
-NOCOBASE_ENV=
-API_PORT=13001
-API_URL=/api/
+# set to 'on' to enable log
+DB_LOG_SQL=
 
 # ADMIN USER (Initialization only)
 
@@ -41,4 +34,11 @@ STORAGE_TYPE=local
 
 # LOCAL STORAGE
 LOCAL_STORAGE_USE_STATIC_SERVER=true
-LOCAL_STORAGE_BASE_URL=http://localhost:23000
+LOCAL_STORAGE_BASE_URL=http://localhost:13002
+
+# ALI OSS STORAGE
+ALI_OSS_STORAGE_BASE_URL=
+ALI_OSS_REGION=oss-cn-beijing
+ALI_OSS_ACCESS_KEY_ID=
+ALI_OSS_ACCESS_KEY_SECRET=
+ALI_OSS_BUCKET=

package/templates/AppGenerator/.env.tpl

@@ -0,0 +1,44 @@
+########## DOCKER COMPOSE ENV ##########
+ADMINER_PORT=8080
+DB_MYSQL_PORT=3306
+DB_POSTGRES_PORT=5432
+VERDACCIO_PORT=4873
+APP_PORT=13001
+API_PORT=13002
+
+########## NOCOBASE ENV ##########
+
+# DATABASE
+DB_DIALECT=sqlite
+DB_STORAGE=db.sqlite
+
+# DB_DIALECT=postgres
+# DB_HOST=localhost
+# DB_PORT=5432
+# DB_DATABASE=nocobase
+# DB_USER=nocobase
+# DB_PASSWORD=nocobase
+
+# set to 'on' to enable log
+DB_LOG_SQL=
+
+# ADMIN USER (Initialization only)
+
+ADMIN_EMAIL=admin@nocobase.com
+ADMIN_PASSWORD=admin
+
+# STORAGE (Initialization only)
+
+# local or ali-oss
+STORAGE_TYPE=local
+
+# LOCAL STORAGE
+LOCAL_STORAGE_USE_STATIC_SERVER=true
+LOCAL_STORAGE_BASE_URL=http://localhost:13002
+
+# ALI OSS STORAGE
+ALI_OSS_STORAGE_BASE_URL=
+ALI_OSS_REGION=oss-cn-beijing
+ALI_OSS_ACCESS_KEY_ID=
+ALI_OSS_ACCESS_KEY_SECRET=
+ALI_OSS_BUCKET=

package/templates/AppGenerator/.umirc.ts

@@ -7,23 +7,22 @@ dotenv.config({
 });
 
 export default defineConfig({
+  favicon: '/favicon.png',
   nodeModulesTransform: {
     type: 'none',
   },
   define: {
-    'process.env.API_URL': process.env.API_URL,
-    'process.env.API_PORT': process.env.API_PORT,
+    'process.env.API_URL': process.env.API_URL || 'http://127.0.0.1',
+    'process.env.API_PORT': process.env.API_PORT || '13001',
   },
   proxy: {
     '/api': {
-      'target': `http://localhost:${process.env.API_PORT}/`,
-      'changeOrigin': true,
-      'pathRewrite': { '^/api': '/api' },
+      target: `http://localhost:${process.env.API_PORT || '13001'}/`,
+      changeOrigin: true,
+      pathRewrite: { '^/api': '/api' },
     },
   },
-  routes: [
-    { path: '/', exact: false, component: '@/pages/index' },
-  ],
+  routes: [{ path: '/', exact: false, component: '@/pages/index' }],
   fastRefresh: {},
   locale: {
     default: 'zh-CN',

package/templates/AppGenerator/package.json.tpl

@@ -5,7 +5,7 @@
     "start": "concurrently \"npm run start-server\" \"umi dev\"",
     "start-client": "umi dev",
     "start-server": "ts-node-dev -r dotenv/config --project tsconfig.apis.json ./src/apis/index.ts",
-    "nocobase": "ts-node-dev -r dotenv/config --project tsconfig.apis.json ./src/apis/index.ts",
+    "nocobase": "ts-node -r dotenv/config --project tsconfig.apis.json ./src/apis/index.ts",
     "serve": "node -r dotenv/config ./lib/apis/index.js",
     "build": "npm run build-server && npm run build-client",
     "build-client": "umi build",
@@ -27,7 +27,8 @@
     ]
   },
   "dependencies": {
-    "@nocobase/plugin-action-logs": "^{{{ version }}}",
+    {{#quickstart}}"sqlite3": "https://github.com/mapbox/node-sqlite3/tarball/master",
+    {{/quickstart}}"@nocobase/plugin-action-logs": "^{{{ version }}}",
     "@nocobase/plugin-china-region": "^{{{ version }}}",
     "@nocobase/plugin-client": "^{{{ version }}}",
     "@nocobase/plugin-collections": "^{{{ version }}}",

package/templates/AppGenerator/src/apis/config/db.ts

@@ -0,0 +1,32 @@
+import path from 'path';
+import { DatabaseOptions } from '@nocobase/database';
+
+export default {
+  sqlite: {
+    dialect: 'sqlite',
+    dialectModule: require('sqlite3'),
+    storage: process.env.DB_STORAGE || path.resolve(process.cwd(), './db.sqlite'),
+    logging: process.env.DB_LOG_SQL === 'on' ? console.log : false,
+  },
+  postgres: {
+    username: process.env.DB_USER,
+    password: process.env.DB_PASSWORD,
+    database: process.env.DB_DATABASE,
+    host: process.env.DB_HOST,
+    port: process.env.DB_PORT as any,
+    dialect: 'postgres',
+    dialectOptions: {
+      charset: 'utf8mb4',
+      collate: 'utf8mb4_unicode_ci',
+    },
+    logging: process.env.DB_LOG_SQL === 'on' ? console.log : false,
+    sync: {
+      force: false,
+      alter: {
+        drop: false,
+      },
+    },
+  },
+} as {
+  [key: string]: DatabaseOptions,
+};

package/templates/AppGenerator/src/apis/index.ts

@@ -1,35 +1,11 @@
-import Server from '@nocobase/server';
 import path from 'path';
+import Application from '@nocobase/server';
+import dbConfig from './config/db';
 
 const start = Date.now();
 
-const api = new Server({
-  database: {
-    username: process.env.DB_USER,
-    password: process.env.DB_PASSWORD,
-    database: process.env.DB_DATABASE,
-    host: process.env.DB_HOST,
-    port: process.env.DB_PORT as any,
-    dialect: process.env.DB_DIALECT as any,
-    dialectOptions: {
-      charset: 'utf8mb4',
-      collate: 'utf8mb4_unicode_ci',
-    },
-    pool: {
-      max: 5,
-      min: 0,
-      acquire: 60000,
-      idle: 10000,
-    },
-    logging: process.env.DB_LOG_SQL === 'on' ? console.log : false,
-    define: {},
-    sync: {
-      force: false,
-      alter: {
-        drop: false,
-      },
-    },
-  },
+const api = new Application({
+  database: dbConfig[process.env.DB_DIALECT || 'sqlite'],
   resourcer: {
     prefix: '/api',
   },
@@ -49,24 +25,19 @@ const plugins = [
 ];
 
 for (const plugin of plugins) {
-  api.plugin(
-    require(`${plugin}/lib/server`).default,
-  );
+  api.plugin(require(`${plugin}/lib/server`).default);
 }
 
-api.plugin(
-  require(`@nocobase/plugin-client/lib/server`).default, {
+api.plugin(require(`@nocobase/plugin-client/lib/server`).default, {
   dist: path.resolve(process.cwd(), './dist'),
-  importDemo: true,
+  // importDemo: true,
 });
 
 if (process.argv.length < 3) {
   // @ts-ignore
-  process.argv.push('start', '--port', process.env.API_PORT);
+  process.argv.push('start', '--port', process.env.API_PORT || '13001');
 }
 
-console.log(process.argv);
-
 api.parse(process.argv).then(() => {
   console.log(`Start-up time: ${(Date.now() - start) / 1000}s`);
 });