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

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

@@ -4,27 +4,16 @@ 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,
@@ -32,9 +21,7 @@ const buildServerConfig = async ({
   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 = `
@@ -46,7 +33,6 @@ const buildServerConfig = async ({
       getOutputFile,
       esbuildPlugins: [{
         name: 'native-build-config',
-
         setup(ctx) {
           ctx.onResolve({
             filter: /app-tools\/server/
@@ -56,48 +42,38 @@ const buildServerConfig = async ({
             };
           });
         }
-
       }]
     }));
   }
 };
+
 /**
  *
  * 处理循环引用的 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);
+  const outputPath = path.join(appDirectory, ((_resolvedConfig$outpu = resolvedConfig.output.distPath) === null || _resolvedConfig$outpu === void 0 ? void 0 : _resolvedConfig$outpu.root) || './dist', _utils.OUTPUT_CONFIG_FILE);
   await _utils.fs.writeJSON(outputPath, resolvedConfig, {
     spaces: 2,
     replacer: safeReplacer()
   });
 };
-
 exports.emitResolvedConfig = emitResolvedConfig;

package/dist/js/node/utils/createFileWatcher.js

@@ -0,0 +1,90 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createFileWatcher = void 0;
+var _crypto = _interopRequireDefault(require("crypto"));
+var _fs = _interopRequireDefault(require("fs"));
+var _path = _interopRequireDefault(require("path"));
+var _utils = require("@modern-js/utils");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+/**
+ * Get user config from package.json.
+ * @param appDirectory - App root directory.
+ * @returns modernConfig or undefined
+ */
+// FIXME: read package.json again;
+const getPackageConfig = (appDirectory, packageJsonConfig) => {
+  const PACKAGE_JSON_CONFIG_NAME = 'modernConfig';
+  const json = JSON.parse(_fs.default.readFileSync(_path.default.resolve(appDirectory, './package.json'), 'utf8'));
+  return json[packageJsonConfig !== null && packageJsonConfig !== void 0 ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
+};
+const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
+  const serverConfig = await (0, _utils.getServerConfig)(appDirectory, serverConfigFile);
+  if (serverConfig) {
+    dependencies.push(serverConfig);
+  }
+};
+const debug = (0, _utils.createDebugger)('watch-files');
+const md5 = data => _crypto.default.createHash('md5').update(data).digest('hex');
+const hashMap = new Map();
+const createFileWatcher = async (appContext, configDir, hooksRunner) => {
+  // only add fs watcher on dev mode.
+  if ((0, _utils.isDev)() || (0, _utils.isTest)()) {
+    const {
+      appDirectory,
+      configFile
+    } = appContext;
+    const extraFiles = await hooksRunner.watchFiles();
+    const configPath = _path.default.join(appDirectory, configDir);
+    const dependencies = getPackageConfig(appContext.appDirectory, appContext.packageName) ? [_path.default.resolve(appDirectory, './package.json')] : [];
+
+    // 将 server.config 加入到 loaded.dependencies，以便对文件监听做热更新
+    await addServerConfigToDeps(dependencies, appContext.appDirectory, appContext.serverConfigFile);
+    const watched = [`${configPath}/html`, ...extraFiles, ...dependencies, configFile].filter(Boolean);
+    debug(`watched: %o`, watched);
+    const watcher = _utils.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)']
+    });
+    watcher.on('change', changed => {
+      const lastHash = hashMap.get(changed);
+      const currentHash = md5(_fs.default.readFileSync(_path.default.join(appDirectory, changed), 'utf8'));
+      if (currentHash !== lastHash) {
+        debug(`file change: %s`, changed);
+        hashMap.set(changed, currentHash);
+        hooksRunner.fileChange({
+          filename: changed,
+          eventType: 'change'
+        });
+      }
+    });
+    watcher.on('add', name => {
+      debug(`add file: %s`, name);
+      const currentHash = md5(_fs.default.readFileSync(_path.default.join(appDirectory, name), 'utf8'));
+      hashMap.set(name, currentHash);
+      hooksRunner.fileChange({
+        filename: name,
+        eventType: 'add'
+      });
+    });
+    watcher.on('unlink', name => {
+      debug(`remove file: %s`, name);
+      if (hashMap.has(name)) {
+        hashMap.delete(name);
+      }
+      hooksRunner.fileChange({
+        filename: name,
+        eventType: 'unlink'
+      });
+    });
+    watcher.on('error', err => {
+      throw err;
+    });
+    return watcher;
+  }
+};
+exports.createFileWatcher = createFileWatcher;

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

@@ -4,45 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.injectDataLoaderPlugin = exports.getServer = exports.createServer = exports.closeServer = void 0;
-
 var _server = require("@modern-js/server");
-
 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; }
-
 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;
-
 const injectDataLoaderPlugin = internalPlugins => {
   const DataLoaderPlugin = require.resolve('@modern-js/plugin-data-loader/server');
-
   return _objectSpread(_objectSpread({}, internalPlugins), {}, {
     '@modern-js/plugin-data-loader': {
       path: DataLoaderPlugin,
@@ -50,5 +36,4 @@ const injectDataLoaderPlugin = internalPlugins => {
     }
   });
 };
-
 exports.injectDataLoaderPlugin = injectDataLoaderPlugin;

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

@@ -4,16 +4,12 @@ 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
@@ -22,19 +18,15 @@ const getSpecifiedEntries = async (entry, entrypoints) => {
       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(', ')}`);
@@ -42,5 +34,4 @@ const getSpecifiedEntries = async (entry, entrypoints) => {
   });
   return entry;
 };
-
 exports.getSpecifiedEntries = getSpecifiedEntries;

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

@@ -4,9 +4,7 @@ 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

@@ -4,19 +4,16 @@ 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 message = (0, _utils.prettyInstructions)(appContext, config);
 
+  // call beforePrintInstructions hook.
   const {
     instructions
   } = await hookRunners.beforePrintInstructions({
     instructions: message
   });
-
   _utils.logger.info(instructions);
 };
-
 exports.printInstructions = printInstructions;

package/dist/js/node/utils/restart.js

@@ -0,0 +1,23 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.restart = restart;
+var _core = require("@modern-js/core");
+var _utils = require("@modern-js/utils");
+async function restart(hooksRunner) {
+  _utils.logger.info('Restart...\n');
+  let hasGetError = false;
+  await hooksRunner.beforeRestart();
+  try {
+    await _core.cli.init(_core.cli.initOptions);
+  } catch (err) {
+    console.error(err);
+    hasGetError = true;
+  } finally {
+    if (!hasGetError) {
+      _utils.program.parse(process.argv);
+    }
+  }
+}

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

@@ -4,13 +4,9 @@ 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,
@@ -21,5 +17,4 @@ const generateRoutes = async appContext => {
   }, null, 2);
   await _utils.fs.outputFile(_path.default.join(distDirectory, _utils.ROUTE_SPEC_FILE), output);
 };
-
 exports.generateRoutes = generateRoutes;