@modern-js/app-tools 2.57.1-alpha.2 → 2.57.1-beta.0

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

@@ -0,0 +1,2 @@
+declare function _default(request: any, context: any): Promise<any>;
+export default _default;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.57.1-alpha.2",
+  "version": "2.57.1-beta.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -87,26 +87,26 @@
     "mlly": "^1.6.1",
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.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/plugin-lint": "2.57.0",
-    "@modern-js/node-bundle-require": "2.57.0",
     "@modern-js/prod-server": "2.57.0",
-    "@modern-js/server-core": "2.57.0",
-    "@modern-js/server-utils": "2.57.0",
-    "@modern-js/rsbuild-plugin-esbuild": "2.57.0",
-    "@modern-js/server": "2.57.0",
     "@modern-js/plugin-data-loader": "2.57.0",
+    "@modern-js/server-core": "2.57.1-alpha.0",
+    "@modern-js/plugin": "2.57.0",
     "@modern-js/types": "2.57.0",
+    "@modern-js/plugin-lint": "2.57.0",
+    "@modern-js/server-utils": "2.57.0",
+    "@modern-js/utils": "2.57.0",
+    "@modern-js/rsbuild-plugin-esbuild": "2.57.0",
     "@modern-js/uni-builder": "2.57.0",
-    "@modern-js/utils": "2.57.0"
+    "@modern-js/server": "2.57.0"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "1.0.1-beta.3",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
-    "@types/node": "^16",
+    "@types/node": "^14",
     "jest": "^29",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.2.0",

package/dist/cjs/esm/esbuild-loader.mjs

@@ -1,20 +0,0 @@
-import { pathToFileURL } from 'url';
-import { createMatchPath } from './utils.mjs';
-
-let matchPath;
-export async function initialize({ appDir, alias, tsconfigPath }) {
-  matchPath = createMatchPath({
-    alias,
-    appDir,
-    tsconfigPath,
-  });
-}
-
-export function resolve(specifier, context, defaultResolve) {
-  const match = matchPath(specifier);
-  return match
-    ? defaultResolve(pathToFileURL(match).href, context)
-    : defaultResolve(specifier, context);
-}
-
-export { load } from 'esbuild-register/loader';

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

@@ -1,65 +0,0 @@
-import path from 'node:path';
-import { fs, readTsConfigByFile } from '@modern-js/utils';
-
-const checkDep = async dep => {
-  try {
-    await import(dep);
-    return true;
-  } catch (error) {
-    return false;
-  }
-};
-
-export const registerEsm = async ({ appDir, distDir, alias }) => {
-  const nodeVersion = process.versions.node;
-  const versionArr = nodeVersion.split('.').map(Number);
-  if (versionArr[0] < 18 || (versionArr[0] === 18 && versionArr[1] < 19)) {
-    throw new Error(
-      `The node version of the esm project must be greater than 18.19.0, current version is ${nodeVersion}`,
-    );
-  }
-  const hasTsNode = await checkDep('ts-node');
-  const TS_CONFIG_FILENAME = `tsconfig.json`;
-  const tsconfigPath = path.resolve(appDir, TS_CONFIG_FILENAME);
-  const hasTsconfig = await fs.pathExists(tsconfigPath);
-  const { register } = await import('node:module');
-  if (hasTsNode && hasTsconfig) {
-    // These can be overridden by ts-node options in tsconfig.json
-    process.env.TS_NODE_TRANSPILE_ONLY = true;
-    process.env.TS_NODE_PROJECT = tsconfigPath;
-    process.env.TS_NODE_SCOPE = true;
-    process.env.TS_NODE_FILES = true;
-    process.env.TS_NODE_IGNORE = `(?:^|/)node_modules/,(?:^|/)${path.relative(
-      appDir,
-      distDir,
-    )}/`;
-    register('./ts-node-loader.mjs', import.meta.url, {
-      data: {
-        appDir,
-        distDir,
-        alias,
-        tsconfigPath,
-      },
-    });
-  } else {
-    process.env.MODERN_NODE_LOADER = 'esbuild';
-    let tsConfig = {};
-    if (hasTsconfig) {
-      tsConfig = readTsConfigByFile(tsconfigPath);
-    }
-    const esbuildRegister = await import('esbuild-register/dist/node');
-    esbuildRegister.register({
-      tsconfigRaw: hasTsconfig ? tsConfig : undefined,
-      hookIgnoreNodeModules: true,
-      hookMatcher: fileName => !fileName.startsWith(distDir),
-    });
-    register('./esbuild-loader.mjs', import.meta.url, {
-      data: {
-        appDir,
-        distDir,
-        alias,
-        tsconfigPath,
-      },
-    });
-  }
-};

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

