@modern-js/utils 2.23.0 → 2.24.0

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # @modern-js/utils
 
+## 2.24.0
+
+### Patch Changes
+
+- c882fbd: feat: support config main entry name
+
+  feat: 支持配置主入口名称
+
+- 4a82c3b: fix: export `@remix-run/router` cjs instead of `react-router-dom`
+  fix: 暴露 `@remix-run/router` 的 cjs 导出代替 `react-router-dom`
+
+## 2.23.1
+
+### Patch Changes
+
+- f08bbfc: feat(builder): add basic Vue 3 plugin
+
+  feat(builder): 增加基础的 Vue 3 插件
+
+- a6b313a: fix(builder): can't use new React JSX with parent's package.json
+
+  fix(builder): 修复 package.json 在父级目录时无法使用新版 react jsx 的问题
+
+- 8f2cab0: feat(builder): support using new URL to handle wasm assets
+
+  feat(builder): 支持通过 new URL 来处理 wasm 资源
+
 ## 2.23.0
 
 ### Patch Changes

package/dist/cjs/cli/constants/chainId.js

@@ -39,10 +39,14 @@ const CHAIN_ID = {
     SVG: "svg",
     /** Rule for pug */
     PUG: "pug",
+    /** Rule for Vue */
+    VUE: "vue",
     /** Rule for toml */
     TOML: "toml",
     /** Rule for yaml */
     YAML: "yaml",
+    /** Rule for wasm */
+    WASM: "wasm",
     /** Rule for bff */
     JS_BFF_API: "js-bff-api"
   },
