@nocobase/cli 0.21.0-alpha.9 → 1.0.0-alpha.10

package/nocobase.conf.tpl

@@ -30,6 +30,26 @@ server {
         autoindex off;
     }
 
+    location {{publicPath}}static/plugins/ {
+        alias {{cwd}}/node_modules/;
+        expires 365d;
+        add_header Cache-Control "public";
+        access_log off;
+        autoindex off;
+
+        location ~ ^/static/plugins/@([^/]+)/([^/]+)/dist/client/(.*)$ {
+            allow all;
+        }
+
+        location ~ ^/static/plugins/([^/]+)/dist/client/(.*)$ {
+            allow all;
+        }
+
+        location ~ ^/static/plugins/(.*)$ {
+            deny all;
+        }
+    }
+
     location {{publicPath}} {
         alias {{cwd}}/node_modules/@nocobase/app/dist/client/;
         try_files $uri $uri/ /index.html;
@@ -45,24 +65,12 @@ server {
     }
 
     location ^~ {{publicPath}}api/ {
-        proxy_pass http://127.0.0.1:{{apiPort}}{{publicPath}}api/;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection 'upgrade';
-        proxy_set_header Host $host;
-        proxy_cache_bypass $http_upgrade;
-        proxy_connect_timeout 600;
-        proxy_send_timeout 600;
-        proxy_read_timeout 600;
-        send_timeout 600;
-    }
-
-    location ^~ {{publicPath}}static/plugins/ {
-        proxy_pass http://127.0.0.1:{{apiPort}}{{publicPath}}static/plugins/;
+        proxy_pass http://127.0.0.1:{{apiPort}};
         proxy_http_version 1.1;
         proxy_set_header Upgrade $http_upgrade;
         proxy_set_header Connection 'upgrade';
         proxy_set_header Host $host;
+        add_header Cache-Control 'no-cache, no-store';
         proxy_cache_bypass $http_upgrade;
         proxy_connect_timeout 600;
         proxy_send_timeout 600;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/cli",
-  "version": "0.21.0-alpha.9",
+  "version": "1.0.0-alpha.10",
   "description": "",
-  "license": "Apache-2.0",
+  "license": "AGPL-3.0",
   "main": "./src/index.js",
   "bin": {
     "nocobase": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/app": "0.21.0-alpha.9",
+    "@nocobase/app": "1.0.0-alpha.10",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -25,12 +25,12 @@
     "tsx": "^4.6.2"
   },
   "devDependencies": {
-    "@nocobase/devtools": "0.21.0-alpha.9"
+    "@nocobase/devtools": "1.0.0-alpha.10"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "a6fe6c4ee532c04e5a50ec777bf76436ca624cbd"
+  "gitHead": "39c634c88f835f8eadedf72ca11a9fb3323a50f8"
 }

package/src/cli.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { Command } = require('commander');
 const commands = require('./commands');
 

package/src/commands/build.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { resolve } = require('path');
 const { Command } = require('commander');
 const { run, nodeCheck, isPackageValid, buildIndexHtml } = require('../util');
@@ -26,6 +35,7 @@ module.exports = (cli) => {
         if (options.watch) return;
       }
       process.env['VITE_CJS_IGNORE_WARNING'] = 'true';
+      process.env.APP_ENV = 'production';
 
       await run('nocobase-build', [
         ...pkgs,

package/src/commands/clean.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const chalk = require('chalk');
 const { Command } = require('commander');
 const { run, isDev } = require('../util');

package/src/commands/create-nginx-conf.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { resolve } = require('path');
 const { Command } = require('commander');
 const { readFileSync, writeFileSync } = require('fs');

package/src/commands/create-plugin.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { resolve } = require('path');
 const { Command } = require('commander');
 const { PluginGenerator } = require('../plugin-generator');

package/src/commands/dev.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const chalk = require('chalk');
 const { Command } = require('commander');
 const { runAppCommand, runInstall, run, postCheck, nodeCheck, promptForTs } = require('../util');

package/src/commands/doc.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { Command } = require('commander');
 const { resolve, isAbsolute } = require('path');
 const { run, isDev } = require('../util');

package/src/commands/e2e.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { Command } = require('commander');
 const { run, isPortReachable } = require('../util');
 const { execSync } = require('node:child_process');
@@ -139,9 +148,6 @@ const filterArgv = () => {
     if (element.startsWith('--url=')) {
       continue;
     }
-    if (element === '--skip-reporter') {
-      continue;
-    }
     if (element === '--build') {
       continue;
     }
@@ -169,7 +175,6 @@ module.exports = (cli) => {
     .command('test')
     .allowUnknownOption()
     .option('--url [url]')
-    .option('--skip-reporter')
     .option('--build')
     .option('--production')
     .action(async (options) => {
@@ -181,9 +186,6 @@ module.exports = (cli) => {
         process.env.APP_ENV = 'production';
         await run('yarn', ['build']);
       }
-      if (options.skipReporter) {
-        process.env.PLAYWRIGHT_SKIP_REPORTER = true;
-      }
       if (options.url) {
         process.env.APP_BASE_URL = options.url.replace('localhost', '127.0.0.1');
       } else {

package/src/commands/global.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { Command } = require('commander');
 const { run, isDev, isProd, promptForTs } = require('../util');
 

package/src/commands/index.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { Command } = require('commander');
 const { isPackageValid, generateAppDir } = require('../util');
 

package/src/commands/p-test.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const execa = require('execa');
 const { resolve } = require('path');
 const pAll = require('p-all');
@@ -34,7 +43,7 @@ async function runApp(dir, index = 0) {
   await client.query(`DROP DATABASE IF EXISTS "${database}"`);
   await client.query(`CREATE DATABASE "${database}";`);
   await client.end();
-  return execa('yarn', ['nocobase', 'e2e', 'test', dir, '--skip-reporter'], {
+  return execa('yarn', ['nocobase', 'e2e', 'test', dir], {
     shell: true,
     stdio: 'inherit',
     env: {
@@ -49,6 +58,7 @@ async function runApp(dir, index = 0) {
       SOCKET_PATH: `storage/e2e/gateway-e2e-${index}.sock`,
       PM2_HOME: resolve(process.cwd(), `storage/e2e/.pm2-${index}`),
       PLAYWRIGHT_AUTH_FILE: resolve(process.cwd(), `storage/playwright/.auth/admin-${index}.json`),
+      E2E_JOB_ID: index,
     },
   });
 }

package/src/commands/pm2.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const chalk = require('chalk');
 const { Command } = require('commander');
 const { run, isDev } = require('../util');

package/src/commands/postinstall.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { Command } = require('commander');
 const { run, isDev, isPackageValid, generatePlaywrightPath } = require('../util');
 const { resolve } = require('path');

package/src/commands/start.js

@@ -1,9 +1,28 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { Command } = require('commander');
 const { isDev, run, postCheck, runInstall, promptForTs } = require('../util');
-const { existsSync, unlink } = require('fs');
+const { existsSync, rmSync } = require('fs');
 const { resolve } = require('path');
 const chalk = require('chalk');
 
+function deleteSockFiles() {
+  const { SOCKET_PATH, PM2_HOME } = process.env;
+  if (existsSync(PM2_HOME)) {
+    rmSync(PM2_HOME, { recursive: true });
+  }
+  if (existsSync(SOCKET_PATH)) {
+    rmSync(SOCKET_PATH);
+  }
+}
+
 /**
  *
  * @param {Command} cli
@@ -41,6 +60,7 @@ module.exports = (cli) => {
         return;
       }
       await postCheck(opts);
+      deleteSockFiles();
       if (opts.daemon) {
         run('pm2', ['start', `${APP_PACKAGE_ROOT}/lib/index.js`, '--', ...process.argv.slice(2)]);
       } else {

package/src/commands/tar.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { resolve } = require('path');
 const { Command } = require('commander');
 const { run, nodeCheck, isPackageValid } = require('../util');

package/src/commands/test-coverage.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { run } = require('../util');
 const fg = require('fast-glob');
 

package/src/commands/test.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const { Command } = require('commander');
 const { run } = require('../util');
 const path = require('path');

package/src/commands/umi.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const chalk = require('chalk');
 const { Command } = require('commander');
 const { run, isDev } = require('../util');

package/src/commands/upgrade.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const chalk = require('chalk');
 const { Command } = require('commander');
 const { resolve } = require('path');

package/src/index.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const util = require('./util');
 
 module.exports = {

package/src/plugin-generator.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const chalk = require('chalk');
 const { existsSync } = require('fs');
 const { join, resolve } = require('path');

package/src/util.js

@@ -1,3 +1,12 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
 const net = require('net');
 const chalk = require('chalk');
 const execa = require('execa');
@@ -217,6 +226,10 @@ exports.genTsConfigPaths = function genTsConfigPaths() {
     if (packageJsonName === '@nocobase/test') {
       paths[`${packageJsonName}/server`] = [`${relativePath}/src/server`];
       paths[`${packageJsonName}/e2e`] = [`${relativePath}/src/e2e`];
+      paths[`${packageJsonName}/web`] = [`${relativePath}/src/web`];
+    }
+    if (packageJsonName === '@nocobase/client') {
+      paths[`${packageJsonName}/demo-utils`] = [`${relativePath}/src/demo-utils`];
     }
     if (packageJsonName === '@nocobase/plugin-workflow-test') {
       paths[`${packageJsonName}/e2e`] = [`${relativePath}/src/e2e`];

package/templates/plugin/package.json.tpl

@@ -4,8 +4,8 @@
   "main": "dist/server/index.js",
   "dependencies": {},
   "peerDependencies": {
-    "@nocobase/client": "0.x",
-    "@nocobase/server": "0.x",
-    "@nocobase/test": "0.x"
+    "@nocobase/client": "1.x",
+    "@nocobase/server": "1.x",
+    "@nocobase/test": "1.x"
   }
 }