@@ -1,21 +0,0 @@
-import { pathToFileURL } from 'url';
-import { resolve as tsNodeResolve } from 'ts-node/esm';
-import { createMatchPath } from './utils.mjs';
-
-let matchPath;
-export async function initialize({ appDir, alias, tsconfigPath }) {
-  matchPath = createMatchPath({
-    alias,
-    appDir,
-    tsconfigPath,
-  });
-}
-
-export function resolve(specifier, context, defaultResolve) {
-  const match = matchPath(specifier, undefined, undefined, ['']);
-  return match
-    ? tsNodeResolve(pathToFileURL(match).href, context, defaultResolve)
-    : tsNodeResolve(specifier, context, defaultResolve);
-}
-
-export { transformSource, load } from 'ts-node/esm';

package/dist/cjs/esm/utils.mjs

@@ -1,28 +0,0 @@
-import path from 'path';
-import tsConfigPaths from '@modern-js/utils/tsconfig-paths';
-import { getAliasConfig } from '@modern-js/utils';
-
-export function createMatchPath({ alias, appDir, tsconfigPath }) {
-  const aliasConfig = getAliasConfig(alias, {
-    appDirectory: appDir,
-    tsconfigPath,
-  });
-
-  const { paths = {}, absoluteBaseUrl = './' } = aliasConfig;
-
-  const tsPaths = Object.keys(paths).reduce((o, key) => {
-    let tsPath = paths[key];
-    if (typeof tsPath === 'string' && path.isAbsolute(tsPath)) {
-      tsPath = path.relative(absoluteBaseUrl, tsPath);
-    }
-    if (typeof tsPath === 'string') {
-      tsPath = [tsPath];
-    }
-    return {
-      ...o,
-      [`${key}`]: tsPath,
-    };
-  }, {});
-
-  return tsConfigPaths.createMatchPath(absoluteBaseUrl, tsPaths);
-}

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

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

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

@@ -1,28 +0,0 @@
-"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 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/esm/custom-loader.mjs

@@ -1,41 +0,0 @@
-import { pathToFileURL } from 'url';
-import { resolve as tsNodeResolve } from 'ts-node/esm';
-import * as tsConfigPaths from 'tsconfig-paths';
-import fs from 'fs/promises'
-import { getAliasConfig } from '@modern-js/utils';
-import path from 'path'
-
-
-let matchPath;
-export function initialize({ appDir, alias }){
-  const TS_CONFIG_FILENAME = `tsconfig.json`;
-  const aliasConfig = getAliasConfig(alias, {
-    appDirectory: appDir,
-    tsconfigPath: path.resolve(appDir, TS_CONFIG_FILENAME),
-  });
-  const { paths = {}, absoluteBaseUrl = './' } = aliasConfig;
-  const tsPaths = Object.keys(paths).reduce((o, key) => {
-    let tsPath = paths[key];
-    if (typeof tsPath === 'string' && path.isAbsolute(tsPath)) {
-      tsPath = path.relative(absoluteBaseUrl, tsPath);
-    }
-    if (typeof tsPath === 'string') {
-      tsPath = [tsPath];
-    }
-    return {
-      ...o,
-      [`${key}`]: tsPath,
-    };
-  }, {});
-
-  matchPath = tsConfigPaths.createMatchPath(absoluteBaseUrl, tsPaths);
-}
-
-export function resolve(specifier, context, defaultResolve) {
-  const match = matchPath(specifier);
-  return match
-    ? tsNodeResolve(pathToFileURL(match).href, context, defaultResolve)
-    : tsNodeResolve(specifier, context, defaultResolve);
-}
-
-export { transformSource, load } from 'ts-node/esm';

package/dist/esm/register-esm.mjs

@@ -1,22 +0,0 @@
-import { register } from 'node:module';
-import path from 'node:path';
-
-export const registerEsm = async ({
-  appDir,
-  distDir,
-  alias
-}) => {
-  // These can be overridden by ts-node options in tsconfig.json
-  process.env.TS_NODE_TRANSPILE_ONLY = true;
-  process.env.TS_NODE_PROJECT = path.join(appDir, 'tsconfig.json');
-  process.env.TS_NODE_SCOPE = true;
-  process.env.TS_NODE_FILES = true;
-  process.env.TS_NODE_IGNORE = `(?:^|/)node_modules/,(?:^|/)${path.relative(appDir, distDir)}/`
-  register('./custom-loader.mjs', import.meta.url, {
-    data: {
-      appDir,
-      distDir,
-      alias
-    }
-  });
-};

package/dist/esm-node/esm/esbuild-loader.js

