@modern-js/app-tools 2.54.1 → 2.54.2-alpha.3

package/dist/js/node/utils/config.js

@@ -0,0 +1,103 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.safeReplacer = exports.emitResolvedConfig = exports.defineServerConfig = exports.buildServerConfig = void 0;
+
+var path = _interopRequireWildcard(require("path"));
+
+var _nodeBundleRequire = require("@modern-js/node-bundle-require");
+
+var _utils = require("@modern-js/utils");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const defineServerConfig = config => config;
+
+exports.defineServerConfig = defineServerConfig;
+
+const buildServerConfig = async ({
+  appDirectory,
+  distDirectory,
+  configFile,
+  options
+}) => {
+  const configFilePath = await (0, _utils.getServerConfig)(appDirectory, configFile);
+
+  const getOutputFile = async filepath => path.resolve(distDirectory, `${filepath.replace(new RegExp(_utils.CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
+
+  if (configFilePath) {
+    const configHelperFilePath = path.normalize(path.join(distDirectory, './config-helper.js'));
+    const helperCode = `
+      export const defineConfig = (config) => config;
+    `;
+    await _utils.fs.ensureDir(distDirectory);
+    await _utils.fs.writeFile(configHelperFilePath, helperCode);
+    await (0, _nodeBundleRequire.bundle)(configFilePath, _objectSpread(_objectSpread({}, options), {}, {
+      getOutputFile,
+      esbuildPlugins: [{
+        name: 'native-build-config',
+
+        setup(ctx) {
+          ctx.onResolve({
+            filter: /app-tools\/server/
+          }, () => {
+            return {
+              path: configHelperFilePath
+            };
+          });
+        }
+
+      }]
+    }));
+  }
+};
+/**
+ *
+ * 处理循环引用的 replacer
+ */
+
+
+exports.buildServerConfig = buildServerConfig;
+
+const safeReplacer = () => {
+  const cache = [];
+  const keyCache = [];
+  return function (key, value) {
+    if (typeof value === 'object' && value !== null) {
+      const index = cache.indexOf(value);
+
+      if (index !== -1) {
+        return `[Circular ${keyCache[index]}]`;
+      }
+
+      cache.push(value);
+      keyCache.push(key || 'root');
+    }
+
+    return value;
+  };
+};
+
+exports.safeReplacer = safeReplacer;
+
+const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
+  var _resolvedConfig$outpu;
+
+  const outputPath = path.join(appDirectory, (resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig$outpu = resolvedConfig.output) === null || _resolvedConfig$outpu === void 0 ? void 0 : _resolvedConfig$outpu.path) || './dist', _utils.OUTPUT_CONFIG_FILE);
+  await _utils.fs.writeJSON(outputPath, resolvedConfig, {
+    spaces: 2,
+    replacer: safeReplacer()
+  });
+};
+
+exports.emitResolvedConfig = emitResolvedConfig;

package/dist/js/node/utils/createCompiler.js

@@ -0,0 +1,81 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createCompiler = void 0;
+
+var _webpack = require("@modern-js/webpack");
+
+var _utils = require("@modern-js/utils");
+
+var _printInstructions = require("./printInstructions");
+
+const createCompiler = async ({
+  api,
+  webpackConfigs,
+  // TODO: params
+  userConfig,
+  appContext
+}) => {
+  try {
+    const hookRunners = api.useHookRunners();
+    await hookRunners.beforeCreateCompiler({
+      webpackConfigs
+    });
+    const compiler = (0, _webpack.webpack)(webpackConfigs);
+    await hookRunners.afterCreateCompiler({
+      compiler
+    });
+    let isFirstCompile = true;
+    compiler.hooks.invalid.tap('invalid', () => {
+      (0, _utils.clearConsole)();
+
+      _utils.logger.log('Compiling...');
+    });
+    compiler.hooks.done.tap('done', async stats => {
+      const statsData = stats.toJson({
+        preset: 'errors-warnings'
+      });
+      const {
+        errors,
+        warnings
+      } = (0, _utils.formatWebpackMessages)(statsData);
+
+      if (errors.length) {
+        _utils.logger.log(_utils.chalk.red(`Failed to compile.\n`));
+
+        _utils.logger.log(errors.join('\n\n'));
+
+        _utils.logger.log();
+      } else if (process.stdout.isTTY || isFirstCompile) {
+        await hookRunners.afterDev();
+
+        if (warnings.length) {
+          _utils.logger.log(_utils.chalk.yellow(`Compiled with warnings.\n`));
+
+          _utils.logger.log(warnings.join('\n\n'));
+
+          _utils.logger.log();
+        }
+
+        await (0, _printInstructions.printInstructions)(hookRunners, appContext, userConfig);
+      }
+
+      isFirstCompile = false;
+    });
+    return compiler;
+  } catch (err) {
+    _utils.logger.log(_utils.chalk.red(`Failed to compile.`));
+
+    _utils.logger.log();
+
+    _utils.logger.log(err); // FIXME: 这里最好抛出异常，执行 process.exit 的地方尽可能少或者控制在几个统一的地方比较合适
+    // eslint-disable-next-line no-process-exit
+
+
+    process.exit(1);
+  }
+};
+
+exports.createCompiler = createCompiler;

package/dist/js/node/utils/createServer.js

@@ -0,0 +1,35 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getServer = exports.createServer = exports.closeServer = void 0;
+
+var _server = require("@modern-js/server");
+
+let server = null;
+
+const getServer = () => server;
+
+exports.getServer = getServer;
+
+const closeServer = async () => {
+  if (server) {
+    await server.close();
+    server = null;
+  }
+};
+
+exports.closeServer = closeServer;
+
+const createServer = async options => {
+  if (server) {
+    await server.close();
+  }
+
+  server = new _server.Server(options);
+  const app = await server.init();
+  return app;
+};
+
+exports.createServer = createServer;

package/dist/js/node/utils/getSpecifiedEntries.js

@@ -0,0 +1,46 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getSpecifiedEntries = void 0;
+
+var _utils = require("@modern-js/utils");
+
+const getSpecifiedEntries = async (entry, entrypoints) => {
+  const entryNames = entrypoints.map(e => e.entryName);
+
+  if (!entry) {
+    return entryNames;
+  }
+
+  if (typeof entry === 'boolean') {
+    const {
+      selected
+    } = await _utils.inquirer.prompt([{
+      type: 'checkbox',
+      name: 'selected',
+      choices: entryNames,
+      message: '请选择需要构建的入口',
+
+      validate(answer) {
+        if (answer.length < 1) {
+          return 'You must choose at least one topping.';
+        }
+
+        return true;
+      }
+
+    }]);
+    return selected;
+  }
+
+  entry.forEach(name => {
+    if (!entryNames.includes(name)) {
+      throw new Error(`can not found entry ${name}, compiler entry should in ${entryNames.join(', ')}`);
+    }
+  });
+  return entry;
+};
+
+exports.getSpecifiedEntries = getSpecifiedEntries;

package/dist/js/node/utils/language.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLocaleLanguage = getLocaleLanguage;
+
+var _languageDetector = require("@modern-js/plugin-i18n/language-detector");
+
+function getLocaleLanguage() {
+  const detector = new _languageDetector.I18CLILanguageDetector();
+  return detector.detect();
+}

package/dist/js/node/utils/printInstructions.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.printInstructions = void 0;
+
+var _utils = require("@modern-js/utils");
+
+const printInstructions = async (hookRunners, appContext, config) => {
+  const message = (0, _utils.prettyInstructions)(appContext, config); // call beforePrintInstructions hook.
+
+  const {
+    instructions
+  } = await hookRunners.beforePrintInstructions({
+    instructions: message
+  });
+
+  _utils.logger.log(instructions);
+};
+
+exports.printInstructions = printInstructions;

package/dist/js/node/utils/routes.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.generateRoutes = void 0;
+
+var _path = _interopRequireDefault(require("path"));
+
+var _utils = require("@modern-js/utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const generateRoutes = async appContext => {
+  const {
+    serverRoutes,
+    distDirectory
+  } = appContext;
+  const output = JSON.stringify({
+    routes: serverRoutes
+  }, null, 2);
+  await _utils.fs.outputFile(_path.default.join(distDirectory, _utils.ROUTE_SPEC_FILE), output);
+};
+
+exports.generateRoutes = generateRoutes;

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

@@ -1 +1,11 @@
-export declare const handleDependencies: (appDir: string, serverRootDir: string, include: string[], entryFilter?: ((filePath: string) => boolean) | undefined) => Promise<void>;
+import type { PackageJson } from 'pkg-types';
+import { traceFiles as defaultTraceFiles } from './utils';
+export declare const handleDependencies: ({ appDir, serverRootDir, includeEntries, traceFiles, entryFilter, modifyPackageJson, copyWholePackage, }: {
+    appDir: string;
+    serverRootDir: string;
+    includeEntries: string[];
+    traceFiles?: ((entryFiles: string[], serverRootDir: string, base?: string) => Promise<import("@vercel/nft").NodeFileTraceResult>) | undefined;
+    entryFilter?: ((filePath: string) => boolean) | undefined;
+    modifyPackageJson?: ((pkgJson: PackageJson) => PackageJson) | undefined;
+    copyWholePackage?: ((pkgName: string) => boolean) | undefined;
+}) => Promise<void>;

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

@@ -17,7 +17,13 @@ export type TracedFile = {
     pkgName: string;
     pkgVersion?: string;
 };
-export declare const writePackage: (pkg: TracedPackage, version: string, projectDir: string, _pkgPath?: string) => Promise<void>;
+interface WritePackageOptions {
+    pkg: TracedPackage;
+    version: string;
+    projectDir: string;
+    _pkgPath?: string;
+}
+export declare const writePackage: (options: WritePackageOptions) => Promise<void>;
 export declare const linkPackage: (from: string, to: string, projectRootDir: string) => Promise<void>;
 interface ReadDirOptions {
     filter?: (filePath: string) => boolean;

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

@@ -0,0 +1 @@
+export { handleDependencies } from './dependencies';

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

@@ -1,5 +1,5 @@
 import { ServerPlugin as ServerPluginInstance } from '@modern-js/server-core';
 import { ServerPlugin } from '@modern-js/types';
 import { AppTools, PluginAPI } from '../types';
-export declare function getServerPlugins(api: PluginAPI<AppTools<'shared'>>, metaName?: string): Promise<ServerPlugin[]>;
-export declare function loadServerPlugins(api: PluginAPI<AppTools<'shared'>>, appDirectory: string, metaName: string): Promise<ServerPluginInstance[]>;
+export declare function getServerPlugins(api: PluginAPI<AppTools<'shared'>>): Promise<ServerPlugin[]>;
+export declare function loadServerPlugins(api: PluginAPI<AppTools<'shared'>>, appDirectory: string): Promise<ServerPluginInstance[]>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.54.1",
+  "version": "2.54.2-alpha.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -43,6 +43,11 @@
       "types": "./dist/types/exports/server.d.ts",
       "jsnext:source": "./src/exports/server.ts",
       "default": "./dist/cjs/exports/server.js"
+    },
+    "./deploy": {
+      "types": "./dist/types/plugins/deploy/exports.d.ts",
+      "jsnext:source": "./src/plugins/deploy/exports.ts",
+      "default": "./dist/cjs/plugins/deploy/exports.js"
     }
   },
   "engines": {
@@ -58,6 +63,9 @@
       ],
       "server": [
         "./dist/types/exports/server.d.ts"
+      ],
+      "deploy": [
+        "./dist/types/plugins/deploy/exports.d.ts"
       ]
     }
   },
@@ -81,16 +89,16 @@
     "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
     "@modern-js/core": "2.54.1",
-    "@modern-js/node-bundle-require": "2.54.1",
     "@modern-js/plugin-data-loader": "2.54.1",
     "@modern-js/plugin-i18n": "2.54.1",
-    "@modern-js/prod-server": "2.54.1",
-    "@modern-js/plugin": "2.54.1",
     "@modern-js/plugin-lint": "2.54.1",
     "@modern-js/rsbuild-plugin-esbuild": "2.54.1",
+    "@modern-js/prod-server": "2.54.1",
     "@modern-js/server": "2.54.1",
     "@modern-js/server-core": "2.54.1",
     "@modern-js/server-utils": "2.54.1",
+    "@modern-js/node-bundle-require": "2.54.1",
+    "@modern-js/plugin": "2.54.1",
     "@modern-js/uni-builder": "2.54.1",
     "@modern-js/types": "2.54.1",
     "@modern-js/utils": "2.54.1"
@@ -105,8 +113,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.92.0",
-    "@scripts/jest-config": "2.54.1",
-    "@scripts/build": "2.54.1"
+    "@scripts/build": "2.54.1",
+    "@scripts/jest-config": "2.54.1"
   },
   "sideEffects": false,
   "publishConfig": {