@@ -69,6 +73,8 @@ const CHAIN_ID = {
     URL: "url",
     /** pug-loader */
     PUG: "pug",
+    /** vue-loader */
+    VUE: "vue",
     /** file-loader */
     FILE: "file",
     /** @svgr/webpack */
@@ -138,12 +144,16 @@ const CHAIN_ID = {
     BUNDLE_ANALYZER: "bundle-analyze",
     /** BottomTemplatePlugin */
     BOTTOM_TEMPLATE: "bottom-template",
-    /** HtmlCrossOriginPlugin */
-    HTML_CROSS_ORIGIN: "html-cross-origin",
+    /** HtmlTagsPlugin */
+    HTML_TAGS: "html-tags",
     /** HtmlNoncePlugin */
     HTML_NONCE: "html-nonce",
+    /** HtmlCrossOriginPlugin */
+    HTML_CROSS_ORIGIN: "html-cross-origin",
     /** MiniCssExtractPlugin */
     MINI_CSS_EXTRACT: "mini-css-extract",
+    /** VueLoaderPlugin */
+    VUE_LOADER_PLUGIN: "vue-loader-plugin",
     /** ReactFastRefreshPlugin */
     REACT_FAST_REFRESH: "react-fast-refresh",
     /** ProvidePlugin for node polyfill */
@@ -157,9 +167,7 @@ const CHAIN_ID = {
     /** HtmlAsyncChunkPlugin */
     HTML_ASYNC_CHUNK: "html-async-chunk",
     /** SWC_POLYFILL_CHECKER */
-    SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin",
-    /** HtmlTagsPlugin */
-    HTML_TAGS: "html-tags"
+    SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin"
   },
   /** Predefined minimizers */
   MINIMIZER: {

package/dist/cjs/cli/get/config.js

@@ -9,11 +9,10 @@ Object.defineProperty(exports, "getEntryOptions", {
   }
 });
 const _is = require("../is");
-const _constants = require("../constants");
-const getEntryOptions = (name, baseOptions, optionsByEntries, packageName) => {
+const getEntryOptions = (name, isMainEntry, baseOptions, optionsByEntries, packageName) => {
   if (optionsByEntries) {
     let optionsByEntry = getOptionsByEntryName(name, optionsByEntries);
-    if (optionsByEntry === void 0 && name === _constants.MAIN_ENTRY_NAME && packageName) {
+    if (optionsByEntry === void 0 && isMainEntry && packageName) {
       optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
     }
     return optionsByEntry !== void 0 ? (0, _is.isPlainObject)(optionsByEntry) && (0, _is.isPlainObject)(baseOptions) ? {

package/dist/cjs/cli/index.js

@@ -22,6 +22,5 @@ _export_star._(require("./port"), exports);
 _export_star._(require("./prettyInstructions"), exports);
 _export_star._(require("./print"), exports);
 _export_star._(require("./require"), exports);
-_export_star._(require("./routes"), exports);
 _export_star._(require("./runtimeExports"), exports);
 _export_star._(require("./watch"), exports);

package/dist/cjs/cli/is/project.js

@@ -34,6 +34,7 @@ _export(exports, {
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
+const _pkgup = /* @__PURE__ */ _interop_require_default._(require("../../../compiled/pkg-up"));
 const _commands = require("../commands");
 const _compiled = require("../../compiled");
 const _common = require("../common");
@@ -73,8 +74,10 @@ const isWebOnly = async () => {
   return Boolean(options["web-only"]);
 };
 const isBeyondReact17 = (cwd) => {
-  const pkgPath = _path.default.join(cwd, "package.json");
-  if (!_compiled.fs.existsSync(pkgPath)) {
+  const pkgPath = _pkgup.default.sync({
+    cwd
+  });
+  if (!pkgPath) {
     return false;
   }
   const pkgInfo = JSON.parse(_compiled.fs.readFileSync(pkgPath, "utf8"));

package/dist/esm/cli/constants/chainId.js

@@ -29,10 +29,14 @@ export const CHAIN_ID = {
     SVG: "svg",
     /** Rule for pug */
     PUG: "pug",
+    /** Rule for Vue */
+    VUE: "vue",
     /** Rule for toml */
     TOML: "toml",
     /** Rule for yaml */
     YAML: "yaml",
+    /** Rule for wasm */
+    WASM: "wasm",
     /** Rule for bff */
     JS_BFF_API: "js-bff-api"
   },
@@ -59,6 +63,8 @@ export const CHAIN_ID = {
     URL: "url",
     /** pug-loader */
     PUG: "pug",
+    /** vue-loader */
+    VUE: "vue",
     /** file-loader */
     FILE: "file",
     /** @svgr/webpack */
@@ -128,12 +134,16 @@ export const CHAIN_ID = {
     BUNDLE_ANALYZER: "bundle-analyze",
     /** BottomTemplatePlugin */
     BOTTOM_TEMPLATE: "bottom-template",
-    /** HtmlCrossOriginPlugin */
-    HTML_CROSS_ORIGIN: "html-cross-origin",
+    /** HtmlTagsPlugin */
+    HTML_TAGS: "html-tags",
     /** HtmlNoncePlugin */
     HTML_NONCE: "html-nonce",
+    /** HtmlCrossOriginPlugin */
+    HTML_CROSS_ORIGIN: "html-cross-origin",
     /** MiniCssExtractPlugin */
     MINI_CSS_EXTRACT: "mini-css-extract",
+    /** VueLoaderPlugin */
+    VUE_LOADER_PLUGIN: "vue-loader-plugin",
     /** ReactFastRefreshPlugin */
     REACT_FAST_REFRESH: "react-fast-refresh",
     /** ProvidePlugin for node polyfill */
@@ -147,9 +157,7 @@ export const CHAIN_ID = {
     /** HtmlAsyncChunkPlugin */
     HTML_ASYNC_CHUNK: "html-async-chunk",
     /** SWC_POLYFILL_CHECKER */
-    SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin",
-    /** HtmlTagsPlugin */
-    HTML_TAGS: "html-tags"
+    SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin"
   },
   /** Predefined minimizers */
   MINIMIZER: {

package/dist/esm/cli/get/config.js

@@ -1,9 +1,8 @@
 import { isPlainObject } from "../is";
-import { MAIN_ENTRY_NAME } from "../constants";
-export const getEntryOptions = (name, baseOptions, optionsByEntries, packageName) => {
+export const getEntryOptions = (name, isMainEntry, baseOptions, optionsByEntries, packageName) => {
   if (optionsByEntries) {
     let optionsByEntry = getOptionsByEntryName(name, optionsByEntries);
-    if (optionsByEntry === void 0 && name === MAIN_ENTRY_NAME && packageName) {
+    if (optionsByEntry === void 0 && isMainEntry && packageName) {
       optionsByEntry = getOptionsByEntryName(packageName, optionsByEntries);
     }
     return optionsByEntry !== void 0 ? isPlainObject(optionsByEntry) && isPlainObject(baseOptions) ? {

package/dist/esm/cli/index.js

@@ -17,6 +17,5 @@ export * from "./port";
 export * from "./prettyInstructions";
 export * from "./print";
 export * from "./require";
-export * from "./routes";
 export * from "./runtimeExports";
 export * from "./watch";

package/dist/esm/cli/is/project.js

@@ -1,4 +1,5 @@
 import path from "path";
+import pkgUp from "../../../compiled/pkg-up";
 import { getArgv } from "../commands";
 import { fs, minimist, semver } from "../../compiled";
 import { createDebugger } from "../common";
@@ -38,8 +39,10 @@ export const isWebOnly = async () => {
   return Boolean(options["web-only"]);
 };
 export const isBeyondReact17 = (cwd) => {
-  const pkgPath = path.join(cwd, "package.json");
-  if (!fs.existsSync(pkgPath)) {
+  const pkgPath = pkgUp.sync({
+    cwd
+  });
+  if (!pkgPath) {
     return false;
   }
   const pkgInfo = JSON.parse(fs.readFileSync(pkgPath, "utf8"));

package/dist/types/cli/constants/chainId.d.ts

@@ -29,10 +29,14 @@ export declare const CHAIN_ID: {
     readonly SVG: "svg";
     /** Rule for pug */
     readonly PUG: "pug";
+    /** Rule for Vue */
+    readonly VUE: "vue";
     /** Rule for toml */
     readonly TOML: "toml";
     /** Rule for yaml */
     readonly YAML: "yaml";
+    /** Rule for wasm */
+    readonly WASM: "wasm";
     /** Rule for bff */
     readonly JS_BFF_API: "js-bff-api";
   };
@@ -59,6 +63,8 @@ export declare const CHAIN_ID: {
     readonly URL: "url";
     /** pug-loader */
     readonly PUG: "pug";
+    /** vue-loader */
+    readonly VUE: "vue";
     /** file-loader */
     readonly FILE: "file";
     /** @svgr/webpack */
@@ -128,12 +134,16 @@ export declare const CHAIN_ID: {
     readonly BUNDLE_ANALYZER: "bundle-analyze";
     /** BottomTemplatePlugin */
     readonly BOTTOM_TEMPLATE: "bottom-template";
-    /** HtmlCrossOriginPlugin */
-    readonly HTML_CROSS_ORIGIN: "html-cross-origin";
+    /** HtmlTagsPlugin */
+    readonly HTML_TAGS: "html-tags";
     /** HtmlNoncePlugin */
     readonly HTML_NONCE: "html-nonce";
+    /** HtmlCrossOriginPlugin */
+    readonly HTML_CROSS_ORIGIN: "html-cross-origin";
     /** MiniCssExtractPlugin */
     readonly MINI_CSS_EXTRACT: "mini-css-extract";
+    /** VueLoaderPlugin */
+    readonly VUE_LOADER_PLUGIN: "vue-loader-plugin";
     /** ReactFastRefreshPlugin */
     readonly REACT_FAST_REFRESH: "react-fast-refresh";
     /** ProvidePlugin for node polyfill */
@@ -148,8 +158,6 @@ export declare const CHAIN_ID: {
     readonly HTML_ASYNC_CHUNK: "html-async-chunk";
     /** SWC_POLYFILL_CHECKER */
     readonly SWC_POLYFILL_CHECKER: "swc-polyfill-checker-plugin";
-    /** HtmlTagsPlugin */
-    readonly HTML_TAGS: "html-tags";
   };
   /** Predefined minimizers */
   readonly MINIMIZER: {

package/dist/types/cli/get/config.d.ts

@@ -1 +1 @@
-export declare const getEntryOptions: <T>(name: string, baseOptions?: T | undefined, optionsByEntries?: Record<string, T> | undefined, packageName?: string) => T | undefined;
+export declare const getEntryOptions: <T>(name: string, isMainEntry: boolean, baseOptions?: T | undefined, optionsByEntries?: Record<string, T> | undefined, packageName?: string) => T | undefined;

package/dist/types/cli/index.d.ts

@@ -17,6 +17,5 @@ export * from './port';
 export * from './prettyInstructions';
 export * from './print';
 export * from './require';
-export * from './routes';
 export * from './runtimeExports';
 export * from './watch';

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.23.0",
+  "version": "2.24.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -36,11 +36,11 @@
     },
     "./runtime/router": {
       "types": "./dist/types/runtime/router.d.ts",
-      "require": "./dist/cjs/runtime/router.js",
       "default": "./dist/esm/runtime/router.js"
     },
     "./runtime/remix-router": {
       "types": "./dist/types/runtime/remixRouter.d.ts",
+      "require": "./dist/cjs/runtime/remixRouter.js",
       "default": "./dist/esm/runtime/remixRouter.js"
     },
     "./runtime/nested-routes": {
@@ -235,9 +235,9 @@
     "typescript": "^5",
     "webpack": "^5.82.1",
     "@types/serialize-javascript": "^5.0.1",
-    "@modern-js/types": "2.23.0",
-    "@scripts/build": "2.23.0",
-    "@scripts/jest-config": "2.23.0"
+    "@modern-js/types": "2.24.0",
+    "@scripts/build": "2.24.0",
+    "@scripts/jest-config": "2.24.0"
   },
   "sideEffects": false,
   "scripts": {

package/dist/cjs/cli/routes.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "getRouteId", {
-  enumerable: true,
-  get: function() {
-    return getRouteId;
-  }
-});
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _constants = require("./constants");
-const _path1 = require("./path");
-const getPathWithoutExt = (filename) => {
-  const extname = _path.default.extname(filename);
-  return filename.slice(0, -extname.length);
-};
-const getRouteId = (componentPath, routesDir, entryName) => {
-  const relativePath = (0, _path1.normalizeToPosixPath)(_path.default.relative(routesDir, componentPath));
-  const pathWithoutExt = getPathWithoutExt(relativePath);
-  let id = ``;
-  if (entryName === _constants.MAIN_ENTRY_NAME) {
-    id = pathWithoutExt;
-  } else {
-    id = `${entryName}_${pathWithoutExt}`;
-  }
-  return id.replace(/\[(.*?)\]/g, "($1)");
-};

package/dist/esm/cli/routes.js

@@ -1,18 +0,0 @@
-import path from "path";
-import { MAIN_ENTRY_NAME } from "./constants";
-import { normalizeToPosixPath } from "./path";
-const getPathWithoutExt = (filename) => {
-  const extname = path.extname(filename);
-  return filename.slice(0, -extname.length);
-};
-export const getRouteId = (componentPath, routesDir, entryName) => {
-  const relativePath = normalizeToPosixPath(path.relative(routesDir, componentPath));
-  const pathWithoutExt = getPathWithoutExt(relativePath);
-  let id = ``;
-  if (entryName === MAIN_ENTRY_NAME) {
-    id = pathWithoutExt;
-  } else {
-    id = `${entryName}_${pathWithoutExt}`;
-  }
-  return id.replace(/\[(.*?)\]/g, "($1)");
-};

package/dist/types/cli/routes.d.ts

@@ -1 +0,0 @@
-export declare const getRouteId: (componentPath: string, routesDir: string, entryName: string) => string;