@modern-js/app-tools 2.49.1 → 2.49.3-alpha.0

package/dist/esm-node/plugins/deploy/utils.js

@@ -0,0 +1,109 @@
+import path from "path";
+import os from "node:os";
+import { ROUTE_SPEC_FILE, fs as fse, isDepExists } from "@modern-js/utils";
+import { parseNodeModulePath } from "mlly";
+const severAppContextTemplate = (serverAppContext) => {
+  return `{
+    sharedDirectory: ${serverAppContext.sharedDirectory},
+    apiDirectory: ${serverAppContext.apiDirectory},
+    lambdaDirectory: ${serverAppContext.lambdaDirectory},
+  }`;
+};
+const getPluginsCode = (plugins) => `[${plugins.map((_, index) => `plugin_${index}()`).join(",")}]`;
+const genPluginImportsCode = (plugins) => {
+  return plugins.map((plugin, index) => `
+      let plugin_${index} = require('${plugin}')
+      plugin_${index} = plugin_${index}.default || plugin_${index}
+      `).join(";\n");
+};
+const getProjectUsage = (appDirectory, distDirectory) => {
+  const routeJSON = path.join(distDirectory, ROUTE_SPEC_FILE);
+  const { routes } = fse.readJSONSync(routeJSON);
+  let useSSR = false;
+  let useAPI = false;
+  routes.forEach((route) => {
+    if (route.isSSR) {
+      useSSR = true;
+    }
+    if (route.isApi) {
+      useAPI = true;
+    }
+  });
+  const useWebServer = isDepExists(appDirectory, "@modern-js/plugin-server");
+  return {
+    useSSR,
+    useAPI,
+    useWebServer
+  };
+};
+function applyProductionCondition(exports) {
+  if (!exports || typeof exports === "string") {
+    return;
+  }
+  if (exports.production) {
+    if (typeof exports.production === "string") {
+      exports.default = exports.production;
+    } else {
+      Object.assign(exports, exports.production);
+    }
+  }
+  for (const key in exports) {
+    applyProductionCondition(exports[key]);
+  }
+}
+function applyPublicCondition(pkg) {
+  var _pkg_publishConfig;
+  if (pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig = pkg.publishConfig) === null || _pkg_publishConfig === void 0 ? void 0 : _pkg_publishConfig.exports) {
+    var _pkg_publishConfig1;
+    pkg.exports = pkg === null || pkg === void 0 ? void 0 : (_pkg_publishConfig1 = pkg.publishConfig) === null || _pkg_publishConfig1 === void 0 ? void 0 : _pkg_publishConfig1.exports;
+  }
+}
+const writePackage = async (pkg, version, projectDir, _pkgPath) => {
+  const pkgPath = _pkgPath || pkg.name;
+  for (const src of pkg.versions[version].files) {
+    if (src.includes("node_modules")) {
+      const { subpath } = parseNodeModulePath(src);
+      const dest = path.join(projectDir, "node_modules", pkgPath, subpath);
+      const dirname = path.dirname(dest);
+      await fse.ensureDir(dirname);
+      await fse.copyFile(src, dest);
+    } else {
+      const subpath = path.relative(pkg.versions[version].path, src);
+      const dest = path.join(projectDir, "node_modules", pkgPath, subpath);
+      const dirname = path.dirname(dest);
+      await fse.ensureDir(dirname);
+      await fse.copyFile(src, dest);
+    }
+  }
+  const { pkgJSON } = pkg.versions[version];
+  applyPublicCondition(pkgJSON);
+  const packageJsonPath = path.join(projectDir, "node_modules", pkgPath, "package.json");
+  await fse.ensureDir(path.dirname(packageJsonPath));
+  await fse.writeFile(packageJsonPath, JSON.stringify(pkgJSON, null, 2));
+};
+const isWindows = os.platform() === "win32";
+const linkPackage = async (from, to, projectRootDir) => {
+  const src = path.join(projectRootDir, "node_modules", from);
+  const dest = path.join(projectRootDir, "node_modules", to);
+  const dstStat = await fse.lstat(dest).catch(() => null);
+  const exists = dstStat === null || dstStat === void 0 ? void 0 : dstStat.isSymbolicLink();
+  if (exists) {
+    return;
+  }
+  await fse.mkdir(path.dirname(dest), {
+    recursive: true
+  });
+  await fse.symlink(path.relative(path.dirname(dest), src), dest, isWindows ? "junction" : "dir").catch((error) => {
+    console.error("Cannot link", from, "to", to, error);
+  });
+};
+export {
+  applyProductionCondition,
+  applyPublicCondition,
+  genPluginImportsCode,
+  getPluginsCode,
+  getProjectUsage,
+  linkPackage,
+  severAppContextTemplate,
+  writePackage
+};

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

