@modern-js/app-tools 2.0.0-beta.3 → 2.0.0-beta.6

package/dist/js/modern/utils/createFileWatcher.js

@@ -1,82 +1,115 @@
-import crypto from 'crypto';
-import fs from 'fs';
-import path from 'path';
-import { isDev, chokidar, createDebugger, isTest, getServerConfig } from '@modern-js/utils';
-/**
- * Get user config from package.json.
- * @param appDirectory - App root directory.
- * @returns modernConfig or undefined
- */
-// FIXME: read package.json again;
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import crypto from "crypto";
+import fs from "fs";
+import path from "path";
+import {
+  isDev,
+  chokidar,
+  createDebugger,
+  isTest,
+  getServerConfig
+} from "@modern-js/utils";
 const getPackageConfig = (appDirectory, packageJsonConfig) => {
-  const PACKAGE_JSON_CONFIG_NAME = 'modernConfig';
-  const json = JSON.parse(fs.readFileSync(path.resolve(appDirectory, './package.json'), 'utf8'));
-  return json[packageJsonConfig !== null && packageJsonConfig !== void 0 ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
+  const PACKAGE_JSON_CONFIG_NAME = "modernConfig";
+  const json = JSON.parse(
+    fs.readFileSync(path.resolve(appDirectory, "./package.json"), "utf8")
+  );
+  return json[packageJsonConfig != null ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
 };
-export const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
-  const serverConfig = await getServerConfig(appDirectory, serverConfigFile);
+const addServerConfigToDeps = (dependencies, appDirectory, serverConfigFile) => __async(void 0, null, function* () {
+  const serverConfig = yield getServerConfig(appDirectory, serverConfigFile);
   if (serverConfig) {
     dependencies.push(serverConfig);
   }
-};
-const debug = createDebugger('watch-files');
-const md5 = data => crypto.createHash('md5').update(data).digest('hex');
-const hashMap = new Map();
-export const createFileWatcher = async (appContext, configDir, hooksRunner) => {
-  // only add fs watcher on dev mode.
+});
+const debug = createDebugger("watch-files");
+const md5 = (data) => crypto.createHash("md5").update(data).digest("hex");
+const hashMap = /* @__PURE__ */ new Map();
+const createFileWatcher = (appContext, configDir, hooksRunner) => __async(void 0, null, function* () {
   if (isDev() || isTest()) {
-    const {
-      appDirectory,
-      configFile
-    } = appContext;
-    const extraFiles = await hooksRunner.watchFiles();
+    const { appDirectory, configFile } = appContext;
+    const extraFiles = yield hooksRunner.watchFiles();
     const configPath = path.join(appDirectory, configDir);
-    const dependencies = getPackageConfig(appContext.appDirectory, appContext.packageName) ? [path.resolve(appDirectory, './package.json')] : [];
-
-    // 将 server.config 加入到 loaded.dependencies，以便对文件监听做热更新
-    await addServerConfigToDeps(dependencies, appContext.appDirectory, appContext.serverConfigFile);
-    const watched = [`${configPath}/html`, ...extraFiles, ...dependencies, configFile].filter(Boolean);
+    const dependencies = getPackageConfig(
+      appContext.appDirectory,
+      appContext.packageName
+    ) ? [path.resolve(appDirectory, "./package.json")] : [];
+    yield addServerConfigToDeps(
+      dependencies,
+      appContext.appDirectory,
+      appContext.serverConfigFile
+    );
+    const watched = [
+      `${configPath}/html`,
+      ...extraFiles,
+      ...dependencies,
+      configFile
+    ].filter(Boolean);
     debug(`watched: %o`, watched);
     const watcher = chokidar.watch(watched, {
       cwd: appDirectory,
       ignoreInitial: true,
       ignorePermissionErrors: true,
-      ignored: [/node_modules/, '**/__test__/**', '**/*.test.(js|jsx|ts|tsx)', '**/*.spec.(js|jsx|ts|tsx)', '**/*.stories.(js|jsx|ts|tsx)']
+      ignored: [
+        /node_modules/,
+        "**/__test__/**",
+        "**/*.test.(js|jsx|ts|tsx)",
+        "**/*.spec.(js|jsx|ts|tsx)",
+        "**/*.stories.(js|jsx|ts|tsx)"
+      ]
     });
-    watcher.on('change', changed => {
+    watcher.on("change", (changed) => {
       const lastHash = hashMap.get(changed);
-      const currentHash = md5(fs.readFileSync(path.join(appDirectory, changed), 'utf8'));
+      const currentHash = md5(
+        fs.readFileSync(path.join(appDirectory, changed), "utf8")
+      );
       if (currentHash !== lastHash) {
         debug(`file change: %s`, changed);
         hashMap.set(changed, currentHash);
-        hooksRunner.fileChange({
-          filename: changed,
-          eventType: 'change'
-        });
+        hooksRunner.fileChange({ filename: changed, eventType: "change" });
       }
     });
-    watcher.on('add', name => {
+    watcher.on("add", (name) => {
       debug(`add file: %s`, name);
-      const currentHash = md5(fs.readFileSync(path.join(appDirectory, name), 'utf8'));
+      const currentHash = md5(
+        fs.readFileSync(path.join(appDirectory, name), "utf8")
+      );
       hashMap.set(name, currentHash);
-      hooksRunner.fileChange({
-        filename: name,
-        eventType: 'add'
-      });
+      hooksRunner.fileChange({ filename: name, eventType: "add" });
     });
-    watcher.on('unlink', name => {
+    watcher.on("unlink", (name) => {
       debug(`remove file: %s`, name);
       if (hashMap.has(name)) {
         hashMap.delete(name);
       }
-      hooksRunner.fileChange({
-        filename: name,
-        eventType: 'unlink'
-      });
+      hooksRunner.fileChange({ filename: name, eventType: "unlink" });
     });
-    watcher.on('error', err => {
+    watcher.on("error", (err) => {
       throw err;
     });
     return watcher;
   }
-};
+});
+export {
+  addServerConfigToDeps,
+  createFileWatcher
+};

package/dist/js/modern/utils/createServer.js

@@ -1,29 +1,75 @@
-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; }
-import { Server } from '@modern-js/server';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { Server } from "@modern-js/server";
 let server = null;
-export const getServer = () => server;
-export const closeServer = async () => {
+const getServer = () => server;
+const setServer = (newServer) => {
+  server = newServer;
+};
+const closeServer = () => __async(void 0, null, function* () {
   if (server) {
-    await server.close();
+    yield server.close();
     server = null;
   }
-};
-export const createServer = async options => {
+});
+const createServer = (options) => __async(void 0, null, function* () {
   if (server) {
-    await server.close();
+    yield server.close();
   }
   server = new Server(options);
-  const app = await server.init();
+  const app = yield server.init();
   return app;
-};
-export const injectDataLoaderPlugin = internalPlugins => {
-  const DataLoaderPlugin = require.resolve('@modern-js/plugin-data-loader/server');
-  return _objectSpread(_objectSpread({}, internalPlugins), {}, {
-    '@modern-js/plugin-data-loader': {
+});
+const injectDataLoaderPlugin = (internalPlugins) => {
+  const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
+  return __spreadProps(__spreadValues({}, internalPlugins), {
+    "@modern-js/plugin-data-loader": {
       path: DataLoaderPlugin,
       forced: true
     }
   });
-};
+};
+export {
+  closeServer,
+  createServer,
+  getServer,
+  injectDataLoaderPlugin,
+  setServer
+};

package/dist/js/modern/utils/getServerInternalPlugins.js

@@ -0,0 +1,58 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+function getServerInternalPlugins(api) {
+  return __async(this, null, function* () {
+    const hookRunners = api.useHookRunners();
+    const { plugins: serverPlugins } = yield hookRunners.collectServerPlugins({
+      plugins: []
+    });
+    const serverInternalPlugins = serverPlugins.reduce(
+      (result, plugin) => Object.assign(result, plugin),
+      {}
+    );
+    api.setAppContext(__spreadProps(__spreadValues({}, api.useAppContext()), {
+      serverInternalPlugins
+    }));
+    return serverInternalPlugins;
+  });
+}
+export {
+  getServerInternalPlugins
+};

package/dist/js/modern/utils/getSpecifiedEntries.js

@@ -1,30 +1,57 @@
-import { inquirer } from '@modern-js/utils';
-export const getSpecifiedEntries = async (entry, entrypoints) => {
-  const entryNames = entrypoints.map(e => e.entryName);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { inquirer } from "@modern-js/utils";
+const getSpecifiedEntries = (entry, entrypoints) => __async(void 0, null, function* () {
+  const entryNames = entrypoints.map((e) => e.entryName);
   if (!entry) {
     return entryNames;
   }
-  if (typeof entry === 'boolean') {
-    const {
-      selected
-    } = await inquirer.prompt([{
-      type: 'checkbox',
-      name: 'selected',
-      choices: entryNames,
-      message: '请选择需要构建的入口',
-      validate(answer) {
-        if (answer.length < 1) {
-          return 'You must choose at least one topping.';
+  if (typeof entry === "boolean") {
+    const { selected } = yield 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 true;
       }
-    }]);
+    ]);
     return selected;
   }
-  entry.forEach(name => {
+  entry.forEach((name) => {
     if (!entryNames.includes(name)) {
-      throw new Error(`can not found entry ${name}, compiler entry should in ${entryNames.join(', ')}`);
+      throw new Error(
+        `can not found entry ${name}, compiler entry should in ${entryNames.join(
+          ", "
+        )}`
+      );
     }
   });
   return entry;
-};
+});
+export {
+  getSpecifiedEntries
+};

package/dist/js/modern/utils/language.js

@@ -1,5 +1,8 @@
-import { I18CLILanguageDetector } from '@modern-js/plugin-i18n/language-detector';
-export function getLocaleLanguage() {
+import { I18CLILanguageDetector } from "@modern-js/plugin-i18n/language-detector";
+function getLocaleLanguage() {
   const detector = new I18CLILanguageDetector();
   return detector.detect();
-}
+}
+export {
+  getLocaleLanguage
+};

package/dist/js/modern/utils/printInstructions.js

@@ -1,12 +1,31 @@
-import { prettyInstructions, logger } from '@modern-js/utils';
-export const printInstructions = async (hookRunners, appContext, config) => {
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { prettyInstructions, logger } from "@modern-js/utils";
+const printInstructions = (hookRunners, appContext, config) => __async(void 0, null, function* () {
   const message = prettyInstructions(appContext, config);
-
-  // call beforePrintInstructions hook.
-  const {
-    instructions
-  } = await hookRunners.beforePrintInstructions({
+  const { instructions } = yield hookRunners.beforePrintInstructions({
     instructions: message
   });
   logger.info(instructions);
-};
+});
+export {
+  printInstructions
+};

package/dist/js/modern/utils/restart.js

@@ -1,17 +1,44 @@
-import { cli } from '@modern-js/core';
-import { logger, program } from '@modern-js/utils';
-export async function restart(hooksRunner) {
-  logger.info('Restart...\n');
-  let hasGetError = false;
-  await hooksRunner.beforeRestart();
-  try {
-    await cli.init(cli.getPrevInitOptions());
-  } catch (err) {
-    console.error(err);
-    hasGetError = true;
-  } finally {
-    if (!hasGetError) {
-      program.parse(process.argv);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import { cli } from "@modern-js/core";
+import { chalk, clearConsole, logger, program } from "@modern-js/utils";
+function restart(hooksRunner, filename) {
+  return __async(this, null, function* () {
+    clearConsole();
+    logger.info(`Restart because ${chalk.yellow(filename)} is changed...
+`);
+    let hasGetError = false;
+    yield hooksRunner.beforeRestart();
+    try {
+      yield cli.init(cli.getPrevInitOptions());
+    } catch (err) {
+      console.error(err);
+      hasGetError = true;
+    } finally {
+      if (!hasGetError) {
+        program.parse(process.argv);
+      }
     }
-  }
-}
+  });
+}
+export {
+  restart
+};

package/dist/js/modern/utils/routes.js

@@ -1,13 +1,30 @@
-import path from 'path';
-import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
-const generateRoutes = async appContext => {
-  const {
-    serverRoutes,
-    distDirectory
-  } = appContext;
-  const output = JSON.stringify({
-    routes: serverRoutes
-  }, null, 2);
-  await fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
+var __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+import path from "path";
+import { fs, ROUTE_SPEC_FILE } from "@modern-js/utils";
+const generateRoutes = (appContext) => __async(void 0, null, function* () {
+  const { serverRoutes, distDirectory } = appContext;
+  const output = JSON.stringify({ routes: serverRoutes }, null, 2);
+  yield fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
+});
+export {
+  generateRoutes
 };
-export { generateRoutes };

package/dist/js/node/analyze/Builder.js

@@ -0,0 +1,64 @@
+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 __async = (__this, __arguments, generator) => {
+  return new Promise((resolve, reject) => {
+    var fulfilled = (value) => {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var rejected = (value) => {
+      try {
+        step(generator.throw(value));
+      } catch (e) {
+        reject(e);
+      }
+    };
+    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
+    step((generator = generator.apply(__this, __arguments)).next());
+  });
+};
+var Builder_exports = {};
+__export(Builder_exports, {
+  Builder: () => Builder,
+  loaderBuilder: () => loaderBuilder,
+  serverLoaderBuilder: () => serverLoaderBuilder
+});
+module.exports = __toCommonJS(Builder_exports);
+var import_esbuild = require("esbuild");
+class Builder {
+  build(options) {
+    return __async(this, null, function* () {
+      this.buildRes = yield (0, import_esbuild.build)(options);
+    });
+  }
+  stop() {
+    var _a, _b;
+    ((_a = this.buildRes) == null ? void 0 : _a.stop) && ((_b = this.buildRes) == null ? void 0 : _b.stop());
+  }
+}
+const loaderBuilder = new Builder();
+const serverLoaderBuilder = new Builder();
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Builder,
+  loaderBuilder,
+  serverLoaderBuilder
+});