@modern-js/repo-generator 0.0.0-nightly-20231005160631 → 0.0.0-nightly-20231007160533

package/dist/index.js

@@ -124789,10 +124789,9 @@ var require_env2 = __commonJS({
     var env_exports = {};
     __export2(env_exports, {
       getNodeEnv: () => getNodeEnv,
+      isBrowser: () => isBrowser,
       isDev: () => isDev,
-      isFastRefresh: () => isFastRefresh,
       isProd: () => isProd,
-      isProdProfile: () => isProdProfile,
       isTest: () => isTest
     });
     module2.exports = __toCommonJS2(env_exports);
@@ -124800,39 +124799,6 @@ var require_env2 = __commonJS({
     var isDev = () => getNodeEnv() === "development";
     var isProd = () => getNodeEnv() === "production";
     var isTest = () => getNodeEnv() === "test";
-    var isProdProfile = () => isProd() && process.argv.includes("--profile");
-    var isFastRefresh = () => isDev() && process.env.FAST_REFRESH !== "false";
-  }
-});
-
-// ../../../toolkit/utils/dist/cjs/cli/is/platform.js
-var require_platform2 = __commonJS({
-  "../../../toolkit/utils/dist/cjs/cli/is/platform.js"(exports, module2) {
-    "use strict";
-    var __defProp2 = Object.defineProperty;
-    var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
-    var __getOwnPropNames2 = Object.getOwnPropertyNames;
-    var __hasOwnProp2 = Object.prototype.hasOwnProperty;
-    var __export2 = (target, all) => {
-      for (var name in all)
-        __defProp2(target, name, { get: all[name], enumerable: true });
-    };
-    var __copyProps2 = (to, from, except, desc) => {
-      if (from && typeof from === "object" || typeof from === "function") {
-        for (let key of __getOwnPropNames2(from))
-          if (!__hasOwnProp2.call(to, key) && key !== except)
-            __defProp2(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc2(from, key)) || desc.enumerable });
-      }
-      return to;
-    };
-    var __toCommonJS2 = (mod) => __copyProps2(__defProp2({}, "__esModule", { value: true }), mod);
-    var platform_exports = {};
-    __export2(platform_exports, {
-      isBrowser: () => isBrowser,
-      isNodeJS: () => isNodeJS
-    });
-    module2.exports = __toCommonJS2(platform_exports);
-    var isNodeJS = () => typeof process !== "undefined" && process.versions != null && process.versions.node != null && process.versions.electron == null;
     var isBrowser = () => typeof window !== "undefined";
   }
 });
