@nocobase/cli 0.11.1-alpha.5 → 0.12.0-alpha.2

package/bin/index.js

@@ -5,7 +5,6 @@ const { resolve } = require('path');
 const { existsSync } = require('fs');
 
 const env = {
-  APP_PACKAGE_ROOT: 'app',
   APP_ENV: 'development',
   APP_KEY: 'test-jwt-secret',
   APP_PORT: 13000,
@@ -17,6 +16,7 @@ const env = {
   LOCAL_STORAGE_DEST: 'storage/uploads',
   MFSU_AD: 'none',
   PM2_HOME: resolve(process.cwd(), './storage/.pm2'),
+  PLUGIN_PACKAGE_PREFIX: '@nocobase/plugin-,@nocobase/plugin-sample-,@nocobase/preset-',
 };
 
 if (!process.env.APP_ENV_PATH && process.argv[2] && process.argv[2] === 'test') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.11.1-alpha.5",
+  "version": "0.12.0-alpha.2",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,6 +8,7 @@
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
+    "@nocobase/app": "0.12.0-alpha.2",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -22,12 +23,12 @@
     "tsx": "^3.12.7"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.11.1-alpha.5"
+    "@nocobase/devtools": "0.12.0-alpha.2"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "1dcfd15a7d95a40b0a2f60e1de19ec574066fb20"
+  "gitHead": "a95e9e2666f0318c955113a4735bc005a2c9a767"
 }

package/src/commands/build.js

@@ -1,6 +1,6 @@
-const { resolve } = require('path');
+const { resolve, dirname } = require('path');
 const { Command } = require('commander');
-const { run, nodeCheck, isPackageValid, promptForTs } = require('../util');
+const { run, nodeCheck, isPackageValid, promptForTs, hasCorePackages } = require('../util');
 
 /**
  *
@@ -8,7 +8,7 @@ const { run, nodeCheck, isPackageValid, promptForTs } = require('../util');
  */
 module.exports = (cli) => {
   const { APP_PACKAGE_ROOT } = process.env;
-  const clientPackage = `${APP_PACKAGE_ROOT}/client`;
+  const clientPackage = `core/app`;
   cli
     .command('build')
     .allowUnknownOption()
@@ -24,13 +24,16 @@ module.exports = (cli) => {
           });
         }
       }
-      if (!pkgs.length || !pkgs.includes(clientPackage) || (pkgs.includes(clientPackage) && pkgs.length > 1)) {
-        await run('nocobase-build', process.argv.slice(3));
+      await run('nocobase-build', process.argv.slice(3));
+      if (!hasCorePackages()) {
+        return;
       }
       if (!pkgs.length || pkgs.includes(clientPackage)) {
+        const file = require.resolve('@nocobase/app');
         await run('umi', ['build'], {
           env: {
-            APP_ROOT: `packages/${APP_PACKAGE_ROOT}/client`,
+            APP_ROOT: `${dirname(dirname(file))}/client`,
+            NODE_ENV: 'production',
           },
         });
       }

package/src/commands/clean.js

@@ -14,6 +14,7 @@ module.exports = (cli) => {
       if (!isDev()) {
         return;
       }
+      run('rimraf', ['-rf', './storage/app-dev']);
       run('rimraf', ['-rf', './**/{.umi,.umi-production}']);
       run('rimraf', ['-rf', 'packages/*/*/{lib,esm,es,dist,node_modules}']);
     });

package/src/commands/dev.js

@@ -25,7 +25,7 @@ module.exports = (cli) => {
           './tsconfig.server.json',
           '-r',
           'tsconfig-paths/register',
-          `./packages/${APP_PACKAGE_ROOT}/server/src/index.ts`,
+          `${APP_PACKAGE_ROOT}/src/index.ts`,
           ...process.argv.slice(2),
         ]);
         return;
@@ -65,7 +65,7 @@ module.exports = (cli) => {
           './tsconfig.server.json',
           '-r',
           'tsconfig-paths/register',
-          `./packages/${APP_PACKAGE_ROOT}/server/src/index.ts`,
+          `${APP_PACKAGE_ROOT}/src/index.ts`,
           'start',
           ...process.argv.slice(3),
           `--port=${serverPort}`,
@@ -98,7 +98,7 @@ module.exports = (cli) => {
         run('umi', ['dev'], {
           env: {
             PORT: clientPort,
-            APP_ROOT: `packages/${APP_PACKAGE_ROOT}/client`,
+            APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
             PROXY_TARGET_URL:
               process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
           },

package/src/commands/global.js

@@ -20,11 +20,11 @@ module.exports = (cli) => {
           './tsconfig.server.json',
           '-r',
           'tsconfig-paths/register',
-          `./packages/${APP_PACKAGE_ROOT}/server/src/index.ts`,
+          `${APP_PACKAGE_ROOT}/src/index.ts`,
           ...process.argv.slice(2),
         ]);
       } else if (isProd()) {
-        run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, ...process.argv.slice(2)]);
+        run('node', [`${APP_PACKAGE_ROOT}/lib/index.js`, ...process.argv.slice(2)]);
       }
     });
 };

package/src/commands/index.js

