@modern-js/app-tools 2.57.1-alpha.1 → 2.57.1-alpha.3

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

@@ -12,7 +12,7 @@ export async function initialize({ appDir, alias, tsconfigPath }) {
 }
 
 export function resolve(specifier, context, defaultResolve) {
-  const match = matchPath(specifier, undefined, undefined, ['']);
+  const match = matchPath(specifier);
   return match
     ? tsNodeResolve(pathToFileURL(match).href, context, defaultResolve)
     : tsNodeResolve(specifier, context, defaultResolve);

package/dist/cjs/esm/utils.mjs

@@ -1,7 +1,9 @@
 import path from 'path';
+import { createRequire } from 'module';
 import tsConfigPaths from '@modern-js/utils/tsconfig-paths';
 import { getAliasConfig } from '@modern-js/utils';
 
+const require = createRequire(import.meta.url);
 export function createMatchPath({ alias, appDir, tsconfigPath }) {
   const aliasConfig = getAliasConfig(alias, {
     appDirectory: appDir,
@@ -12,6 +14,19 @@ export function createMatchPath({ alias, appDir, tsconfigPath }) {
 
   const tsPaths = Object.keys(paths).reduce((o, key) => {
     let tsPath = paths[key];
+    // Do some special handling for Modern.js's internal alias, we can drop it in the next version
+    if (
+      typeof tsPath === 'string' &&
+      key.startsWith('@') &&
+      tsPath.startsWith('@')
+    ) {
+      try {
+        tsPath = require.resolve(tsPath, {
+          paths: [appDir],
+        });
+      } catch {}
+    }
+
     if (typeof tsPath === 'string' && path.isAbsolute(tsPath)) {
       tsPath = path.relative(absoluteBaseUrl, tsPath);
     }

package/dist/cjs/plugins/deploy/platforms/netlify-entry-cjs.js

@@ -1 +1,3 @@
 "use strict";
+const { handler } = require("./netlify-handler");
+module.exports.default = handler;

package/dist/cjs/plugins/deploy/platforms/netlify-entry-mjs.js

@@ -1,10 +1,28 @@
 "use strict";
-var import_index = require("./index.cjs");
-const requestHandler = null;
-(0, import_index.createHandler)();
-exports.handler = async (req, res) => {
-  if (!requestHandler) {
-    await (0, import_index.createHandler)();
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
-  return requestHandler(req, res);
+  return to;
 };
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var netlify_entry_mjs_exports = {};
+__export(netlify_entry_mjs_exports, {
+  handler: () => import_netlify_handler.handler
+});
+module.exports = __toCommonJS(netlify_entry_mjs_exports);
+var import_netlify_handler = require("./netlify-handler");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  handler
+});

package/dist/cjs/plugins/deploy/platforms/{netlifyEntry.js → netlify-handler.js}

@@ -1,26 +1,4 @@
 "use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var netlifyEntry_exports = {};
-__export(netlifyEntry_exports, {
-  createHandler: () => createHandler
-});
-module.exports = __toCommonJS(netlifyEntry_exports);
 const fs = require("node:fs/promises");
 const path = require("node:path");
 const { createNetlifyFunction } = require("@modern-js/prod-server/netlify");
@@ -75,13 +53,11 @@ async function createHandler() {
   return requestHandler;
 }
 createHandler();
-module.exports.default = async (request, context) => {
-  if (!requestHandler) {
-    await createHandler();
+module.exports = {
+  handler: async (request, context) => {
+    if (!requestHandler) {
+      await createHandler();
+    }
+    return requestHandler(request, context);
   }
-  return requestHandler(request, context);
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  createHandler
-});

package/dist/cjs/plugins/deploy/platforms/netlify.js

@@ -56,6 +56,7 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
   const netlifyOutput = import_node_path.default.join(appDirectory, ".netlify");
   const funcsDirectory = import_node_path.default.join(netlifyOutput, "functions");
   const entryFilePath = import_node_path.default.join(funcsDirectory, "index.js");
+  const handlerFilePath = import_node_path.default.join(funcsDirectory, "netlify-handler.js");
   return {
     async prepare() {
       await import_utils.fs.remove(netlifyOutput);
@@ -115,15 +116,14 @@ const createNetlifyPreset = (appContext, modernConfig, needModernServer) => {
       const pluginsCode = `[${plugins.map((plugin, index) => {
         return `plugin_${index}()`;
       }).join(",")}]`;
-      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./netlifyEntry.js"))).toString();
+      let entryCode = (await import_utils.fs.readFile(import_node_path.default.join(__dirname, "./netlify-handler.js"))).toString();
       const serverAppContext = (0, import_utils2.serverAppContenxtTemplate)(appContext);
       entryCode = entryCode.replace("p_genPluginImportsCode", pluginImportCode).replace("p_ROUTE_SPEC_FILE", `"${import_utils.ROUTE_SPEC_FILE}"`).replace("p_dynamicProdOptions", JSON.stringify(dynamicProdOptions)).replace("p_plugins", pluginsCode).replace("p_sharedDirectory", serverAppContext.sharedDirectory).replace("p_apiDirectory", serverAppContext.apiDirectory).replace("p_lambdaDirectory", serverAppContext.lambdaDirectory);
+      await import_utils.fs.writeFile(handlerFilePath, entryCode);
       if (isEsmProject) {
-        const cjsEntryFilePath = import_node_path.default.join(funcsDirectory, "index.cjs");
-        await import_utils.fs.writeFile(cjsEntryFilePath, entryCode);
-        await import_utils.fs.writeFile(entryFilePath, `import('./index.cjs');`);
+        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./netlify-entry-mjs.js"), entryFilePath);
       } else {
-        await import_utils.fs.writeFile(entryFilePath, entryCode);
+        await import_utils.fs.copy(import_node_path.default.join(__dirname, "./netlify-entry-cjs.js"), entryFilePath);
       }
     },
     async end() {

package/dist/cjs/utils/register.js

@@ -52,6 +52,17 @@ const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
   const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
   const tsPaths = Object.keys(paths).reduce((o, key) => {
     let tsPath = paths[key];
+    if (typeof tsPath === "string" && key.startsWith("@") && tsPath.startsWith("@")) {
+      try {
+        tsPath = require.resolve(tsPath, {
+          paths: [
+            process.cwd(),
+            ...module.paths
+          ]
+        });
+      } catch {
+      }
+    }
     if (typeof tsPath === "string" && import_node_path.default.isAbsolute(tsPath)) {
       tsPath = import_node_path.default.relative(absoluteBaseUrl, tsPath);
     }

package/dist/types/plugins/deploy/platforms/netlify-entry-cjs.d.ts

@@ -0,0 +1,2 @@
+export default handler;
+import { handler } from "./netlify-handler";

package/dist/types/plugins/deploy/platforms/netlify-entry-mjs.d.ts

@@ -1 +1 @@
-export {};
+export { handler } from "./netlify-handler";

package/dist/types/plugins/deploy/platforms/netlify-handler.d.ts

@@ -0,0 +1 @@
+export function handler(request: any, context: any): Promise<any>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.57.1-alpha.1",
+  "version": "2.57.1-alpha.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -87,17 +87,17 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/core": "2.57.0",
     "@modern-js/node-bundle-require": "2.57.0",
+    "@modern-js/core": "2.57.0",
     "@modern-js/plugin": "2.57.0",
     "@modern-js/plugin-i18n": "2.57.0",
     "@modern-js/prod-server": "2.57.0",
     "@modern-js/rsbuild-plugin-esbuild": "2.57.0",
-    "@modern-js/server": "2.57.0",
     "@modern-js/plugin-lint": "2.57.0",
+    "@modern-js/server": "2.57.0",
+    "@modern-js/types": "2.57.0",
     "@modern-js/server-core": "2.57.0",
     "@modern-js/server-utils": "2.57.0",
-    "@modern-js/types": "2.57.0",
     "@modern-js/utils": "2.57.0",
     "@modern-js/uni-builder": "2.57.0",
     "@modern-js/plugin-data-loader": "2.57.0"

package/dist/types/plugins/deploy/platforms/netlifyEntry.d.ts

@@ -1 +0,0 @@
-export function createHandler(): Promise<any>;