@modern-js/app-tools 3.8.2 → 3.9.0

package/dist/cjs/esm/register-esm.js

@@ -46,6 +46,7 @@ const registerModuleHooks = async ({ appDir, distDir, baseUrl, paths })=>{
     process.env.TS_NODE_IGNORE = `(?:^|/)node_modules/,(?:^|/)${external_node_path_namespaceObject.relative(appDir, distDir)}/`;
     register('./ts-node-loader.mjs', __rslib_import_meta_url__, {
         data: {
+            appDir,
             baseUrl,
             paths
         }

package/dist/cjs/esm/register-esm.mjs

@@ -10,6 +10,7 @@ export const registerModuleHooks = async ({ appDir, distDir, baseUrl, paths })=>
     process.env.TS_NODE_IGNORE = `(?:^|/)node_modules/,(?:^|/)${path.relative(appDir, distDir)}/`;
     register('./ts-node-loader.mjs', import.meta.url, {
         data: {
+            appDir,
             baseUrl,
             paths
         }

package/dist/cjs/esm/ts-node-loader.js

@@ -32,17 +32,13 @@ __webpack_require__.d(__webpack_exports__, {
     load: ()=>load,
     resolve: ()=>resolve
 });
-const external_url_namespaceObject = require("url");
-const utils_namespaceObject = require("@modern-js/utils");
-const tsconfig_paths_namespaceObject = require("@modern-js/utils/tsconfig-paths");
 const esm_namespaceObject = require("ts-node/esm");
-let matchPath;
-async function initialize({ baseUrl, paths }) {
-    matchPath = (0, tsconfig_paths_namespaceObject.createMatchPath)(baseUrl || './', paths || {});
+const external_ts_paths_loader_js_namespaceObject = require("./ts-paths-loader.js");
+async function initialize(config) {
+    await (0, external_ts_paths_loader_js_namespaceObject.initialize)(config);
 }
 function resolve(specifier, context, defaultResolve) {
-    const match = (0, utils_namespaceObject.findMatchedSourcePath)(matchPath, specifier);
-    return match ? (0, esm_namespaceObject.resolve)((0, external_url_namespaceObject.pathToFileURL)((0, utils_namespaceObject.findSourceEntry)(match) || match).href, context, defaultResolve) : (0, esm_namespaceObject.resolve)(specifier, context, defaultResolve);
+    return (0, external_ts_paths_loader_js_namespaceObject.resolve)(specifier, context, (specifier, context)=>(0, esm_namespaceObject.resolve)(specifier, context, defaultResolve));
 }
 function load(url, context, defaultLoad) {
     const filePath = new URL(url).pathname;

package/dist/cjs/esm/ts-node-loader.mjs

@@ -1,15 +1,11 @@
-import { pathToFileURL } from 'url';
-import { findMatchedSourcePath, findSourceEntry } from '@modern-js/utils';
-import { createMatchPath } from '@modern-js/utils/tsconfig-paths';
 import { resolve as tsNodeResolve } from 'ts-node/esm';
 import { load as tsNodeLoad } from 'ts-node/esm';
-let matchPath;
-export async function initialize({ baseUrl, paths }) {
-    matchPath = createMatchPath(baseUrl || './', paths || {});
+import { initialize as initializeTsPathsLoader, resolve as resolveTsPaths } from './ts-paths-loader.mjs';
+export async function initialize(config) {
+    await initializeTsPathsLoader(config);
 }
 export function resolve(specifier, context, defaultResolve) {
-    const match = findMatchedSourcePath(matchPath, specifier);
-    return match ? tsNodeResolve(pathToFileURL(findSourceEntry(match) || match).href, context, defaultResolve) : tsNodeResolve(specifier, context, defaultResolve);
+    return resolveTsPaths(specifier, context, (specifier, context)=>tsNodeResolve(specifier, context, defaultResolve));
 }
 export function load(url, context, defaultLoad) {
     const filePath = new URL(url).pathname;

package/dist/esm/esm/register-esm.mjs

@@ -10,6 +10,7 @@ const registerModuleHooks = async ({ appDir, distDir, baseUrl, paths })=>{
     process.env.TS_NODE_IGNORE = `(?:^|/)node_modules/,(?:^|/)${node_path.relative(appDir, distDir)}/`;
     register('./ts-node-loader.mjs', import.meta.url, {
         data: {
+            appDir,
             baseUrl,
             paths
         }

package/dist/esm/esm/ts-node-loader.mjs

@@ -1,14 +1,10 @@
-import { pathToFileURL } from "url";
-import { findMatchedSourcePath, findSourceEntry } from "@modern-js/utils";
-import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
 import { load, resolve } from "ts-node/esm";
-let matchPath;
-async function initialize({ baseUrl, paths }) {
-    matchPath = createMatchPath(baseUrl || './', paths || {});
+import { initialize, resolve as external_ts_paths_loader_mjs_resolve } from "./ts-paths-loader.mjs";
+async function ts_node_loader_initialize(config) {
+    await initialize(config);
 }
 function ts_node_loader_resolve(specifier, context, defaultResolve) {
-    const match = findMatchedSourcePath(matchPath, specifier);
-    return match ? resolve(pathToFileURL(findSourceEntry(match) || match).href, context, defaultResolve) : resolve(specifier, context, defaultResolve);
+    return external_ts_paths_loader_mjs_resolve(specifier, context, (specifier, context)=>resolve(specifier, context, defaultResolve));
 }
 function ts_node_loader_load(url, context, defaultLoad) {
     const filePath = new URL(url).pathname;
@@ -16,4 +12,4 @@ function ts_node_loader_load(url, context, defaultLoad) {
     if (filePath.includes('node_modules')) return defaultLoad(url, context);
     return load(url, context, defaultLoad);
 }
-export { initialize, ts_node_loader_load as load, ts_node_loader_resolve as resolve };
+export { ts_node_loader_initialize as initialize, ts_node_loader_load as load, ts_node_loader_resolve as resolve };

package/dist/esm/plugins/analyze/getHtmlTemplate.mjs

@@ -1,7 +1,7 @@
 import path from "path";
 import { findExists, fs } from "@modern-js/utils";
 import { HTML_PARTIALS_EXTENSIONS, HTML_PARTIALS_FOLDER } from "./constants.mjs";
-import * as __rspack_external__templates_mjs_4da4c6c8 from "./templates.mjs";
+import * as __rspack_external__templates_mjs_ab577925 from "./templates.mjs";
 const findPartials = (dir, entryName, position)=>{
     if (fs.existsSync(dir)) {
         const base = findExists(HTML_PARTIALS_EXTENSIONS.map((ext)=>path.resolve(dir, `${position}${ext}`)));
@@ -70,7 +70,7 @@ const getHtmlTemplate = async (entrypoints, hooks, { appContext, config })=>{
                 partials: getModifyHtmlPartials(partials)
             });
             const templatePath = path.resolve(internalDirectory, entryName, 'index.html');
-            fs.outputFileSync(templatePath, __rspack_external__templates_mjs_4da4c6c8.html(partials), 'utf8');
+            fs.outputFileSync(templatePath, __rspack_external__templates_mjs_ab577925.html(partials), 'utf8');
             htmlTemplates[entryName] = templatePath.replace(/\\/g, '/');
             partialsByEntrypoint[entryName] = partials;
             const bottomTemplate = findPartials(htmlDir, name, "bottom");

package/dist/esm/plugins/analyze/isDefaultExportFunction.mjs

@@ -1,8 +1,8 @@
 import fs from "fs";
 import { parse } from "@babel/parser";
 import traverse from "@babel/traverse";
-import * as __rspack_external__babel_types_69e65b52 from "@babel/types";
-const isFunction = (node)=>__rspack_external__babel_types_69e65b52.isFunctionDeclaration(node) || __rspack_external__babel_types_69e65b52.isFunctionExpression(node) || __rspack_external__babel_types_69e65b52.isArrowFunctionExpression(node);
+import * as __rspack_external__babel_types_6e8337dd from "@babel/types";
+const isFunction = (node)=>__rspack_external__babel_types_6e8337dd.isFunctionDeclaration(node) || __rspack_external__babel_types_6e8337dd.isFunctionExpression(node) || __rspack_external__babel_types_6e8337dd.isArrowFunctionExpression(node);
 const isDefaultExportFunction = (file)=>{
     if (!file || !fs.existsSync(file)) return false;
     const ast = parse(fs.readFileSync(file, 'utf8'), {

package/dist/esm-node/esm/register-esm.mjs

@@ -11,6 +11,7 @@ const registerModuleHooks = async ({ appDir, distDir, baseUrl, paths })=>{
     process.env.TS_NODE_IGNORE = `(?:^|/)node_modules/,(?:^|/)${node_path.relative(appDir, distDir)}/`;
     register('./ts-node-loader.mjs', import.meta.url, {
         data: {
+            appDir,
             baseUrl,
             paths
         }

package/dist/esm-node/esm/ts-node-loader.mjs

@@ -1,15 +1,11 @@
 import "node:module";
-import { pathToFileURL } from "url";
-import { findMatchedSourcePath, findSourceEntry } from "@modern-js/utils";
-import { createMatchPath } from "@modern-js/utils/tsconfig-paths";
 import { load, resolve } from "ts-node/esm";
-let matchPath;
-async function initialize({ baseUrl, paths }) {
-    matchPath = createMatchPath(baseUrl || './', paths || {});
+import { initialize, resolve as external_ts_paths_loader_mjs_resolve } from "./ts-paths-loader.mjs";
+async function ts_node_loader_initialize(config) {
+    await initialize(config);
 }
 function ts_node_loader_resolve(specifier, context, defaultResolve) {
-    const match = findMatchedSourcePath(matchPath, specifier);
-    return match ? resolve(pathToFileURL(findSourceEntry(match) || match).href, context, defaultResolve) : resolve(specifier, context, defaultResolve);
+    return external_ts_paths_loader_mjs_resolve(specifier, context, (specifier, context)=>resolve(specifier, context, defaultResolve));
 }
 function ts_node_loader_load(url, context, defaultLoad) {
     const filePath = new URL(url).pathname;
@@ -17,4 +13,4 @@ function ts_node_loader_load(url, context, defaultLoad) {
     if (filePath.includes('node_modules')) return defaultLoad(url, context);
     return load(url, context, defaultLoad);
 }
-export { initialize, ts_node_loader_load as load, ts_node_loader_resolve as resolve };
+export { ts_node_loader_initialize as initialize, ts_node_loader_load as load, ts_node_loader_resolve as resolve };

package/dist/esm-node/plugins/analyze/getHtmlTemplate.mjs

@@ -2,7 +2,7 @@ import "node:module";
 import path from "path";
 import { findExists, fs } from "@modern-js/utils";
 import { HTML_PARTIALS_EXTENSIONS, HTML_PARTIALS_FOLDER } from "./constants.mjs";
-import * as __rspack_external__templates_mjs_4da4c6c8 from "./templates.mjs";
+import * as __rspack_external__templates_mjs_ab577925 from "./templates.mjs";
 const findPartials = (dir, entryName, position)=>{
     if (fs.existsSync(dir)) {
         const base = findExists(HTML_PARTIALS_EXTENSIONS.map((ext)=>path.resolve(dir, `${position}${ext}`)));
@@ -71,7 +71,7 @@ const getHtmlTemplate = async (entrypoints, hooks, { appContext, config })=>{
                 partials: getModifyHtmlPartials(partials)
             });
             const templatePath = path.resolve(internalDirectory, entryName, 'index.html');
-            fs.outputFileSync(templatePath, __rspack_external__templates_mjs_4da4c6c8.html(partials), 'utf8');
+            fs.outputFileSync(templatePath, __rspack_external__templates_mjs_ab577925.html(partials), 'utf8');
             htmlTemplates[entryName] = templatePath.replace(/\\/g, '/');
             partialsByEntrypoint[entryName] = partials;
             const bottomTemplate = findPartials(htmlDir, name, "bottom");

package/dist/esm-node/plugins/analyze/isDefaultExportFunction.mjs

@@ -2,8 +2,8 @@ import "node:module";
 import fs from "fs";
 import { parse } from "@babel/parser";
 import traverse from "@babel/traverse";
-import * as __rspack_external__babel_types_69e65b52 from "@babel/types";
-const isFunction = (node)=>__rspack_external__babel_types_69e65b52.isFunctionDeclaration(node) || __rspack_external__babel_types_69e65b52.isFunctionExpression(node) || __rspack_external__babel_types_69e65b52.isArrowFunctionExpression(node);
+import * as __rspack_external__babel_types_6e8337dd from "@babel/types";
+const isFunction = (node)=>__rspack_external__babel_types_6e8337dd.isFunctionDeclaration(node) || __rspack_external__babel_types_6e8337dd.isFunctionExpression(node) || __rspack_external__babel_types_6e8337dd.isArrowFunctionExpression(node);
 const isDefaultExportFunction = (file)=>{
     if (!file || !fs.existsSync(file)) return false;
     const ast = parse(fs.readFileSync(file, 'utf8'), {

package/dist/types/esm/ts-node-loader.d.mts

@@ -1,6 +1,3 @@
-export function initialize({ baseUrl, paths }: {
-    baseUrl: any;
-    paths: any;
-}): Promise<void>;
+export function initialize(config: any): Promise<void>;
 export function resolve(specifier: any, context: any, defaultResolve: any): any;
 export function load(url: any, context: any, defaultLoad: any): any;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.8.2",
+  "version": "3.9.0",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
   "exports": {
@@ -116,26 +116,26 @@
     "@babel/parser": "^7.29.7",
     "@babel/traverse": "^7.29.7",
     "@babel/types": "^7.29.7",
-    "@rsbuild/core": "2.1.0",
+    "@rsbuild/core": "2.2.0-rc.0",
     "@swc/core": "1.15.41",
     "@swc/helpers": "^0.5.17",
     "es-module-lexer": "^1.7.0",
-    "flatted": "^3.4.2",
+    "flatted": "^3.4.4",
     "import-meta-resolve": "^4.2.0",
     "mlly": "^1.8.2",
     "ndepe": "^0.1.13",
     "pkg-types": "^1.3.1",
     "std-env": "^3.10.0",
-    "@modern-js/builder": "3.8.2",
-    "@modern-js/i18n-utils": "3.8.2",
-    "@modern-js/plugin": "3.8.2",
-    "@modern-js/plugin-data-loader": "3.8.2",
-    "@modern-js/prod-server": "3.8.2",
-    "@modern-js/server": "3.8.2",
-    "@modern-js/server-utils": "3.8.2",
-    "@modern-js/types": "3.8.2",
-    "@modern-js/server-core": "3.8.2",
-    "@modern-js/utils": "3.8.2"
+    "@modern-js/builder": "3.9.0",
+    "@modern-js/i18n-utils": "3.9.0",
+    "@modern-js/plugin-data-loader": "3.9.0",
+    "@modern-js/plugin": "3.9.0",
+    "@modern-js/prod-server": "3.9.0",
+    "@modern-js/server": "3.9.0",
+    "@modern-js/server-core": "3.9.0",
+    "@modern-js/server-utils": "3.9.0",
+    "@modern-js/types": "3.9.0",
+    "@modern-js/utils": "3.9.0"
   },
   "devDependencies": {
     "@rslib/core": "0.23.2",

package/rslib.config.mts

@@ -19,11 +19,22 @@ export default defineConfig({
       },
       output: {
         ...libConfig.output,
+        // `src/esm` is also matched by the `./src/**` entry, so the bundler
+        // emits these files itself. The ESM outputs keep the `.mjs` extension,
+        // which means bundle and copy write the very same paths — two writers
+        // for one file, occasionally leaving it truncated and unparsable, which
+        // takes down every `"type": "module"` project. The CJS output emits
+        // `.js`, so there the copy is the only thing providing the `.mjs`
+        // loaders that `register()` resolves by name; keep it for that alone.
         copy: [
-          {
-            from: './src/esm',
-            to: './esm',
-          },
+          ...(libConfig.format === 'esm'
+            ? []
+            : [
+                {
+                  from: './src/esm',
+                  to: './esm',
+                },
+              ]),
           {
             from: 'plugins/deploy/platforms/templates/*.cjs',
             context: path.join(__dirname, 'src'),