@@ -1,11 +1,12 @@
 const { Command } = require('commander');
-const { isPackageValid } = require('../util');
+const { isPackageValid, generateAppDir } = require('../util');
 
 /**
  *
  * @param {Command} cli
  */
 module.exports = (cli) => {
+  generateAppDir();
   require('./global')(cli);
   require('./build')(cli);
   require('./dev')(cli);

package/src/commands/postinstall.js

@@ -31,7 +31,7 @@ module.exports = (cli) => {
       run('umi', ['generate', 'tmp'], {
         stdio: 'pipe',
         env: {
-          APP_ROOT: `packages/${APP_PACKAGE_ROOT}/client`,
+          APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
         },
       });
     });

package/src/commands/start.js

@@ -28,12 +28,12 @@ module.exports = (cli) => {
           './tsconfig.server.json',
           '-r',
           'tsconfig-paths/register',
-          `./packages/${APP_PACKAGE_ROOT}/server/src/index.ts`,
+          `${APP_PACKAGE_ROOT}/src/index.ts`,
           ...process.argv.slice(2),
         ]);
         return;
       }
-      if (!existsSync(resolve(process.cwd(), `./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`))) {
+      if (!existsSync(resolve(process.cwd(), `${APP_PACKAGE_ROOT}/lib/index.js`))) {
         console.log('The code is not compiled, please execute it first');
         console.log(chalk.yellow('$ yarn build'));
         console.log('If you want to run in development mode, please execute');
@@ -44,21 +44,21 @@ module.exports = (cli) => {
       const restartMark = resolve(process.cwd(), 'storage', 'restart');
       if (!existsSync(restartMark)) {
         if (opts.quickstart) {
-          await run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, 'install', '--ignore-installed']);
-          await run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, 'upgrade']);
+          await run('node', [`${APP_PACKAGE_ROOT}/lib/index.js`, 'install', '--ignore-installed']);
+          await run('node', [`${APP_PACKAGE_ROOT}/lib/index.js`, 'upgrade']);
         }
         if (opts.dbSync) {
-          await run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, 'db:sync']);
+          await run('node', [`${APP_PACKAGE_ROOT}/lib/index.js`, 'db:sync']);
         }
       }
       if (opts.daemon) {
-        run('pm2', ['start', `packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, '--', ...process.argv.slice(2)]);
+        run('pm2', ['start', `${APP_PACKAGE_ROOT}/lib/index.js`, '--', ...process.argv.slice(2)]);
       } else {
         run(
           'pm2-runtime',
           [
             'start',
-            `packages/${APP_PACKAGE_ROOT}/server/lib/index.js`,
+            `${APP_PACKAGE_ROOT}/lib/index.js`,
             NODE_ARGS ? `--node-args="${NODE_ARGS}"` : undefined,
             '--',
             ...process.argv.slice(2),

package/src/commands/umi.js

@@ -17,7 +17,7 @@ module.exports = (cli) => {
       }
       run('umi', process.argv.slice(3), {
         env: {
-          APP_ROOT: `packages/${APP_PACKAGE_ROOT}/client`,
+          APP_ROOT: `${APP_PACKAGE_ROOT}/client`,
         },
       });
     });

package/src/commands/upgrade.js

@@ -1,7 +1,8 @@
 const chalk = require('chalk');
 const { Command } = require('commander');
 const { resolve } = require('path');
-const { getVersion, run, promptForTs, runAppCommand, hasCorePackages, updateJsonFile, hasTsNode } = require('../util');
+const { run, promptForTs, runAppCommand, hasCorePackages, updateJsonFile, hasTsNode } = require('../util');
+const { existsSync, rmSync } = require('fs');
 
 /**
  *
@@ -25,25 +26,18 @@ module.exports = (cli) => {
         await runAppCommand('upgrade');
         return;
       }
-      await runAppCommand('upgrade');
-      // If ts-node is not installed, do not do the following
+      // await runAppCommand('upgrade');
       if (!hasTsNode()) {
+        await runAppCommand('upgrade');
         return;
       }
-      const version = await getVersion();
+      // If ts-node is not installed, do not do the following
+      const appDevDir = resolve(process.cwd(), './storage/.app-dev');
+      if (existsSync(appDevDir)) {
+        rmSync(appDevDir, { recursive: true, force: true });
+      }
       await run('yarn', ['add', '@nocobase/cli', '@nocobase/devtools', '-W']);
-      const clientPackage = resolve(process.cwd(), `packages/${APP_PACKAGE_ROOT}/client/package.json`);
-      const serverPackage = resolve(process.cwd(), `packages/${APP_PACKAGE_ROOT}/server/package.json`);
-      await updateJsonFile(clientPackage, (data) => {
-        data.devDependencies['@nocobase/client'] = version;
-        return data;
-      });
-      await updateJsonFile(serverPackage, (data) => {
-        data.dependencies['@nocobase/preset-nocobase'] = version;
-        return data;
-      });
       await run('yarn', ['install']);
-      await run('nocobase', ['build']);
       await runAppCommand('upgrade');
     });
 };

package/src/util.js

@@ -1,9 +1,9 @@
 const net = require('net');
 const chalk = require('chalk');
 const execa = require('execa');
-const { resolve } = require('path');
+const { dirname, resolve } = require('path');
 const { readFile, writeFile } = require('fs').promises;
-const { existsSync } = require('fs');
+const { existsSync, mkdirSync, cpSync } = require('fs');
 
 exports.isPackageValid = (package) => {
   try {
@@ -32,7 +32,7 @@ exports.isDev = function isDev() {
 
 const isProd = () => {
   const { APP_PACKAGE_ROOT } = process.env;
-  const file = `./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`;
+  const file = `${APP_PACKAGE_ROOT}/lib/index.js`;
   if (!existsSync(resolve(process.cwd(), file))) {
     console.log('For production environment, please build the code first.');
     console.log();
@@ -110,13 +110,13 @@ exports.runInstall = async () => {
       './tsconfig.server.json',
       '-r',
       'tsconfig-paths/register',
-      `./packages/${APP_PACKAGE_ROOT}/server/src/index.ts`,
+      `${APP_PACKAGE_ROOT}/src/index.ts`,
       'install',
       '-s',
     ];
     await exports.run('tsx', argv);
   } else if (isProd()) {
-    const file = `./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`;
+    const file = `${APP_PACKAGE_ROOT}/lib/index.js`;
     const argv = [file, 'install', '-s'];
     await exports.run('node', argv);
   }
@@ -131,13 +131,13 @@ exports.runAppCommand = async (command, args = []) => {
       './tsconfig.server.json',
       '-r',
       'tsconfig-paths/register',
-      `./packages/${APP_PACKAGE_ROOT}/server/src/index.ts`,
+      `${APP_PACKAGE_ROOT}/src/index.ts`,
       command,
       ...args,
     ];
     await exports.run('tsx', argv);
   } else if (isProd()) {
-    const argv = [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, command, ...args];
+    const argv = [`${APP_PACKAGE_ROOT}/lib/index.js`, command, ...args];
     await exports.run('node', argv);
   }
 };
@@ -157,3 +157,20 @@ exports.getVersion = async () => {
   const versions = new Function(`return (${stdout})`)();
   return versions[versions.length - 1];
 };
+
+exports.generateAppDir = function generateAppDir() {
+  const appPkgPath = dirname(dirname(require.resolve('@nocobase/app/src/index.ts')));
+  const appDevDir = resolve(process.cwd(), './storage/.app-dev');
+  if (exports.isDev() && !exports.hasCorePackages() && appPkgPath.includes('node_modules')) {
+    if (!existsSync(appDevDir)) {
+      mkdirSync(appDevDir, { force: true, recursive: true });
+      cpSync(appPkgPath, appDevDir, {
+        recursive: true,
+        force: true,
+      });
+    }
+    process.env.APP_PACKAGE_ROOT = appDevDir;
+  } else {
+    process.env.APP_PACKAGE_ROOT = appPkgPath;
+  }
+};

package/templates/plugin/.npmignore.tpl

@@ -0,0 +1,2 @@
+/node_modules
+/src

package/templates/plugin/client.d.ts

@@ -1,3 +1,2 @@
-export * from './src/client';
-export { default } from './src/client';
-
+export * from './dist/client';
+export { default } from './dist/client';

package/templates/plugin/client.js

@@ -1 +1 @@
-module.exports = require('./lib/client/index.js');
+module.exports = require('./dist/client/index.js');

package/templates/plugin/package.json.tpl

@@ -1,20 +1,11 @@
 {
   "name": "{{{packageName}}}",
   "version": "{{{packageVersion}}}",
-  "main": "lib/server/index.js",
-  "files": [
-    "lib",
-    "src",
-    "README.md",
-    "README.zh-CN.md",
-    "CHANGELOG.md",
-    "server.js",
-    "server.d.ts",
-    "client.js",
-    "client.d.ts"
-  ],
-  "devDependencies": {
-    "@nocobase/server": "{{{nocobaseVersion}}}",
-    "@nocobase/test": "{{{nocobaseVersion}}}"
+  "main": "dist/server/index.js",
+  "dependencies": {},
+  "peerDependencies": {
+    "@nocobase/client": "0.x",
+    "@nocobase/server": "0.x",
+    "@nocobase/test": "0.x"
   }
 }

package/templates/plugin/server.d.ts

@@ -1,3 +1,2 @@
-export * from './src/server';
-export { default } from './src/server';
-
+export * from './dist/server';
+export { default } from './dist/server';

package/templates/plugin/server.js

@@ -1 +1 @@
-module.exports = require('./lib/server/index.js');
+module.exports = require('./dist/server/index.js');

package/templates/plugin/src/client/index.tsx.tpl

@@ -2,7 +2,7 @@ import { Plugin } from '@nocobase/client';
 
 export class {{{pascalCaseName}}}Plugin extends Plugin {
   async afterAdd() {
-    // this.app.pm.add()
+    // await this.app.pm.add()
   }
 
   async beforeLoad() {}

package/templates/plugin/src/index.ts

@@ -1 +1,2 @@
+export * from './server';
 export { default } from './server';