@@ -125253,7 +125219,6 @@ var require_is2 = __commonJS({
     var is_exports = {};
     module2.exports = __toCommonJS2(is_exports);
     __reExport(is_exports, require_env2(), module2.exports);
-    __reExport(is_exports, require_platform2(), module2.exports);
     __reExport(is_exports, require_type2(), module2.exports);
     __reExport(is_exports, require_config4(), module2.exports);
     __reExport(is_exports, require_project2(), module2.exports);
@@ -125770,30 +125735,13 @@ var require_alias2 = __commonJS({
     __export2(alias_exports, {
       getAliasConfig: () => getAliasConfig,
       getUserAlias: () => getUserAlias,
-      mergeAlias: () => mergeAlias,
-      validAlias: () => validAlias
+      mergeAlias: () => mergeAlias
     });
     module2.exports = __toCommonJS2(alias_exports);
     var import_fs = __toESM2(require("fs"));
     var import_path19 = __toESM2(require("path"));
-    var import_compiled = require_compiled2();
     var import_get = require_get3();
     var import_applyOptionsChain = require_applyOptionsChain2();
-    var validAlias = (modernConfig, { tsconfigPath }) => {
-      const { source: { alias } } = modernConfig;
-      if (!alias) {
-        return null;
-      }
-      const isTsProject = import_fs.default.existsSync(tsconfigPath);
-      if (!isTsProject) {
-        return null;
-      }
-      const userAlias = getUserAlias(alias);
-      if (Object.keys(userAlias).length > 0) {
-        return import_compiled.chalk.red('Note: Please use `compilerOptions.paths` in "tsconfig.json" file replace `source.alias` config in "modern.config.js/ts" when project is typescript');
-      }
-      return null;
-    };
     var mergeAlias = (alias) => (0, import_applyOptionsChain.applyOptionsChain)({}, alias);
     var getAliasConfig = (aliasOption, option) => {
       var _tsconfig_compilerOptions, _tsconfig_compilerOptions1;
@@ -126081,7 +126029,6 @@ var require_monorepo2 = __commonJS({
       findMonorepoRoot: () => findMonorepoRoot,
       getMonorepoPackages: () => getMonorepoPackages2,
       isLerna: () => isLerna,
-      isModernjsMonorepo: () => isModernjsMonorepo,
       isMonorepo: () => isMonorepo,
       isPnpmWorkspaces: () => isPnpmWorkspaces,
       isYarnWorkspaces: () => isYarnWorkspaces
@@ -126108,18 +126055,6 @@ var require_monorepo2 = __commonJS({
     };
     var isPnpmWorkspaces = (root) => import_fs.default.existsSync(import_path19.default.join(root, WORKSPACE_FILES.PNPM));
     var isMonorepo = (root) => isLerna(root) || isYarnWorkspaces(root) || isPnpmWorkspaces(root);
-    var isModernjsMonorepo = (root) => {
-      const pkgJsonPath = import_path19.default.join(root, "package.json");
-      if (!import_fs.default.existsSync(pkgJsonPath)) {
-        return false;
-      }
-      const json = JSON.parse(import_fs.default.readFileSync(pkgJsonPath, "utf8"));
-      const deps = {
-        ...json.dependencies || {},
-        ...json.devDependencies || {}
-      };
-      return Boolean(deps["@modern-js/monorepo-tools"]);
-    };
     var findMonorepoRoot = (appDirectory, maxDepth = PACKAGE_MAX_DEPTH) => {
       let inMonorepo = false;
       for (let depth = 0; depth < maxDepth; depth++) {
@@ -146026,9 +145961,7 @@ var ZH_LOCALE2 = {
   sub_solution: {
     self: "请选择你想创建的工程类型",
     mwa: "Web 应用",
-    mwa_test: "Web 应用（测试）",
-    module: "Npm 模块",
-    inner_module: "Npm 模块（内部）"
+    module: "Npm 模块"
   },
   action: {
     self: "请选择你想要的操作",
@@ -146124,9 +146057,7 @@ var EN_LOCALE2 = {
   sub_solution: {
     self: "Please select the type of project you want to create:",
     mwa: "Web App",
-    mwa_test: "Web App (Test)",
     module: "Npm Module",
-    inner_module: "Npm Module (Inner)",
     monorepo: "Monorepo"
   },
   action: {
@@ -146235,9 +146166,7 @@ var Solution;
 var SubSolution;
 (function(SubSolution22) {
   SubSolution22["MWA"] = "mwa";
-  SubSolution22["MWATest"] = "mwa_test";
   SubSolution22["Module"] = "module";
-  SubSolution22["InnerModule"] = "inner_module";
 })(SubSolution || (SubSolution = {}));
 var SolutionText = {
   [Solution.MWA]: () => i18n2.t(localeKeys2.solution.mwa),
@@ -146246,24 +146175,13 @@ var SolutionText = {
 };
 var SubSolutionText = {
   [SubSolution.MWA]: () => i18n2.t(localeKeys2.sub_solution.mwa),
-  [SubSolution.MWATest]: () => i18n2.t(localeKeys2.sub_solution.mwa_test),
-  [SubSolution.Module]: () => i18n2.t(localeKeys2.sub_solution.module),
-  [SubSolution.InnerModule]: () => i18n2.t(localeKeys2.sub_solution.inner_module)
+  [SubSolution.Module]: () => i18n2.t(localeKeys2.sub_solution.module)
 };
 var SolutionToolsMap = {
   [Solution.MWA]: "@modern-js/app-tools",
   [Solution.Module]: "@modern-js/module-tools",
   [Solution.Monorepo]: "@modern-js/monorepo-tools"
 };
-function getSolutionNameFromSubSolution(solution) {
-  if (solution === SubSolution.MWATest) {
-    return Solution.MWA;
-  }
-  if (solution === SubSolution.InnerModule) {
-    return Solution.Module;
-  }
-  return solution;
-}
 var getSolutionSchema = (extra = {}) => {
   return {
     type: "object",
@@ -146293,7 +146211,7 @@ var getSolutionSchema = (extra = {}) => {
   };
 };
 var getScenesSchema = (extra = {}) => {
-  const hasPlugin = (extra === null || extra === void 0 ? void 0 : extra.customPlugin) && extra.customPlugin[(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) ? getSolutionNameFromSubSolution(extra === null || extra === void 0 ? void 0 : extra.solution) : extra === null || extra === void 0 ? void 0 : extra.solution] && extra.customPlugin[(extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) ? getSolutionNameFromSubSolution(extra === null || extra === void 0 ? void 0 : extra.solution) : extra === null || extra === void 0 ? void 0 : extra.solution].length > 0;
+  const hasPlugin = (extra === null || extra === void 0 ? void 0 : extra.customPlugin) && extra.customPlugin[extra === null || extra === void 0 ? void 0 : extra.solution] && extra.customPlugin[extra === null || extra === void 0 ? void 0 : extra.solution].length > 0;
   return {
     type: "object",
     properties: hasPlugin ? {
@@ -146301,7 +146219,7 @@ var getScenesSchema = (extra = {}) => {
         type: "string",
         title: i18n2.t(localeKeys2.scenes.self),
         enum: (() => {
-          const solution = (extra === null || extra === void 0 ? void 0 : extra.isMonorepoSubProject) ? getSolutionNameFromSubSolution(extra === null || extra === void 0 ? void 0 : extra.solution) : extra === null || extra === void 0 ? void 0 : extra.solution;
+          const solution = extra === null || extra === void 0 ? void 0 : extra.solution;
           const items = ((extra === null || extra === void 0 ? void 0 : extra.customPlugin) ? (extra === null || extra === void 0 ? void 0 : extra.customPlugin[solution]) || [] : []).map((plugin) => ({
             value: plugin.key,
             label: extra.locale === "zh" ? plugin.name_zh || plugin.name : plugin.name
@@ -146326,9 +146244,7 @@ var SolutionGenerator = {
 };
 var SubSolutionGenerator = {
   [SubSolution.MWA]: "@modern-js/mwa-generator",
-  [SubSolution.MWATest]: "@modern-js/mwa-generator",
-  [SubSolution.Module]: "@modern-js/module-generator",
-  [SubSolution.InnerModule]: "@modern-js/module-generator"
+  [SubSolution.Module]: "@modern-js/module-generator"
 };
 
 // ../../generator-common/dist/esm-node/common/language.js
@@ -146924,20 +146840,10 @@ var getMonorepoNewActionSchema = (extra = {}) => {
 };
 var MonorepoNewActionConfig = {
   [SubSolution.MWA]: {
-    isMonorepoSubProject: true,
-    isTest: false
-  },
-  [SubSolution.MWATest]: {
-    isMonorepoSubProject: true,
-    isTest: true
+    isMonorepoSubProject: true
   },
   [SubSolution.Module]: {
-    isMonorepoSubProject: true,
-    isPublic: true
-  },
-  [SubSolution.InnerModule]: {
-    isMonorepoSubProject: true,
-    isPublic: false
+    isMonorepoSubProject: true
   }
 };
 
@@ -150056,14 +149962,11 @@ var getNeedRunPlugin = (context, generatorPlugin) => {
     return false;
   }
   const { extendPlugin, customPlugin } = generatorPlugin;
-  const { isMonorepo, solution, scenes } = context.config;
-  const pluginSolution = isMonorepo ? getSolutionNameFromSubSolution(solution) : solution;
-  if (!scenes || scenes === pluginSolution) {
-    return (extendPlugin == null ? void 0 : extendPlugin[pluginSolution]) && extendPlugin[pluginSolution].length > 0;
+  const { solution, scenes } = context.config;
+  if (!scenes || scenes === solution) {
+    return (extendPlugin == null ? void 0 : extendPlugin[solution]) && extendPlugin[solution].length > 0;
   }
-  return Boolean(
-    (_a2 = customPlugin[pluginSolution]) == null ? void 0 : _a2.find((plugin) => plugin.key === scenes)
-  );
+  return Boolean((_a2 = customPlugin[solution]) == null ? void 0 : _a2.find((plugin) => plugin.key === scenes));
 };
 var handleTemplateFile = async (context, generator, appApi, generatorPlugin) => {
   const { isMonorepo } = context.config;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-nightly-20231005160631",
+  "version": "0.0.0-nightly-20231007160533",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -29,16 +29,16 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/base-generator": "0.0.0-nightly-20231005160631",
-    "@modern-js/generator-common": "0.0.0-nightly-20231005160631",
-    "@modern-js/generator-plugin": "0.0.0-nightly-20231005160631",
-    "@modern-js/generator-utils": "0.0.0-nightly-20231005160631",
-    "@modern-js/module-generator": "0.0.0-nightly-20231005160631",
-    "@modern-js/monorepo-generator": "0.0.0-nightly-20231005160631",
-    "@modern-js/mwa-generator": "0.0.0-nightly-20231005160631",
-    "@modern-js/utils": "0.0.0-nightly-20231005160631",
-    "@scripts/build": "0.0.0-nightly-20231005160631",
-    "@scripts/jest-config": "0.0.0-nightly-20231005160631"
+    "@modern-js/base-generator": "0.0.0-nightly-20231007160533",
+    "@modern-js/generator-common": "0.0.0-nightly-20231007160533",
+    "@modern-js/generator-plugin": "0.0.0-nightly-20231007160533",
+    "@modern-js/generator-utils": "0.0.0-nightly-20231007160533",
+    "@modern-js/module-generator": "0.0.0-nightly-20231007160533",
+    "@modern-js/monorepo-generator": "0.0.0-nightly-20231007160533",
+    "@modern-js/mwa-generator": "0.0.0-nightly-20231007160533",
+    "@modern-js/utils": "0.0.0-nightly-20231007160533",
+    "@scripts/build": "0.0.0-nightly-20231007160533",
+    "@scripts/jest-config": "0.0.0-nightly-20231007160533"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -13,7 +13,6 @@ import {
   SubSolution,
   SubSolutionGenerator,
   MonorepoNewActionConfig,
-  getSolutionNameFromSubSolution,
   getScenesSchema,
 } from '@modern-js/generator-common';
 import { GeneratorPlugin } from '@modern-js/generator-plugin';
@@ -47,18 +46,11 @@ const getNeedRunPlugin = (
     return false;
   }
   const { extendPlugin, customPlugin } = generatorPlugin;
-  const { isMonorepo, solution, scenes } = context.config;
-  const pluginSolution = isMonorepo
-    ? getSolutionNameFromSubSolution(solution)
-    : solution;
-  if (!scenes || scenes === pluginSolution) {
-    return (
-      extendPlugin?.[pluginSolution] && extendPlugin[pluginSolution].length > 0
-    );
+  const { solution, scenes } = context.config;
+  if (!scenes || scenes === solution) {
+    return extendPlugin?.[solution] && extendPlugin[solution].length > 0;
   }
-  return Boolean(
-    customPlugin[pluginSolution]?.find(plugin => plugin.key === scenes),
-  );
+  return Boolean(customPlugin[solution]?.find(plugin => plugin.key === scenes));
 };
 
 const handleTemplateFile = async (