@@ -40,7 +40,7 @@ const registerCompiler = async (appDir = process.cwd(), distDir, alias) => {
         transpileOnly: true,
         ignore: [
           "(?:^|/)node_modules/",
-          `(?:^|/)${distDir}/`
+          `(?:^|/)${path.relative(appDir, distDir)}/`
         ],
         ...tsNodeOptions
       });

package/dist/types/locale/en.d.ts

@@ -22,6 +22,7 @@ export declare const EN_LOCALE: {
         };
         deploy: {
             describe: string;
+            output: string;
         };
         new: {
             describe: string;

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

@@ -24,6 +24,7 @@ declare const localeKeys: {
         };
         deploy: {
             describe: string;
+            output: string;
         };
         new: {
             describe: string;
@@ -63,6 +64,7 @@ declare const localeKeys: {
         };
         deploy: {
             describe: string;
+            output: string;
         };
         new: {
             describe: string;

package/dist/types/locale/zh.d.ts

@@ -22,6 +22,7 @@ export declare const ZH_LOCALE: {
         };
         deploy: {
             describe: string;
+            output: string;
         };
         new: {
             describe: string;

package/dist/types/plugins/deploy/dependencies.d.ts

@@ -0,0 +1 @@
+export declare const handleDependencies: (appDir: string, serverRootDir: string, include: string[]) => Promise<void>;

package/dist/types/plugins/deploy/entrys/netlify.d.ts

@@ -0,0 +1,5 @@
+export declare function genNetlifyEntry({ config, plugins, appContext, }?: {
+    config?: Record<string, any>;
+    plugins?: string[];
+    appContext?: Record<string, any>;
+}): string;

package/dist/types/plugins/deploy/entrys/node.d.ts

@@ -0,0 +1,5 @@
+export declare function genNodeEntry({ config, plugins, appContext, }?: {
+    config?: Record<string, any>;
+    plugins?: string[];
+    appContext?: Record<string, any>;
+}): string;

package/dist/types/plugins/deploy/entrys/vercel.d.ts

@@ -0,0 +1,5 @@
+export declare function genVercelEntry({ config, plugins, appContext, }?: {
+    config?: Record<string, any>;
+    plugins?: string[];
+    appContext?: Record<string, any>;
+}): string;

package/dist/types/plugins/deploy/index.d.ts

@@ -0,0 +1,4 @@
+import { CliPlugin } from '@modern-js/core';
+import { AppTools } from '../../types';
+declare const _default: () => CliPlugin<AppTools>;
+export default _default;

package/dist/types/plugins/deploy/utils.d.ts

@@ -0,0 +1,27 @@
+import type { PackageJson } from 'pkg-types';
+export type ServerAppContext = {
+    sharedDirectory: string;
+    apiDirectory: string;
+    lambdaDirectory: string;
+    metaName: string;
+};
+export declare const severAppContextTemplate: (serverAppContext: ServerAppContext) => string;
+export declare const getPluginsCode: (plugins: string[]) => string;
+export declare const genPluginImportsCode: (plugins: string[]) => string;
+export declare const getProjectUsage: (appDirectory: string, distDirectory: string) => {
+    useSSR: boolean;
+    useAPI: boolean;
+    useWebServer: boolean;
+};
+export declare function applyProductionCondition(exports: PackageJson['exports']): void;
+export declare function applyPublicCondition(pkg: PackageJson): void;
+export type TracedPackage = {
+    name: string;
+    versions: Record<string, {
+        pkgJSON: PackageJson;
+        path: string;
+        files: string[];
+    }>;
+};
+export declare const writePackage: (pkg: TracedPackage, version: string, projectDir: string, _pkgPath?: string) => Promise<void>;
+export declare const linkPackage: (from: string, to: string, projectRootDir: string) => Promise<void>;

package/dist/types/utils/types.d.ts

@@ -10,6 +10,7 @@ export type BuildOptions = {
 };
 export type DeployOptions = {
     config?: string;
+    output?: string;
     skipBuild?: boolean;
 };
 export type StartOptions = {

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.1",
+  "version": "2.49.3-alpha.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -69,30 +69,34 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@rsbuild/plugin-node-polyfill": "0.6.6",
-    "@rsbuild/shared": "0.6.6",
-    "@rsbuild/core": "0.6.6",
+    "@rsbuild/plugin-node-polyfill": "0.6.10",
+    "@rsbuild/shared": "0.6.10",
+    "@rsbuild/core": "0.6.10",
+    "@swc/helpers": "0.5.3",
+    "@vercel/nft": "^0.26.4",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
-    "@swc/helpers": "0.5.3",
     "esbuild-register": "^3.5.0",
-    "@modern-js/core": "2.49.1",
-    "@modern-js/node-bundle-require": "2.49.1",
-    "@modern-js/plugin": "2.49.1",
-    "@modern-js/plugin-data-loader": "2.49.1",
-    "@modern-js/plugin-i18n": "2.49.1",
-    "@modern-js/prod-server": "2.49.1",
-    "@modern-js/plugin-lint": "2.49.1",
-    "@modern-js/server-utils": "2.49.1",
-    "@modern-js/server-core": "2.49.1",
-    "@modern-js/server": "2.49.1",
-    "@modern-js/types": "2.49.1",
-    "@modern-js/utils": "2.49.1",
-    "@modern-js/uni-builder": "2.49.1",
-    "@modern-js/rsbuild-plugin-esbuild": "2.49.1"
+    "mlly": "^1.6.1",
+    "pkg-types": "^1.1.0",
+    "std-env": "^3.7.0",
+    "@modern-js/node-bundle-require": "2.49.2",
+    "@modern-js/plugin": "2.49.2",
+    "@modern-js/plugin-data-loader": "2.49.2",
+    "@modern-js/plugin-i18n": "2.49.2",
+    "@modern-js/rsbuild-plugin-esbuild": "2.49.2",
+    "@modern-js/plugin-lint": "2.49.2",
+    "@modern-js/server-utils": "2.49.2",
+    "@modern-js/server": "2.49.2",
+    "@modern-js/types": "2.49.2",
+    "@modern-js/core": "2.49.2",
+    "@modern-js/server-core": "2.49.2",
+    "@modern-js/utils": "2.49.2",
+    "@modern-js/uni-builder": "2.49.2",
+    "@modern-js/prod-server": "2.49.2"
   },
   "devDependencies": {
-    "@rsbuild/plugin-swc": "0.6.6",
+    "@rsbuild/plugin-swc": "0.6.10",
     "@types/babel__traverse": "7.18.5",
     "@types/jest": "^29",
     "@types/node": "^14",
@@ -101,8 +105,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.91.0",
-    "@scripts/build": "2.49.1",
-    "@scripts/jest-config": "2.49.1"
+    "@scripts/build": "2.49.2",
+    "@scripts/jest-config": "2.49.2"
   },
   "sideEffects": false,
   "publishConfig": {