@nocobase/cli 0.7.0-alpha.83 → 0.7.1-alpha.6

package/bin/index.js

@@ -2,6 +2,7 @@
 
 const dotenv = require('dotenv');
 const { resolve } = require('path');
+const { existsSync } = require('fs');
 
 const env = {
   APP_PACKAGE_ROOT: 'app',
@@ -20,6 +21,12 @@ if ('v18' === process.version.split('.').shift()) {
   process.env.NODE_OPTIONS = '--openssl-legacy-provider';
 }
 
+if (!process.env.APP_ENV_PATH && process.argv[2] && process.argv[2] === 'test') {
+  if (existsSync(resolve(process.cwd(), '.env.test'))) {
+    process.env.APP_ENV_PATH = '.env.test';
+  }
+}
+
 dotenv.config({
   path: resolve(process.cwd(), process.env.APP_ENV_PATH || '.env'),
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.7.0-alpha.83",
+  "version": "0.7.1-alpha.6",
   "description": "",
   "license": "Apache-2.0",
   "licenses": [
@@ -23,12 +23,12 @@
     "serve": "^13.0.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.7.0-alpha.83"
+    "@nocobase/devtools": "0.7.1-alpha.6"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "838f4f18dcd9ed4fe2ae2660a4918e2a5bd3a869"
+  "gitHead": "b6f96c97020d278ae597bf05553442d7516b2216"
 }

package/src/commands/dev.js

@@ -73,7 +73,7 @@ module.exports = (cli) => {
           env: {
             PORT: clientPort,
             APP_ROOT: `packages/${APP_PACKAGE_ROOT}/client`,
-            PROXY_TARGET_URL: serverPort ? `http://127.0.0.1:${serverPort}` : undefined,
+            PROXY_TARGET_URL: process.env.PROXY_TARGET_URL || (serverPort ? `http://127.0.0.1:${serverPort}` : undefined),
           },
         });
       }

package/src/commands/index.js

@@ -1,4 +1,5 @@
 const { Command } = require('commander');
+const { isPackageValid } = require('../util');
 
 /**
  *
@@ -15,5 +16,7 @@ module.exports = (cli) => {
   require('./umi')(cli);
   require('./upgrade')(cli);
   require('./postinstall')(cli);
-  require('./create-plugin')(cli);
+  if (isPackageValid('@umijs/utils')) {
+    require('./create-plugin')(cli);
+  }
 }

package/src/commands/postinstall.js

@@ -1,5 +1,5 @@
 const { Command } = require('commander');
-const { run, isDev } = require('../util');
+const { run, isDev, isPackageValid } = require('../util');
 const { resolve } = require('path');
 const { existsSync } = require('fs');
 const { readFile, writeFile } = require('fs').promises;
@@ -21,6 +21,9 @@ module.exports = (cli) => {
         const content = await readFile(resolve(cwd, '.env.example'), 'utf-8');
         await writeFile(resolve(cwd, '.env'), content, 'utf-8');
       }
+      if (!isPackageValid('umi')) {
+        return;
+      }
       run('umi', ['generate', 'tmp'], {
         stdio: 'pipe',
         env: {

package/src/commands/start.js

@@ -39,7 +39,6 @@ module.exports = (cli) => {
         return;
       }
       await postCheck(opts);
-      await run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, 'install', '--silent']);
       if (opts.dbSync) {
         await run('node', [`./packages/${APP_PACKAGE_ROOT}/server/lib/index.js`, 'db:sync']);
       }

package/src/commands/upgrade.js

@@ -12,9 +12,14 @@ module.exports = (cli) => {
   cli
     .command('upgrade')
     .allowUnknownOption()
-    .action(async () => {
+    .option('--raw')
+    .action(async (options) => {
       promptForTs();
       const version = await getVersion();
+      if (options.raw) {
+        await runAppCommand('upgrade');
+        return;
+      }
       if (hasCorePackages()) {
         await run('yarn', ['install']);
         await runAppCommand('upgrade');

package/src/util.js

@@ -138,6 +138,6 @@ exports.updateJsonFile = async (target, fn) => {
 
 exports.getVersion = async () => {
   const { stdout } = await execa('npm', ['v', '@nocobase/app-server', 'versions']);
-  const versions = new Function(`return ${stdout}`)();
+  const versions = new Function(`return (${stdout})`)();
   return versions[versions.length - 1];
 };

package/templates/plugin/client.d.ts

@@ -0,0 +1,4 @@
+// @ts-nocheck
+export * from './lib/client';
+export { default } from './lib/client';
+

package/templates/plugin/client.js

@@ -0,0 +1,30 @@
+"use strict";
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var _index = _interopRequireWildcard(require("./lib/client"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {};
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _index.default;
+  }
+});
+
+Object.keys(_index).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _index[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _index[key];
+    }
+  });
+});

package/templates/plugin/server.d.ts

@@ -0,0 +1,4 @@
+// @ts-nocheck
+export * from './lib/server';
+export { default } from './lib/server';
+

package/templates/plugin/server.js

@@ -0,0 +1,30 @@
+"use strict";
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var _index = _interopRequireWildcard(require("./lib/server"));
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {};
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _index.default;
+  }
+});
+
+Object.keys(_index).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _index[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _index[key];
+    }
+  });
+});