create-nocobase-app 1.6.22 → 1.6.24

package/lib/cli.js

@@ -14,7 +14,7 @@ const { AppGenerator } = require("./generator");
 const { concat } = require("./util");
 const packageJson = require("../package.json");
 const cli = new Command("create-nocobase");
-cli.arguments("<name>", "directory of new NocoBase app").option("--quickstart", "quickstart app creation").option("--skip-dev-dependencies").option("-a, --all-db-dialect", "install all database dialect dependencies").option("-d, --db-dialect <dbDialect>", "database dialect, current support mysql/postgres", "postgres").option("-e, --env <env>", "environment variables write into .env file", concat, []).description("create a new application").action(async (name, options) => {
+cli.arguments("<name>", "directory of new NocoBase app").option("--quickstart", "quickstart app creation").option("--skip-dev-dependencies").option("-a, --all-db-dialect", "install all database dialect dependencies").option("-d, --db-dialect [dbDialect]", "database dialect, current support postgres, mysql, mariadb, kingbase").option("-e, --env <env>", "environment variables write into .env file", concat, []).description("create a new application").action(async (name, options) => {
   if (options.quickstart) {
     console.log(`\u26A0\uFE0F  ${chalk.yellow("quickstart option is deprecated")}`);
   }

package/lib/generator.js

@@ -36,38 +36,12 @@ const _AppGenerator = class _AppGenerator extends Generator {
     }
     return items;
   }
-  checkDbEnv() {
-    const dialect = this.args.dbDialect;
-    const env = this.env;
-    if (dialect === "sqlite") {
-      return;
-    }
-    if (!env.DB_DATABASE || !env.DB_USER || !env.DB_PASSWORD) {
-      console.log(
-        chalk.red(
-          `Please set DB_HOST, DB_PORT, DB_DATABASE, DB_USER, DB_PASSWORD in .env file to complete database settings`
-        )
-      );
-    }
-  }
   checkProjectPath() {
     if (existsSync(this.cwd)) {
       console.log(chalk.red("Project directory already exists"));
       process.exit(1);
     }
   }
-  checkDialect() {
-    const dialect = this.args.dbDialect;
-    const supportDialects = ["mysql", "mariadb", "postgres"];
-    if (!supportDialects.includes(dialect)) {
-      console.log(
-        `dialect ${chalk.red(dialect)} is not supported, currently supported dialects are ${chalk.green(
-          supportDialects.join(",")
-        )}.`
-      );
-      process.exit(1);
-    }
-  }
   getContext() {
     const env = this.env;
     const envs = [];
@@ -148,22 +122,25 @@ const _AppGenerator = class _AppGenerator extends Generator {
   }
   async writing() {
     this.checkProjectPath();
-    this.checkDialect();
     const { name } = this.context;
     console.log(`Creating a new NocoBase application at ${chalk.green(name)}`);
     console.log("Creating files");
+    const context = this.getContext();
     this.copyDirectory({
-      context: this.getContext(),
+      context,
       path: join(__dirname, "../templates/app"),
       target: this.cwd
     });
-    this.checkDbEnv();
-    const skipDevDependencies = this.args.skipDevDependencies;
-    if (skipDevDependencies) {
-      const json = await fs.readJSON(join(this.cwd, "package.json"), "utf8");
-      delete json["devDependencies"];
-      await fs.writeJSON(join(this.cwd, "package.json"), json, { encoding: "utf8", spaces: 2 });
+    const json = {
+      name: context.name,
+      ...await fs.readJSON(join(this.cwd, "package.json"), "utf8")
+    };
+    json["dependencies"]["@nocobase/cli"] = context.version;
+    if (!this.args.skipDevDependencies) {
+      json["devDependencies"] = json["devDependencies"] || {};
+      json["devDependencies"]["@nocobase/devtools"] = context.version;
     }
+    await fs.writeJSON(join(this.cwd, "package.json"), json, { encoding: "utf8", spaces: 2 });
     console.log("");
     console.log(chalk.green(`$ cd ${name}`));
     console.log(chalk.green(`$ yarn install`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "1.6.22",
+  "version": "1.6.24",
   "main": "src/index.js",
   "license": "AGPL-3.0",
   "dependencies": {
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/create-nocobase-app"
   },
-  "gitHead": "321c0effa18670c0c3edfa09c79d535351ef2b0d"
+  "gitHead": "d453b271bc1dedb56af2252dcb5d1a3ab9828ca1"
 }

package/src/cli.js

@@ -21,7 +21,7 @@ cli
   .option('--quickstart', 'quickstart app creation')
   .option('--skip-dev-dependencies')
   .option('-a, --all-db-dialect', 'install all database dialect dependencies')
-  .option('-d, --db-dialect <dbDialect>', 'database dialect, current support mysql/postgres', 'postgres')
+  .option('-d, --db-dialect [dbDialect]', 'database dialect, current support postgres, mysql, mariadb, kingbase')
   .option('-e, --env <env>', 'environment variables write into .env file', concat, [])
   .description('create a new application')
   .action(async (name, options) => {

package/src/generator.js

@@ -37,21 +37,6 @@ class AppGenerator extends Generator {
     return items;
   }
 
-  checkDbEnv() {
-    const dialect = this.args.dbDialect;
-    const env = this.env;
-    if (dialect === 'sqlite') {
-      return;
-    }
-    if (!env.DB_DATABASE || !env.DB_USER || !env.DB_PASSWORD) {
-      console.log(
-        chalk.red(
-          `Please set DB_HOST, DB_PORT, DB_DATABASE, DB_USER, DB_PASSWORD in .env file to complete database settings`,
-        ),
-      );
-    }
-  }
-
   checkProjectPath() {
     if (existsSync(this.cwd)) {
       console.log(chalk.red('Project directory already exists'));
@@ -59,19 +44,6 @@ class AppGenerator extends Generator {
     }
   }
 
-  checkDialect() {
-    const dialect = this.args.dbDialect;
-    const supportDialects = ['mysql', 'mariadb', 'postgres'];
-    if (!supportDialects.includes(dialect)) {
-      console.log(
-        `dialect ${chalk.red(dialect)} is not supported, currently supported dialects are ${chalk.green(
-          supportDialects.join(','),
-        )}.`,
-      );
-      process.exit(1);
-    }
-  }
-
   getContext() {
     const env = this.env;
     const envs = [];
@@ -158,28 +130,33 @@ class AppGenerator extends Generator {
 
   async writing() {
     this.checkProjectPath();
-    this.checkDialect();
 
     const { name } = this.context;
 
     console.log(`Creating a new NocoBase application at ${chalk.green(name)}`);
     console.log('Creating files');
 
+    const context = this.getContext();
+
     this.copyDirectory({
-      context: this.getContext(),
+      context,
       path: join(__dirname, '../templates/app'),
       target: this.cwd,
     });
 
-    this.checkDbEnv();
+    const json = {
+      name: context.name,
+      ...(await fs.readJSON(join(this.cwd, 'package.json'), 'utf8')),
+    };
+
+    json['dependencies']['@nocobase/cli'] = context.version;
 
-    const skipDevDependencies = this.args.skipDevDependencies;
-    if (skipDevDependencies) {
-      const json = await fs.readJSON(join(this.cwd, 'package.json'), 'utf8');
-      delete json['devDependencies'];
-      await fs.writeJSON(join(this.cwd, 'package.json'), json, { encoding: 'utf8', spaces: 2 });
+    if (!this.args.skipDevDependencies) {
+      json['devDependencies'] = json['devDependencies'] || {};
+      json['devDependencies']['@nocobase/devtools'] = context.version;
     }
 
+    await fs.writeJSON(join(this.cwd, 'package.json'), json, { encoding: 'utf8', spaces: 2 });
     console.log('');
     console.log(chalk.green(`$ cd ${name}`));
     console.log(chalk.green(`$ yarn install`));

package/templates/app/{package.json.tpl → package.json}

@@ -1,5 +1,4 @@
 {
-  "name": "{{{name}}}",
   "private": true,
   "workspaces": [
     "packages/*/*",
@@ -34,11 +33,10 @@
     "semver": "^7.7.1"
   },
   "dependencies": {
-    "@nocobase/cli": "{{{version}}}",
     "pm2": "^6.0.5",
-    {{{dependencies}}}
-  },
-  "devDependencies": {
-    "@nocobase/devtools": "{{{version}}}"
+    "mysql2": "^3.14.0",
+    "mariadb": "^3.4.1",
+    "pg": "^8.14.1",
+    "pg-hstore": "^2.3.4"
   }
-}
+}