@modern-js/mwa-generator 3.7.0 → 3.7.1

package/dist/index.js

@@ -1290,9 +1290,9 @@
             module1.exports.win32 = win32;
         }
     });
-    // ../../../../node_modules/.pnpm/glob@7.2.0/node_modules/glob/common.js
+    // ../../../../node_modules/.pnpm/glob@7.2.3/node_modules/glob/common.js
     var require_common = __commonJS({
-        "../../../../node_modules/.pnpm/glob@7.2.0/node_modules/glob/common.js" (exports) {
+        "../../../../node_modules/.pnpm/glob@7.2.3/node_modules/glob/common.js" (exports) {
             "use strict";
             exports.setopts = setopts;
             exports.ownProp = ownProp;
@@ -1383,6 +1383,7 @@
                 self2.nomount = !!options.nomount;
                 options.nonegate = true;
                 options.nocomment = true;
+                options.allowWindowsEscape = false;
                 self2.minimatch = new Minimatch(pattern, options);
                 self2.options = self2.minimatch.options;
             }
@@ -1470,9 +1471,9 @@
             }
         }
     });
-    // ../../../../node_modules/.pnpm/glob@7.2.0/node_modules/glob/sync.js
+    // ../../../../node_modules/.pnpm/glob@7.2.3/node_modules/glob/sync.js
     var require_sync = __commonJS({
-        "../../../../node_modules/.pnpm/glob@7.2.0/node_modules/glob/sync.js" (exports, module1) {
+        "../../../../node_modules/.pnpm/glob@7.2.3/node_modules/glob/sync.js" (exports, module1) {
             "use strict";
             module1.exports = globSync;
             globSync.GlobSync = GlobSync;
@@ -1507,7 +1508,7 @@
                 this._finish();
             }
             GlobSync.prototype._finish = function() {
-                assert(this instanceof GlobSync);
+                assert.ok(this instanceof GlobSync);
                 if (this.realpath) {
                     var self2 = this;
                     this.matches.forEach(function(matchset, index) {
@@ -1527,7 +1528,7 @@
                 common2.finish(this);
             };
             GlobSync.prototype._process = function(pattern, index, inGlobStar) {
-                assert(this instanceof GlobSync);
+                assert.ok(this instanceof GlobSync);
                 var n = 0;
                 while(typeof pattern[n] === "string"){
                     n++;
@@ -1547,7 +1548,9 @@
                 var remain = pattern.slice(n);
                 var read;
                 if (prefix === null) read = ".";
-                else if (isAbsolute(prefix) || isAbsolute(pattern.join("/"))) {
+                else if (isAbsolute(prefix) || isAbsolute(pattern.map(function(p) {
+                    return typeof p === "string" ? p : "[*]";
+                }).join("/"))) {
                     if (!prefix || !isAbsolute(prefix)) prefix = "/" + prefix;
                     read = prefix;
                 } else read = prefix;
@@ -1898,9 +1901,9 @@
             }
         }
     });
-    // ../../../../node_modules/.pnpm/glob@7.2.0/node_modules/glob/glob.js
+    // ../../../../node_modules/.pnpm/glob@7.2.3/node_modules/glob/glob.js
     var require_glob = __commonJS({
-        "../../../../node_modules/.pnpm/glob@7.2.0/node_modules/glob/glob.js" (exports, module1) {
+        "../../../../node_modules/.pnpm/glob@7.2.3/node_modules/glob/glob.js" (exports, module1) {
             "use strict";
             module1.exports = glob2;
             var rp = require_fs();
@@ -2114,7 +2117,9 @@
                 var remain = pattern.slice(n);
                 var read;
                 if (prefix === null) read = ".";
-                else if (isAbsolute(prefix) || isAbsolute(pattern.join("/"))) {
+                else if (isAbsolute(prefix) || isAbsolute(pattern.map(function(p) {
+                    return typeof p === "string" ? p : "[*]";
+                }).join("/"))) {
                     if (!prefix || !isAbsolute(prefix)) prefix = "/" + prefix;
                     read = prefix;
                 } else read = prefix;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.7.0",
+  "version": "3.7.1",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -23,22 +23,22 @@
     "/dist/index.js"
   ],
   "devDependencies": {
-    "@modern-js/codesmith-utils": "2.6.4",
-    "@modern-js/codesmith": "2.6.4",
-    "@modern-js/codesmith-api-app": "2.6.4",
+    "@modern-js/codesmith-utils": "2.6.5",
+    "@modern-js/codesmith": "2.6.5",
+    "@modern-js/codesmith-api-app": "2.6.5",
     "@types/jest": "^29",
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/base-generator": "3.7.0",
-    "@modern-js/generator-common": "3.7.0",
-    "@modern-js/dependence-generator": "3.7.0",
-    "@modern-js/generator-utils": "3.7.0",
-    "@modern-js/entry-generator": "3.7.0",
-    "@modern-js/packages-generator": "3.7.0",
-    "@modern-js/plugin-i18n": "2.60.4",
-    "@scripts/build": "2.60.4",
-    "@scripts/jest-config": "2.60.4"
+    "@modern-js/base-generator": "3.7.1",
+    "@modern-js/dependence-generator": "3.7.1",
+    "@modern-js/entry-generator": "3.7.1",
+    "@modern-js/generator-common": "3.7.1",
+    "@modern-js/generator-utils": "3.7.1",
+    "@modern-js/packages-generator": "3.7.1",
+    "@modern-js/plugin-i18n": "2.60.5",
+    "@scripts/build": "2.60.5",
+    "@scripts/jest-config": "2.60.5"
   },
   "sideEffects": false,
   "publishConfig": {

package/templates/base-template/package.json.handlebars

@@ -29,8 +29,8 @@
   {{/unless}}
   "dependencies": {
     "@modern-js/runtime": "{{modernVersion}}",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "devDependencies": {
     "@modern-js/app-tools": "{{modernVersion}}",
@@ -39,9 +39,9 @@
     {{#if isTs}}
     "typescript": "~5.0.4",
     "@types/jest": "~29.2.4",
-    "@types/node": "~16.11.7",
-    "@types/react": "~18.0.26",
-    "@types/react-dom": "~18.0.10",
+    "@types/node": "~18.11.9",
+    "@types/react": "^18.3.11",
+    "@types/react-dom": "~18.3.1",
     {{/if}}
     "lint-staged": "~13.1.0",
     "simple-git-hooks": "^2.11.1",

package/src/index.ts

@@ -1,253 +0,0 @@
-import path from 'path';
-import type { GeneratorContext, GeneratorCore } from '@modern-js/codesmith';
-import { AppAPI } from '@modern-js/codesmith-api-app';
-import {
-  BaseGenerator,
-  EntryGenerator,
-  Language,
-  PackagesGenerator,
-  Solution,
-  i18n as commonI18n,
-  getMWASchema,
-} from '@modern-js/generator-common';
-import {
-  getAllPackages,
-  getGeneratorPath,
-  getMWAProjectPath,
-  getModernVersion,
-  getPackageManagerText,
-  i18n as utilsI18n,
-  validatePackageName,
-  validatePackagePath,
-} from '@modern-js/generator-utils';
-import { i18n, localeKeys } from './locale';
-
-export const handleTemplateFile = async (
-  context: GeneratorContext,
-  generator: GeneratorCore,
-  appApi: AppAPI,
-) => {
-  generator.logger?.timing(`🕐 Get Modern.js app-tools version`);
-  const modernVersion = await getModernVersion(
-    Solution.MWA,
-    context.config.registry,
-    context.config.distTag,
-  );
-  generator.logger?.timing(`🕐 Get Modern.js app-tools version`, true);
-
-  const { isMonorepoSubProject, projectDir = '' } = context.config;
-
-  const { outputPath } = generator;
-
-  let packages: string[] = [];
-
-  if (isMonorepoSubProject) {
-    try {
-      packages = getAllPackages(outputPath);
-    } catch (e) {
-      generator.logger.debug(`❗️ [Get All Packages Error]: ${e}`);
-      generator.logger.warn(`🟡 ${i18n.t(localeKeys.get_packages_error)}`);
-    }
-  }
-
-  context.config = {
-    ...context.config,
-    isMwa: true,
-    isEmptySrc: true,
-  };
-
-  const { hasPlugin, generatorPlugin, ...extra } = context.config;
-
-  let ans: Record<string, unknown> = {};
-
-  if (hasPlugin) {
-    await generatorPlugin.installPlugins(Solution.MWA, extra);
-    const schema = generatorPlugin.getInputSchema();
-    const inputValue = generatorPlugin.getInputValue();
-    const defaultConfig = generatorPlugin.getDefaultConfig();
-    context.config.gitCommitMessage =
-      generatorPlugin.getGitMessage() || context.config.gitCommitMessage;
-    ans = await appApi.getInputBySchema(
-      schema,
-      'formily',
-      { ...context.config, ...defaultConfig },
-      {
-        packageName: input =>
-          validatePackageName(input as string, packages, {
-            isMonorepoSubProject,
-          }),
-        packagePath: input =>
-          validatePackagePath(
-            input as string,
-            path.join(process.cwd(), projectDir),
-            {
-              isMwa: true,
-            },
-          ),
-      },
-      { ...inputValue },
-    );
-  } else {
-    ans = await appApi.getInputBySchemaFunc(
-      getMWASchema,
-      { ...context.config },
-      {
-        packageName: input =>
-          validatePackageName(input as string, packages, {
-            isMonorepoSubProject,
-          }),
-        packagePath: input =>
-          validatePackagePath(
-            input as string,
-            path.join(process.cwd(), projectDir),
-            { isMwa: true },
-          ),
-      },
-    );
-  }
-
-  generator.logger.debug(`💡 [Input Answer]: ${JSON.stringify(ans)}`);
-
-  const { packageName, packagePath, language, packageManager } = ans;
-  const { packagesInfo } = context.config;
-
-  const bundler = `'rspack', // Set to 'webpack' to enable webpack`;
-
-  const projectPath = getMWAProjectPath(
-    packagePath as string,
-    isMonorepoSubProject,
-  );
-
-  const dirname = path.basename(generator.outputPath);
-
-  await appApi.runSubGenerator(
-    getGeneratorPath(BaseGenerator, context.config.distTag, [__dirname]),
-    undefined,
-    { ...context.config, hasPlugin: false },
-  );
-
-  await appApi.forgeTemplate(
-    'templates/base-template/**/*',
-    undefined,
-    resourceKey =>
-      resourceKey
-        .replace('templates/base-template/', projectPath)
-        .replace('.handlebars', ''),
-    {
-      name: packageName || dirname,
-      isMonorepoSubProject,
-      modernVersion,
-      packageManager,
-      isTs: language === Language.TS,
-    },
-  );
-
-  if (language === Language.TS) {
-    await appApi.forgeTemplate(
-      'templates/ts-template/**/*',
-      undefined,
-      resourceKey =>
-        resourceKey
-          .replace('templates/ts-template/', projectPath)
-          .replace('.handlebars', ''),
-      {
-        bundler,
-      },
-    );
-  } else {
-    await appApi.forgeTemplate(
-      'templates/js-template/**/*',
-      undefined,
-      resourceKey =>
-        resourceKey
-          .replace('templates/js-template/', projectPath)
-          .replace('.handlebars', ''),
-      {
-        bundler,
-      },
-    );
-  }
-
-  await appApi.runSubGenerator(
-    getGeneratorPath(EntryGenerator, context.config.distTag, [__dirname]),
-    `./${projectPath}`,
-    {
-      ...context.config,
-      isSubGenerator: true,
-    },
-  );
-
-  if (isMonorepoSubProject) {
-    await appApi.updateWorkspace({
-      name: packagePath as string,
-      path: projectPath,
-    });
-  }
-
-  if (packagesInfo && Object.keys(packagesInfo).length > 0) {
-    await appApi.runSubGenerator(
-      getGeneratorPath(PackagesGenerator, context.config.distTag, [__dirname]),
-      undefined,
-      context.config,
-    );
-  }
-
-  return { projectPath };
-};
-
-export default async (context: GeneratorContext, generator: GeneratorCore) => {
-  const appApi = new AppAPI(context, generator);
-
-  const { locale, successInfo } = context.config;
-  commonI18n.changeLanguage({ locale });
-  utilsI18n.changeLanguage({ locale });
-  appApi.i18n.changeLanguage({ locale });
-  i18n.changeLanguage({ locale });
-
-  if (!(await appApi.checkEnvironment())) {
-    process.exit(1);
-  }
-
-  generator.logger.debug(`🚀 [Start Run MWA Generator]`);
-  generator.logger.debug(
-    '💡 [Current Config]:',
-    JSON.stringify(context.config),
-  );
-
-  let projectPath = '';
-  try {
-    ({ projectPath } = await handleTemplateFile(context, generator, appApi));
-  } catch (e) {
-    generator.logger.error(`🔴 [Handle MWA Template Error]:`, e);
-    process.exit(1);
-  }
-
-  if (context.handleForged) {
-    await context.handleForged(
-      Solution.MWA,
-      context,
-      context.config.hasPlugin,
-      projectPath,
-    );
-  }
-
-  try {
-    await appApi.runGitAndInstall(context.config.gitCommitMessage);
-  } catch (e) {
-    process.exit(1);
-  }
-
-  const { packageManager } = context.config;
-
-  if (successInfo) {
-    appApi.showSuccessInfo(successInfo);
-  } else {
-    appApi.showSuccessInfo(
-      i18n.t(localeKeys.success, {
-        packageManager: getPackageManagerText(packageManager),
-      }),
-    );
-  }
-
-  generator.logger.debug(`🌟 [End Run MWA Generator]`);
-};