@modern-js/base-generator 3.1.29 → 3.1.30

package/dist/index.js

@@ -113743,6 +113743,8 @@ var require_chainId = __commonJS({
         YAML: "yaml",
         /** Rule for wasm */
         WASM: "wasm",
+        /** Rule for node */
+        NODE: "node",
         /** Rule for bff */
         JS_BFF_API: "js-bff-api"
       },
@@ -113781,6 +113783,8 @@ var require_chainId = __commonJS({
         TOML: "toml",
         /** html-loader */
         HTML: "html",
+        /** node-loader */
+        NODE: "html",
         /** babel-loader */
         BABEL: "babel",
         /** esbuild-loader */
@@ -114041,7 +114045,6 @@ var require_constants = __commonJS({
     };
     var INTERNAL_MODULE_TOOLS_PLUGINS = {
       "@modern-js/module-tools": "@modern-js/module-tools",
-      "@modern-js/doc-tools": "@modern-js/doc-tools",
       "@modern-js/runtime": "@modern-js/runtime/cli",
       "@modern-js/plugin-testing": "@modern-js/plugin-testing/cli",
       "@modern-js/plugin-storybook": "@modern-js/plugin-storybook/cli",
@@ -114319,11 +114322,12 @@ var require_config2 = __commonJS({
     });
     var _type = require_type();
     var isSSR = (config) => {
+      var _server, _server1;
       const { server } = config;
-      if (server === null || server === void 0 ? void 0 : server.ssr) {
+      if ((_server = server) === null || _server === void 0 ? void 0 : _server.ssr) {
         return true;
       }
-      if ((server === null || server === void 0 ? void 0 : server.ssrByEntries) && !(0, _type.isEmpty)(server.ssrByEntries)) {
+      if (((_server1 = server) === null || _server1 === void 0 ? void 0 : _server1.ssrByEntries) && !(0, _type.isEmpty)(server.ssrByEntries)) {
         for (const name of Object.keys(server.ssrByEntries)) {
           if (server.ssrByEntries[name]) {
             return true;
@@ -114333,27 +114337,29 @@ var require_config2 = __commonJS({
       return false;
     };
     var isUseSSRBundle = (config) => {
+      var _output;
       const { output: output2 } = config;
-      if (output2 === null || output2 === void 0 ? void 0 : output2.ssg) {
+      if ((_output = output2) === null || _output === void 0 ? void 0 : _output.ssg) {
         return true;
       }
       return isSSR(config);
     };
     var isServiceWorker = (config) => {
-      var _deploy_worker;
+      var _deploy_worker, _deploy, _output;
       const { output: output2, deploy } = config;
-      if ((deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && ((output2 === null || output2 === void 0 ? void 0 : output2.ssg) || isSSR(config))) {
+      if (((_deploy = deploy) === null || _deploy === void 0 ? void 0 : (_deploy_worker = _deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr) && (((_output = output2) === null || _output === void 0 ? void 0 : _output.ssg) || isSSR(config))) {
         return true;
       }
       return false;
     };
     var isRouterV5 = (config) => {
-      var _config_runtime, _config_runtime1, _config_runtime_router;
-      return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && (config === null || config === void 0 ? void 0 : (_config_runtime1 = config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
+      var _config_runtime, _config_runtime_router, _config_runtime1, _config;
+      return typeof ((_config_runtime = config.runtime) === null || _config_runtime === void 0 ? void 0 : _config_runtime.router) !== "boolean" && ((_config = config) === null || _config === void 0 ? void 0 : (_config_runtime1 = _config.runtime) === null || _config_runtime1 === void 0 ? void 0 : (_config_runtime_router = _config_runtime1.router) === null || _config_runtime_router === void 0 ? void 0 : _config_runtime_router.mode) === "react-router-5";
     };
     var isSSGEntry = (config, entryName, entrypoints) => {
+      var _ssgConfig, _ssgConfig1;
       const ssgConfig = config.output.ssg;
-      const useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof (ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[0]) === "function" || Boolean(ssgConfig === null || ssgConfig === void 0 ? void 0 : ssgConfig[entryName]);
+      const useSSG = isSingleEntry(entrypoints) ? Boolean(ssgConfig) : ssgConfig === true || typeof ((_ssgConfig = ssgConfig) === null || _ssgConfig === void 0 ? void 0 : _ssgConfig[0]) === "function" || Boolean((_ssgConfig1 = ssgConfig) === null || _ssgConfig1 === void 0 ? void 0 : _ssgConfig1[entryName]);
       return useSSG;
     };
     var isSingleEntry = (entrypoints) => entrypoints.length === 1 && entrypoints[0].entryName === "main";
@@ -115100,7 +115106,7 @@ var require_alias = __commonJS({
     };
     var mergeAlias = (alias) => (0, _applyOptionsChain.applyOptionsChain)({}, alias);
     var getAliasConfig = (aliasOption, option) => {
-      var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;
+      var _tsconfig_compilerOptions, _tsconfig, _tsconfig_compilerOptions1, _tsconfig1;
       const isTsProject = _fs.default.existsSync(option.tsconfigPath);
       const alias = mergeAlias(aliasOption);
       if (!isTsProject) {
@@ -115112,10 +115118,10 @@ var require_alias = __commonJS({
         };
       }
       const tsconfig = (0, _get.readTsConfigByFile)(option.tsconfigPath);
-      const baseUrl = tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
+      const baseUrl = (_tsconfig = tsconfig) === null || _tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions = _tsconfig.compilerOptions) === null || _tsconfig_compilerOptions === void 0 ? void 0 : _tsconfig_compilerOptions.baseUrl;
       return {
         absoluteBaseUrl: baseUrl ? _path.default.join(option.appDirectory, baseUrl) : option.appDirectory,
-        paths: __spreadValues(__spreadValues({}, alias), tsconfig === null || tsconfig === void 0 ? void 0 : (_tsconfig_compilerOptions1 = tsconfig.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths),
+        paths: __spreadValues(__spreadValues({}, alias), (_tsconfig1 = tsconfig) === null || _tsconfig1 === void 0 ? void 0 : (_tsconfig_compilerOptions1 = _tsconfig1.compilerOptions) === null || _tsconfig_compilerOptions1 === void 0 ? void 0 : _tsconfig_compilerOptions1.paths),
         isTsPath: true,
         isTsProject
       };
@@ -115654,7 +115660,8 @@ var require_prettyInstructions = __commonJS({
       const LOCAL_LABEL = "Local:  ";
       const NETWORK_LABEL = "Network:  ";
       const isLocalhost = (url) => {
-        return url === null || url === void 0 ? void 0 : url.includes("localhost");
+        var _url;
+        return (_url = url) === null || _url === void 0 ? void 0 : _url.includes("localhost");
       };
       if (host && host !== _constants.DEFAULT_DEV_HOST) {
         return [
@@ -115683,7 +115690,7 @@ var require_prettyInstructions = __commonJS({
     var prettyInstructions = (appContext, config) => {
       var _appContext_builder_context_devServer, _appContext_builder, _config_dev;
       const { entrypoints, serverRoutes, port, apiOnly, checkedEntries } = appContext;
-      const isHttps = (0, _is.isDev)() && ((_appContext_builder_context_devServer = (_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
+      const isHttps = (0, _is.isDev)() && ((_appContext_builder = appContext.builder) === null || _appContext_builder === void 0 ? void 0 : (_appContext_builder_context_devServer = _appContext_builder.context.devServer) === null || _appContext_builder_context_devServer === void 0 ? void 0 : _appContext_builder_context_devServer.https);
       const urls = getAddressUrls(isHttps ? "https" : "http", port, (_config_dev = config.dev) === null || _config_dev === void 0 ? void 0 : _config_dev.host);
       const routes = !apiOnly ? serverRoutes.filter((route) => route.entryName) : serverRoutes;
       let message = "App running at:\n\n";
@@ -115748,8 +115755,9 @@ var require_require = __commonJS({
     });
     var _fs = require_fs();
     var compatRequire = (filePath, interop = true) => {
+      var _mod;
       const mod = require(filePath);
-      const rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
+      const rtnESMDefault = interop && ((_mod = mod) === null || _mod === void 0 ? void 0 : _mod.__esModule);
       return rtnESMDefault ? mod.default : mod;
     };
     var dynamicImport = new Function("modulePath", "return import(modulePath)");
@@ -131066,11 +131074,13 @@ var PackageManagerName = {
   [PackageManager.Npm]: "npm"
 };
 var getPackageManagerSchema = (extra = {}) => {
+  var _extra, _extra1;
   return {
     type: "string",
     title: i18n2.t(localeKeys2.packageManager.self),
     enum: Object.values(PackageManager).filter((packageManager) => {
-      return (extra === null || extra === void 0 ? void 0 : extra.solution) === "monorepo" ? packageManager !== PackageManager.Npm : true;
+      var _extra2;
+      return ((_extra2 = extra) === null || _extra2 === void 0 ? void 0 : _extra2.solution) === "monorepo" ? packageManager !== PackageManager.Npm : true;
     }).map((packageManager) => ({
       value: packageManager,
       label: PackageManagerName[packageManager]
@@ -131080,7 +131090,7 @@ var getPackageManagerSchema = (extra = {}) => {
         dependencies: [],
         fulfill: {
           state: {
-            visible: !(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) && !(extra === null || extra === void 0 ? void 0 : extra.isSubProject)
+            visible: !((_extra = extra) === null || _extra === void 0 ? void 0 : _extra.isMonorepoSubProject) && !((_extra1 = extra) === null || _extra1 === void 0 ? void 0 : _extra1.isSubProject)
           }
         }
       }

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.29",
+  "version": "3.1.30",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",
@@ -30,10 +30,10 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/generator-common": "3.1.29",
-    "@modern-js/generator-utils": "3.1.29",
-    "@scripts/jest-config": "2.27.0",
-    "@scripts/build": "2.27.0"
+    "@modern-js/generator-utils": "3.1.30",
+    "@modern-js/generator-common": "3.1.30",
+    "@scripts/jest-config": "2.28.0",
+    "@scripts/build": "2.28.0"
   },
   "sideEffects": false,
   "publishConfig": {