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

package/lib/AppGenerator/AppGenerator.js

@@ -63,8 +63,7 @@ class AppGenerator extends _utils().Generator {
     return _asyncToGenerator(function* () {
       _this.copyDirectory({
         context: _objectSpread({
-          version: require('../../package').version,
-          conventionRoutes: _this.args.conventionRoutes
+          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  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        conventionRoutes: this.args.conventionRoutes,\n        ...this.tplContext\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

@@ -97,7 +97,7 @@ const program = new (_commander().default.Command)(packageJson.name).version(pac
       console.log();
       console.log(`  ${_utils().chalk.cyan('cd')} ${directory}`);
       console.log(`  ${cmd} install`);
-      console.log(`  ${cmd} nocobase init --import-demo`);
+      console.log(`  ${cmd} nocobase init${(0, _utils2.hasYarn)() ? '' : ' --'} --import-demo`);
       console.log(`  ${cmd} start`);
       console.log();
       return;
@@ -153,7 +153,7 @@ const program = new (_commander().default.Command)(packageJson.name).version(pac
       console.log('You can start by doing:');
       console.log();
       console.log(`  ${_utils().chalk.cyan('cd')} ${directory}`);
-      console.log(`  ${cmd} nocobase init --import-demo`);
+      console.log(`  ${cmd} nocobase init${(0, _utils2.hasYarn)() ? '' : ' --'} --import-demo`);
       console.log(`  ${cmd} start`);
       console.log();
     }

package/lib/cli.js.map

@@ -1 +1 @@
-{"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 --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 --import-demo`);\n      console.log(`  ${cmd} start`);\n      console.log();\n    }\n  })\n  .showHelpAfterError()\n  .parse(process.argv);\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/utils/index.js

@@ -57,6 +57,6 @@ function runStart(path) {
 }
 
 function runInit(path) {
-  return runYarn(path, ['run', 'nocobase', 'init', '--import-demo']);
+  return runYarn(path, ['run', 'nocobase', 'init', hasYarn() ? '--import-demo' : '-- --import-demo']);
 }
 //# sourceMappingURL=index.js.map

package/lib/utils/index.js.map

@@ -1 +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', '--import-demo']);\n}\n"],"file":"index.js"}
+{"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.21",
+  "version": "0.5.0-alpha.22",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -23,5 +23,5 @@
   "bin": {
     "create-nocobase-app": "bin/create-nocobase-app.js"
   },
-  "gitHead": "181872cf075dd9e65f9f2ff0d1ff18c541e0d7cd"
+  "gitHead": "22534716700c4ade1727b6e04543725c5e4f14f2"
 }

package/templates/AppGenerator/.env.example

@@ -1,5 +1,4 @@
 ########## DOCKER COMPOSE ENV ##########
-
 ADMINER_PORT=8080
 DB_MYSQL_PORT=3306
 DB_POSTGRES_PORT=5432
@@ -10,13 +9,16 @@ 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
 
-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=
 

package/templates/AppGenerator/.env.tpl

@@ -9,18 +9,15 @@ API_PORT=13002
 ########## NOCOBASE ENV ##########
 
 # DATABASE
-{{#quickstart}}
 DB_DIALECT=sqlite
 DB_STORAGE=db.sqlite
-{{/quickstart}}
-{{^quickstart}}
-DB_DIALECT=postgres
-DB_HOST=localhost
-DB_PORT=5432
-DB_DATABASE=nocobase
-DB_USER=nocobase
-DB_PASSWORD=nocobase
-{{/quickstart}}
+
+# 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=

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 || "http://127.0.0.1",
-    'process.env.API_PORT': process.env.API_PORT || "13001",
+    '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 || "13001"}/`,
-      '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/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,10 +1,11 @@
 import path from 'path';
 import Application from '@nocobase/server';
+import dbConfig from './config/db';
 
 const start = Date.now();
 
 const api = new Application({
-  database: require('./config/db').default,
+  database: dbConfig[process.env.DB_DIALECT || 'sqlite'],
   resourcer: {
     prefix: '/api',
   },
@@ -29,7 +30,7 @@ for (const plugin of plugins) {
 
 api.plugin(require(`@nocobase/plugin-client/lib/server`).default, {
   dist: path.resolve(process.cwd(), './dist'),
-  importDemo: true,
+  // importDemo: true,
 });
 
 if (process.argv.length < 3) {

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

@@ -1,36 +0,0 @@
-import { DatabaseOptions } from '@nocobase/database';
-{{#quickstart}}
-export default {
-  dialect: process.env.DB_DIALECT,
-  dialectModule: require('sqlite3'),
-  storage: process.env.DB_STORAGE
-} as DatabaseOptions;
-{{/quickstart}}
-{{^quickstart}}
-export default {
-  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,
-    },
-  },
-} as DatabaseOptions;
-{{/quickstart}}