@nocobase/build 1.8.0-alpha.9 → 1.8.0-beta.10

package/lib/buildPlugin.js

@@ -30,7 +30,6 @@ __export(buildPlugin_exports, {
   buildPlugin: () => buildPlugin,
   buildPluginClient: () => buildPluginClient,
   buildPluginServer: () => buildPluginServer,
-  buildProPluginServer: () => buildProPluginServer,
   buildServerDeps: () => buildServerDeps,
   deleteServerFiles: () => deleteServerFiles,
   writeExternalPackageVersion: () => writeExternalPackageVersion
@@ -43,14 +42,11 @@ var import_fast_glob = __toESM(require("fast-glob"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_path = __toESM(require("path"));
 var import_tsup = require("tsup");
-var bundleRequire = __toESM(require("bundle-require"));
+var import_rspack_plugin = require("@rsdoctor/rspack-plugin");
 var import_constant = require("./constant");
 var import_utils = require("./utils");
 var import_buildPluginUtils = require("./utils/buildPluginUtils");
 var import_getDepsConfig = require("./utils/getDepsConfig");
-var import_rspack_plugin = require("@rsdoctor/rspack-plugin");
-var import_obfuscationResult = require("./utils/obfuscationResult");
-var import_pluginEsbuildCommercialInject = __toESM(require("./plugins/pluginEsbuildCommercialInject"));
 const validExts = [".ts", ".tsx", ".js", ".jsx", ".mjs"];
 const serverGlobalFiles = ["src/**", "!src/client/**", ...import_constant.globExcludeFiles];
 const clientGlobalFiles = ["src/**", "!src/server/**", ...import_constant.globExcludeFiles];
@@ -77,7 +73,6 @@ const external = [
   "@nocobase/server",
   "@nocobase/test",
   "@nocobase/utils",
-  "@nocobase/license-kit",
   // @nocobase/auth
   "jsonwebtoken",
   // @nocobase/cache
@@ -285,99 +280,10 @@ async function buildPluginServer(cwd, userConfig, sourcemap, log) {
   );
   await buildServerDeps(cwd, serverFiles, log);
 }
-async function buildProPluginServer(cwd, userConfig, sourcemap, log) {
-  log("build pro plugin server source");
-  const packageJson = (0, import_utils.getPackageJson)(cwd);
-  const serverFiles = import_fast_glob.default.globSync(serverGlobalFiles, { cwd, absolute: true });
-  (0, import_buildPluginUtils.buildCheck)({ cwd, packageJson, entry: "server", files: serverFiles, log });
-  const otherExts = Array.from(
-    new Set(serverFiles.map((item) => import_path.default.extname(item)).filter((item) => !import_constant.EsbuildSupportExts.includes(item)))
-  );
-  if (otherExts.length) {
-    log("%s will not be processed, only be copied to the dist directory.", import_chalk.default.yellow(otherExts.join(",")));
-  }
-  deleteServerFiles(cwd, log);
-  let tsconfig = bundleRequire.loadTsConfig(import_path.default.join(cwd, "tsconfig.json"));
-  import_fs_extra.default.writeFileSync(import_path.default.join(cwd, "tsconfig.json"), JSON.stringify({
-    ...tsconfig.data,
-    compilerOptions: { ...tsconfig.data.compilerOptions, paths: [] }
-  }, null, 2));
-  tsconfig = bundleRequire.loadTsConfig(import_path.default.join(cwd, "tsconfig.json"));
-  await (0, import_tsup.build)(
-    userConfig.modifyTsupConfig({
-      entry: serverFiles,
-      splitting: false,
-      clean: false,
-      bundle: false,
-      silent: true,
-      treeshake: false,
-      target: "node16",
-      sourcemap,
-      outDir: import_path.default.join(cwd, target_dir),
-      format: "cjs",
-      skipNodeModulesBundle: true,
-      loader: {
-        ...otherExts.reduce((prev, cur) => ({ ...prev, [cur]: "copy" }), {}),
-        ".json": "copy"
-      }
-    })
-  );
-  const entryFile = import_path.default.join(cwd, "src/server/index.ts");
-  if (!import_fs_extra.default.existsSync(entryFile)) {
-    log("server entry file not found", entryFile);
-    return;
-  }
-  const externalOptions = {
-    external: [],
-    noExternal: [],
-    onSuccess: async () => {
-    },
-    esbuildPlugins: []
-  };
-  if (!cwd.includes(import_constant.PLUGIN_COMMERCIAL)) {
-    externalOptions.external = [/^[./]/];
-    externalOptions.noExternal = [entryFile, /@nocobase\/plugin-commercial\/server/, /dist\/server\/index\.js/];
-    externalOptions.onSuccess = async () => {
-      const serverFiles2 = [import_path.default.join(cwd, target_dir, "server", "index.js")];
-      serverFiles2.forEach((file) => {
-        (0, import_obfuscationResult.obfuscate)(file);
-      });
-    };
-    externalOptions.esbuildPlugins = [import_pluginEsbuildCommercialInject.default];
-  }
-  await (0, import_tsup.build)(
-    userConfig.modifyTsupConfig({
-      entry: [entryFile],
-      // minify: true,
-      splitting: false,
-      clean: false,
-      bundle: true,
-      silent: true,
-      treeshake: false,
-      target: "node16",
-      sourcemap,
-      outDir: import_path.default.join(cwd, target_dir, "server"),
-      format: "cjs",
-      skipNodeModulesBundle: true,
-      tsconfig: tsconfig.path,
-      loader: {
-        ...otherExts.reduce((prev, cur) => ({ ...prev, [cur]: "copy" }), {}),
-        ".json": "copy"
-      },
-      ...externalOptions
-    })
-  );
-  import_fs_extra.default.removeSync(tsconfig.path);
-  await buildServerDeps(cwd, serverFiles, log);
-}
-async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial = false) {
+async function buildPluginClient(cwd, userConfig, sourcemap, log) {
   log("build plugin client");
   const packageJson = (0, import_utils.getPackageJson)(cwd);
   const clientFiles = import_fast_glob.default.globSync(clientGlobalFiles, { cwd, absolute: true });
-  if (isCommercial) {
-    const commercialFiles = import_fast_glob.default.globSync(clientGlobalFiles, { cwd: import_path.default.join(process.cwd(), "packages/pro-plugins", import_constant.PLUGIN_COMMERCIAL), absolute: true });
-    clientFiles.push(...commercialFiles);
-  }
   const clientFileSource = clientFiles.map((item) => import_fs_extra.default.readFileSync(item, "utf-8"));
   const sourcePackages = (0, import_buildPluginUtils.getPackagesFromFiles)(clientFileSource);
   const excludePackages = (0, import_buildPluginUtils.getExcludePackages)(sourcePackages, external, pluginPrefix);
@@ -501,58 +407,37 @@ async function buildPluginClient(cwd, userConfig, sourcemap, log, isCommercial =
         {
           test: /\.tsx$/,
           exclude: /[\\/]node_modules[\\/]/,
-          use: [
-            {
-              loader: "builtin:swc-loader",
-              options: {
-                sourceMap: true,
-                jsc: {
-                  parser: {
-                    syntax: "typescript",
-                    tsx: true
-                  },
-                  target: "es5"
-                }
-              }
-            },
-            {
-              loader: require.resolve("./plugins/pluginRspackCommercialLoader"),
-              options: {
-                isCommercial
-              }
+          loader: "builtin:swc-loader",
+          options: {
+            sourceMap: true,
+            jsc: {
+              parser: {
+                syntax: "typescript",
+                tsx: true
+              },
+              target: "es5"
             }
-          ]
+          }
         },
         {
           test: /\.ts$/,
           exclude: /[\\/]node_modules[\\/]/,
-          use: [
-            {
-              loader: "builtin:swc-loader",
-              options: {
-                sourceMap: true,
-                jsc: {
-                  parser: {
-                    syntax: "typescript"
-                  },
-                  target: "es5"
-                }
-              }
-            },
-            {
-              loader: require.resolve("./plugins/pluginRspackCommercialLoader"),
-              options: {
-                isCommercial
-              }
+          loader: "builtin:swc-loader",
+          options: {
+            sourceMap: true,
+            jsc: {
+              parser: {
+                syntax: "typescript"
+              },
+              target: "es5"
             }
-          ]
+          }
         }
       ]
     },
     plugins: [
       new import_core.rspack.DefinePlugin({
-        "process.env.NODE_ENV": JSON.stringify("production"),
-        "process.env.NODE_DEBUG": false
+        "process.env.NODE_ENV": JSON.stringify("production")
       }),
       {
         apply(compiler2) {
@@ -610,13 +495,8 @@ __webpack_require__.p = (function() {
   });
 }
 async function buildPlugin(cwd, userConfig, sourcemap, log) {
-  if (cwd.includes("/pro-plugins/") && import_fs_extra.default.existsSync(import_path.default.join(process.cwd(), "packages/pro-plugins/", import_constant.PLUGIN_COMMERCIAL))) {
-    await buildPluginClient(cwd, userConfig, sourcemap, log, true);
-    await buildProPluginServer(cwd, userConfig, sourcemap, log);
-  } else {
-    await buildPluginClient(cwd, userConfig, sourcemap, log);
-    await buildPluginServer(cwd, userConfig, sourcemap, log);
-  }
+  await buildPluginClient(cwd, userConfig, sourcemap, log);
+  await buildPluginServer(cwd, userConfig, sourcemap, log);
   writeExternalPackageVersion(cwd, log);
 }
 // Annotate the CommonJS export names for ESM import in node:
@@ -624,7 +504,6 @@ async function buildPlugin(cwd, userConfig, sourcemap, log) {
   buildPlugin,
   buildPluginClient,
   buildPluginServer,
-  buildProPluginServer,
   buildServerDeps,
   deleteServerFiles,
   writeExternalPackageVersion

package/lib/constant.js

@@ -35,7 +35,6 @@ __export(constant_exports, {
   NODE_MODULES: () => NODE_MODULES,
   PACKAGES_PATH: () => PACKAGES_PATH,
   PLUGINS_DIR: () => PLUGINS_DIR,
-  PLUGIN_COMMERCIAL: () => PLUGIN_COMMERCIAL,
   PRESETS_DIR: () => PRESETS_DIR,
   ROOT_PATH: () => ROOT_PATH,
   TAR_OUTPUT_DIR: () => TAR_OUTPUT_DIR,
@@ -77,10 +76,7 @@ const NODE_MODULES = import_path.default.join(ROOT_PATH, "node_modules");
 const PACKAGES_PATH = import_path.default.join(ROOT_PATH, "packages");
 const PLUGINS_DIR = ["plugins", "samples", "pro-plugins"].concat((process.env.PLUGINS_DIRS || "").split(",")).filter(Boolean).map((name) => import_path.default.join(PACKAGES_PATH, name));
 const PRESETS_DIR = import_path.default.join(PACKAGES_PATH, "presets");
-const PLUGIN_COMMERCIAL = "@nocobase/plugin-commercial";
-const getPluginPackages = (packages) => packages.filter((item) => PLUGINS_DIR.some((pluginDir) => item.location.startsWith(pluginDir))).sort((a, b) => {
-  return a.name === PLUGIN_COMMERCIAL ? -1 : 1;
-});
+const getPluginPackages = (packages) => packages.filter((item) => PLUGINS_DIR.some((pluginDir) => item.location.startsWith(pluginDir)));
 const getPresetsPackages = (packages) => packages.filter((item) => item.location.startsWith(PRESETS_DIR));
 const CORE_APP = import_path.default.join(PACKAGES_PATH, "core/app");
 const CORE_CLIENT = import_path.default.join(PACKAGES_PATH, "core/client");
@@ -103,7 +99,6 @@ const TAR_OUTPUT_DIR = process.env.TAR_PATH ? process.env.TAR_PATH : import_path
   NODE_MODULES,
   PACKAGES_PATH,
   PLUGINS_DIR,
-  PLUGIN_COMMERCIAL,
   PRESETS_DIR,
   ROOT_PATH,
   TAR_OUTPUT_DIR,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/build",
-  "version": "1.8.0-alpha.9",
+  "version": "1.8.0-beta.10",
   "description": "Library build tool based on rollup.",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -26,14 +26,12 @@
     "@vercel/ncc": "0.36.1",
     "babel-loader": "^9.2.1",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "bundle-require": "^5.1.0",
     "chalk": "2.4.2",
     "css-loader": "^6.8.1",
     "esbuild-register": "^3.4.2",
     "fast-glob": "^3.3.1",
     "gulp": "4.0.2",
     "gulp-typescript": "6.0.0-alpha.1",
-    "javascript-obfuscator": "^4.1.1",
     "less": "^4.2.0",
     "less-loader": "^12.2.0",
     "postcss": "^8.4.29",
@@ -51,8 +49,7 @@
   },
   "license": "AGPL-3.0",
   "scripts": {
-    "build": "tsup",
-    "build:watch": "tsup --watch"
+    "build": "tsup"
   },
-  "gitHead": "7f133b8d44fddf24d61e8f06c79613c8e5c22028"
+  "gitHead": "09fe854edfc44f45422fa983093dd34694416c5a"
 }

package/lib/plugins/pluginEsbuildCommercialInject.js

@@ -1,72 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var pluginEsbuildCommercialInject_exports = {};
-__export(pluginEsbuildCommercialInject_exports, {
-  default: () => pluginEsbuildCommercialInject_default
-});
-module.exports = __toCommonJS(pluginEsbuildCommercialInject_exports);
-var import_node_fs = __toESM(require("node:fs"));
-const pluginEsbuildCommercialInject = {
-  name: "plugin-esbuild-commercial-inject",
-  setup(build) {
-    build.onLoad({ filter: /src\/server\/index\.ts$/ }, async (args) => {
-      let source = import_node_fs.default.readFileSync(args.path, "utf8");
-      const regex = /export\s*\{\s*default\s*\}\s*from\s*(?:'([^']*)'|"([^"]*)");?/;
-      const regex2 = /export\s+default\s+([a-zA-Z_0-9]+)\s*;?/;
-      const match = source.match(regex);
-      const match2 = source.match(regex2);
-      if (match) {
-        source = source.replace(regex, ``);
-        const moduleName = match[1] || match[2];
-        source = `
-import { withCommercial } from '@nocobase/plugin-commercial/server';
-import _plugin from '${moduleName}';
-export default withCommercial(_plugin);
-${source}
-`;
-        console.log(`Insert commercial server code success`);
-      } else if (match2) {
-        source = source.replace(regex2, ``);
-        const moduleName = match2[1] || match2[2];
-        source = `
-import { withCommercial } from '@nocobase/plugin-commercial/server';
-${source}
-export default withCommercial(${moduleName});
-`;
-        console.log(`Insert commercial server code success`);
-      } else {
-        console.error(`Insert commercial server code fail`);
-      }
-      return {
-        contents: source,
-        loader: "ts"
-      };
-    });
-  }
-};
-var pluginEsbuildCommercialInject_default = pluginEsbuildCommercialInject;

package/lib/plugins/pluginRspackCommercialLoader.js

@@ -1,47 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var pluginRspackCommercialLoader_exports = {};
-__export(pluginRspackCommercialLoader_exports, {
-  default: () => myLoader
-});
-module.exports = __toCommonJS(pluginRspackCommercialLoader_exports);
-function myLoader(source) {
-  const options = this.getOptions();
-  if (!options?.isCommercial) {
-    return source;
-  }
-  const isEntry = this.resourcePath.match(/client\/index\.(ts|tsx)/) && !this.resourcePath.includes("plugin-commercial");
-  if (isEntry) {
-    const regex = /export\s+default\s+([a-zA-Z_0-9]+)\s*;?/;
-    const match = source.match(regex);
-    if (match) {
-      source = source.replace(regex, ``);
-      const moduleName = match[1];
-      source = `
-        import { withCommercial } from '@nocobase/plugin-commercial/client';
-        ${source}
-        export default withCommercial(${moduleName});
-        `;
-      console.log(`Insert commercial client code success`);
-    } else {
-      console.error(`Insert commercial client code fail`);
-    }
-    return source;
-  }
-  return source;
-}

package/lib/utils/obfuscationResult.js

@@ -1,69 +0,0 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var obfuscationResult_exports = {};
-__export(obfuscationResult_exports, {
-  obfuscate: () => obfuscate
-});
-module.exports = __toCommonJS(obfuscationResult_exports);
-var import_fs_extra = __toESM(require("fs-extra"));
-var JavaScriptObfuscator = __toESM(require("javascript-obfuscator"));
-const obfuscate = (filePath) => {
-  const fileContent = import_fs_extra.default.readFileSync(filePath, "utf8");
-  const obfuscationResult = JavaScriptObfuscator.obfuscate(fileContent, {
-    compact: true,
-    controlFlowFlattening: false,
-    deadCodeInjection: false,
-    debugProtection: false,
-    debugProtectionInterval: 0,
-    disableConsoleOutput: true,
-    identifierNamesGenerator: "hexadecimal",
-    log: false,
-    numbersToExpressions: false,
-    renameGlobals: false,
-    selfDefending: true,
-    simplify: true,
-    splitStrings: false,
-    stringArray: true,
-    stringArrayCallsTransform: false,
-    stringArrayEncoding: [],
-    stringArrayIndexShift: true,
-    stringArrayRotate: true,
-    stringArrayShuffle: true,
-    stringArrayWrappersCount: 1,
-    stringArrayWrappersChainedCalls: true,
-    stringArrayWrappersParametersMaxCount: 2,
-    stringArrayWrappersType: "variable",
-    stringArrayThreshold: 0.75,
-    unicodeEscapeSequence: false
-  });
-  import_fs_extra.default.writeFileSync(filePath, obfuscationResult.getObfuscatedCode(), "utf8");
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  obfuscate
-});