@nocobase/cli-v1 2.1.0-alpha.33 → 2.1.0-alpha.35

package/nocobase.conf.tpl

@@ -33,9 +33,19 @@ server {
     gzip on;
     gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript;
 
+    location ~* ^{{publicPath}}storage/uploads/(.*\.(?:htm|html|svg|svgz|xhtml))$ {
+        alias {{cwd}}/storage/uploads/$1;
+        add_header Cache-Control "public";
+        add_header Content-Disposition "attachment" always;
+        add_header X-Content-Type-Options "nosniff" always;
+        access_log off;
+        autoindex off;
+    }
+
     location {{publicPath}}storage/uploads/ {
         alias {{cwd}}/storage/uploads/;
         add_header Cache-Control "public";
+        add_header X-Content-Type-Options "nosniff" always;
         access_log off;
         autoindex off;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/cli-v1",
-  "version": "2.1.0-alpha.33",
+  "version": "2.1.0-alpha.35",
   "description": "",
   "license": "Apache-2.0",
   "main": "./src/index.js",
@@ -8,9 +8,9 @@
     "nocobase-v1": "./bin/index.js"
   },
   "dependencies": {
-    "@nocobase/cli": "2.1.0-alpha.33",
+    "@nocobase/cli": "2.1.0-alpha.35",
     "@nocobase/license-kit": "^0.3.8",
-    "@nocobase/utils": "2.1.0-alpha.33",
+    "@nocobase/utils": "2.1.0-alpha.35",
     "@types/fs-extra": "^11.0.1",
     "@umijs/utils": "3.5.20",
     "chalk": "^4.1.1",
@@ -28,12 +28,12 @@
     "tsx": "^4.19.0"
   },
   "devDependencies": {
-    "@nocobase/devtools": "2.1.0-alpha.33"
+    "@nocobase/devtools": "2.1.0-alpha.35"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/core/cli"
   },
-  "gitHead": "64aaff11b9d9cab6890fb4835d7ae6933f2d3081"
+  "gitHead": "313a9e19e84a99924c86f9855c2ae48943f450b0"
 }

package/src/commands/pkg.js

@@ -13,7 +13,7 @@ const fs = require('fs-extra');
 const zlib = require('zlib');
 const tar = require('tar');
 const path = require('path');
-const { createStoragePluginsSymlink, resolvePluginStoragePath } = require('@nocobase/utils/plugin-symlink');
+const { syncPluginSymlinks, resolvePluginStoragePath } = require('@nocobase/utils/plugin-symlink');
 const { getAccessKeyPair, showLicenseInfo, LicenseKeyError } = require('../license');
 const { logger } = require('../logger');
 
@@ -313,7 +313,7 @@ module.exports = (cli) => {
       const file = path.resolve(__dirname, '../../package.json');
       const json = await fs.readJson(file);
       await pm.download({ version: json.version });
-      await createStoragePluginsSymlink();
+      await syncPluginSymlinks();
     });
   pkg.command('export-all').action(async () => {
     logger.info('Todo...');

package/src/commands/postinstall.js

@@ -12,7 +12,7 @@ const { run, isDev, isPackageValid, generatePlaywrightPath, generatePlugins } =
 const { dirname, resolve } = require('path');
 const { existsSync, mkdirSync, readFileSync, appendFileSync } = require('fs');
 const { readFile, writeFile } = require('fs').promises;
-const { createStoragePluginsSymlink, createDevPluginsSymlink } = require('@nocobase/utils/plugin-symlink');
+const { syncPluginSymlinks } = require('@nocobase/utils/plugin-symlink');
 
 function runPatchPackage() {
   // run yarn patch-package
@@ -59,11 +59,10 @@ module.exports = (cli) => {
       writeToExclude();
       generatePlugins();
       generatePlaywrightPath(true);
-      await createStoragePluginsSymlink();
+      await syncPluginSymlinks();
       if (!isDev()) {
         return;
       }
-      await createDevPluginsSymlink();
       const cwd = process.cwd();
       if (!existsSync(resolve(cwd, '.env')) && existsSync(resolve(cwd, '.env.example'))) {
         const content = await readFile(resolve(cwd, '.env.example'), 'utf-8');

package/src/util.js

@@ -227,6 +227,38 @@ exports.getVersion = async () => {
   return versions[versions.length - 1];
 };
 
+function normalizeAppDevClientRsbuildConfig(appDevDir) {
+  const configPath = resolve(appDevDir, 'client/rsbuild.config.ts');
+  if (!existsSync(configPath)) {
+    return;
+  }
+  const content = fs.readFileSync(configPath, 'utf-8');
+  const normalized = content.replace(
+    "require('../../devtools/package.json')",
+    "require('@nocobase/devtools/package.json')",
+  );
+  if (normalized !== content) {
+    fs.writeFileSync(configPath, normalized, 'utf-8');
+  }
+}
+
+function normalizeAppDevClientV2Tsconfig(appDevDir) {
+  const tsconfigPath = resolve(appDevDir, 'client-v2/tsconfig.json');
+  if (!existsSync(tsconfigPath)) {
+    return;
+  }
+  const tsconfig = JSON.parse(fs.readFileSync(tsconfigPath, 'utf-8'));
+  tsconfig.extends = '../../../tsconfig.json';
+  tsconfig.compilerOptions = tsconfig.compilerOptions || {};
+  tsconfig.compilerOptions.baseUrl = '../../../';
+  fs.writeFileSync(tsconfigPath, `${JSON.stringify(tsconfig, null, 2)}\n`, 'utf-8');
+}
+
+function normalizeAppDevFiles(appDevDir) {
+  normalizeAppDevClientRsbuildConfig(appDevDir);
+  normalizeAppDevClientV2Tsconfig(appDevDir);
+}
+
 exports.generateAppDir = function generateAppDir() {
   const appPkgPath = dirname(dirname(require.resolve('@nocobase/app/src/index.ts')));
   const appDevDir = resolve(process.cwd(), './storage/.app-dev');
@@ -238,6 +270,7 @@ exports.generateAppDir = function generateAppDir() {
         force: true,
       });
     }
+    normalizeAppDevFiles(appDevDir);
     process.env.APP_PACKAGE_ROOT = appDevDir;
   } else {
     process.env.APP_PACKAGE_ROOT = appPkgPath;