@modern-js/ssg-generator 3.1.25 → 3.1.27

package/dist/index.js

@@ -115163,6 +115163,9 @@ var require_path = __commonJS({
       },
       removeSlash: function() {
         return removeSlash;
+      },
+      cutNameByHyphen: function() {
+        return cutNameByHyphen;
       }
     });
     var _interop_require_default = require_interop_require_default();
@@ -115212,6 +115215,9 @@ var require_path = __commonJS({
     var removeLeadingSlash = (s) => s.replace(/^\/+/, "");
     var removeTailSlash = (s) => s.replace(/\/+$/, "");
     var removeSlash = (s) => removeLeadingSlash(removeTailSlash(s));
+    var cutNameByHyphen = (s) => {
+      return s.split(/[-_]/)[0];
+    };
   }
 });
 
@@ -115687,49 +115693,6 @@ var require_prettyInstructions = __commonJS({
   }
 });
 
-// ../../../toolkit/utils/dist/cjs/cli/print.js
-var require_print = __commonJS({
-  "../../../toolkit/utils/dist/cjs/cli/print.js"(exports) {
-    "use strict";
-    Object.defineProperty(exports, "__esModule", {
-      value: true
-    });
-    Object.defineProperty(exports, "printBuildError", {
-      enumerable: true,
-      get: function() {
-        return printBuildError;
-      }
-    });
-    var _compiled = require_compiled();
-    var _logger = require_logger2();
-    function printBuildError(err) {
-      const message = err != null && err.message;
-      const stack = err != null && err.stack;
-      if (stack && typeof message === "string" && message.indexOf("from Terser") !== -1) {
-        try {
-          const matched = /(.+)\[(.+):(.+),(.+)\]\[.+\]/.exec(stack);
-          if (!matched) {
-            throw new Error("Using errors for control flow is bad.");
-          }
-          const problemPath = matched[2];
-          const line = matched[3];
-          const column = matched[4];
-          _logger.logger.error(`Failed to minify the code from this file: 
-
- ${_compiled.chalk.yellow(`	${problemPath}:${line}${column !== "0" ? ":" + column : ""}`)}
-`);
-        } catch (ignored) {
-          _logger.logger.error(`Failed to minify the bundle. ${err}
-`);
-        }
-      } else {
-        _logger.logger.error((message || err) + "\n");
-      }
-      _logger.logger.log();
-    }
-  }
-});
-
 // ../../../toolkit/utils/dist/cjs/cli/require.js
 var require_require = __commonJS({
   "../../../toolkit/utils/dist/cjs/cli/require.js"(exports, module2) {
@@ -115962,7 +115925,6 @@ var require_cli = __commonJS({
     _export_star._(require_pathSerializer(), exports);
     _export_star._(require_port(), exports);
     _export_star._(require_prettyInstructions(), exports);
-    _export_star._(require_print(), exports);
     _export_star._(require_require(), exports);
     _export_star._(require_runtimeExports(), exports);
     _export_star._(require_watch(), exports);
@@ -131217,7 +131179,7 @@ var src_default = (context, generator) => __async(void 0, null, function* () {
       const appDir = context.materials.default.basePath;
       const configFile = yield getModernConfigFile(appDir);
       const isTS = configFile.endsWith("ts");
-      const { pluginName, pluginDependence } = context.config;
+      const { pluginName, pluginDependence, shouldUsePluginNameExport } = context.config;
       console.info(
         import_utils16.chalk.green(`
 [INFO]`),
@@ -131226,9 +131188,17 @@ var src_default = (context, generator) => __async(void 0, null, function* () {
         ":",
         "\n"
       );
-      console.info(
-        import_utils16.chalk.yellow.bold(`import ${pluginName} from '${pluginDependence}';`)
-      );
+      if (shouldUsePluginNameExport) {
+        console.info(
+          import_utils16.chalk.yellow.bold(
+            `import { ${pluginName} } from '${pluginDependence}';`
+          )
+        );
+      } else {
+        console.info(
+          import_utils16.chalk.yellow.bold(`import ${pluginName} from '${pluginDependence}';`)
+        );
+      }
       if (isTS) {
         console.info(`
 export default defineConfig({

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.1.25",
+  "version": "3.1.27",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/index.js",
   "files": [
@@ -29,12 +29,12 @@
     "@types/node": "^14",
     "jest": "^29",
     "typescript": "^5",
-    "@modern-js/generator-common": "3.1.25",
-    "@modern-js/plugin-i18n": "2.24.1",
-    "@modern-js/generator-utils": "3.1.25",
-    "@modern-js/dependence-generator": "3.1.25",
-    "@scripts/build": "2.24.1",
-    "@scripts/jest-config": "2.24.1"
+    "@modern-js/dependence-generator": "3.1.27",
+    "@modern-js/plugin-i18n": "2.25.2",
+    "@modern-js/generator-utils": "3.1.27",
+    "@modern-js/generator-common": "3.1.27",
+    "@scripts/build": "2.25.2",
+    "@scripts/jest-config": "2.25.2"
   },
   "sideEffects": false,
   "publishConfig": {

package/src/index.ts

@@ -58,7 +58,8 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
       const appDir = context.materials.default.basePath;
       const configFile = await getModernConfigFile(appDir);
       const isTS = configFile.endsWith('ts');
-      const { pluginName, pluginDependence } = context.config;
+      const { pluginName, pluginDependence, shouldUsePluginNameExport } =
+        context.config;
       console.info(
         chalk.green(`\n[INFO]`),
         `${i18n.t(localeKeys.success)}`,
@@ -66,9 +67,17 @@ export default async (context: GeneratorContext, generator: GeneratorCore) => {
         ':',
         '\n',
       );
-      console.info(
-        chalk.yellow.bold(`import ${pluginName} from '${pluginDependence}';`),
-      );
+      if (shouldUsePluginNameExport) {
+        console.info(
+          chalk.yellow.bold(
+            `import { ${pluginName} } from '${pluginDependence}';`,
+          ),
+        );
+      } else {
+        console.info(
+          chalk.yellow.bold(`import ${pluginName} from '${pluginDependence}';`),
+        );
+      }
       if (isTS) {
         console.info(`
 export default defineConfig({