@@ -1,39 +0,0 @@
-import { pathToFileURL } from "url";
-import * as tsConfigPaths from "@modern-js/utils/tsconfig-paths";
-import { getAliasConfig } from "@modern-js/utils";
-import path from "path";
-let matchPath;
-function initialize({ appDir, alias }) {
-  const TS_CONFIG_FILENAME = `tsconfig.json`;
-  const aliasConfig = getAliasConfig(alias, {
-    appDirectory: appDir,
-    tsconfigPath: path.resolve(appDir, TS_CONFIG_FILENAME)
-  });
-  const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
-  const tsPaths = Object.keys(paths).reduce((o, key) => {
-    let tsPath = paths[key];
-    if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
-      tsPath = path.relative(absoluteBaseUrl, tsPath);
-    }
-    if (typeof tsPath === "string") {
-      tsPath = [
-        tsPath
-      ];
-    }
-    return {
-      ...o,
-      [`${key}`]: tsPath
-    };
-  }, {});
-  matchPath = tsConfigPaths.createMatchPath(absoluteBaseUrl, tsPaths);
-}
-function resolve(specifier, context, defaultResolve) {
-  const match = matchPath(specifier);
-  return match ? defaultResolve(pathToFileURL(match).href, context) : defaultResolve(specifier, context);
-}
-import { load } from "esbuild-register/loader";
-export {
-  initialize,
-  load,
-  resolve
-};

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

@@ -1,39 +0,0 @@
-const import_meta = {};
-import { register } from "node:module";
-import path from "node:path";
-const checkDep = async (dep) => {
-  try {
-    await import(dep);
-    return true;
-  } catch (error) {
-    return false;
-  }
-};
-const registerEsm = async ({ appDir, distDir, alias }) => {
-  const hasTsNode = await checkDep("ts-node");
-  if (hasTsNode) {
-    process.env.TS_NODE_TRANSPILE_ONLY = true;
-    process.env.TS_NODE_PROJECT = path.join(appDir, "tsconfig.json");
-    process.env.TS_NODE_SCOPE = true;
-    process.env.TS_NODE_FILES = true;
-    process.env.TS_NODE_IGNORE = `(?:^|/)node_modules/,(?:^|/)${path.relative(appDir, distDir)}/`;
-    register("./ts-node-loader.mjs", import_meta.url, {
-      data: {
-        appDir,
-        distDir,
-        alias
-      }
-    });
-  } else {
-    register("./esbuild-loader.mjs", import_meta.url, {
-      data: {
-        appDir,
-        distDir,
-        alias
-      }
-    });
-  }
-};
-export {
-  registerEsm
-};

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

@@ -1,42 +0,0 @@
-import { pathToFileURL } from "url";
-import { resolve as tsNodeResolve } from "ts-node/esm";
-import * as tsConfigPaths from "@modern-js/utils/tsconfig-paths";
-import { getAliasConfig } from "@modern-js/utils";
-import path from "path";
-console.log("ttttttttttttt", tsConfigPaths);
-let matchPath;
-function initialize({ appDir, alias }) {
-  const TS_CONFIG_FILENAME = `tsconfig.json`;
-  const aliasConfig = getAliasConfig(alias, {
-    appDirectory: appDir,
-    tsconfigPath: path.resolve(appDir, TS_CONFIG_FILENAME)
-  });
-  const { paths = {}, absoluteBaseUrl = "./" } = aliasConfig;
-  const tsPaths = Object.keys(paths).reduce((o, key) => {
-    let tsPath = paths[key];
-    if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
-      tsPath = path.relative(absoluteBaseUrl, tsPath);
-    }
-    if (typeof tsPath === "string") {
-      tsPath = [
-        tsPath
-      ];
-    }
-    return {
-      ...o,
-      [`${key}`]: tsPath
-    };
-  }, {});
-  matchPath = tsConfigPaths.createMatchPath(absoluteBaseUrl, tsPaths);
-}
-function resolve(specifier, context, defaultResolve) {
-  const match = matchPath(specifier);
-  return match ? tsNodeResolve(pathToFileURL(match).href, context, defaultResolve) : tsNodeResolve(specifier, context, defaultResolve);
-}
-import { transformSource, load } from "ts-node/esm";
-export {
-  initialize,
-  load,
-  resolve,
-  transformSource
-};

package/dist/types/esm/esbuild-loader.d.mts

@@ -1,6 +0,0 @@
-export function initialize({ appDir, alias, tsconfigPath }: {
-    appDir: any;
-    alias: any;
-    tsconfigPath: any;
-}): Promise<void>;
-export function resolve(specifier: any, context: any, defaultResolve: any): any;

package/dist/types/esm/register-esm.d.mts

@@ -1,5 +0,0 @@
-export function registerEsm({ appDir, distDir, alias }: {
-    appDir: any;
-    distDir: any;
-    alias: any;
-}): Promise<void>;

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

@@ -1,6 +0,0 @@
-export function initialize({ appDir, alias, tsconfigPath }: {
-    appDir: any;
-    alias: any;
-    tsconfigPath: any;
-}): Promise<void>;
-export function resolve(specifier: any, context: any, defaultResolve: any): any;

package/dist/types/esm/utils.d.mts

@@ -1,6 +0,0 @@
-export function createMatchPath({ alias, appDir, tsconfigPath }: {
-    alias: any;
-    appDir: any;
-    tsconfigPath: any;
-}): tsConfigPaths.MatchPath;
-import tsConfigPaths from '@modern-js/utils/tsconfig-paths';

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

@@ -1 +0,0 @@
-export default handler;

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

@@ -1 +0,0 @@
-export {};

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

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