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

package/dist/js/modern/schema/legacy.js

@@ -0,0 +1,284 @@
+import { ENTRY_NAME_PATTERN } from '@modern-js/utils/constants';
+import { Schema } from "./Schema";
+const source = {
+  entries: {
+    type: 'object',
+    patternProperties: {
+      [ENTRY_NAME_PATTERN]: {
+        if: {
+          type: 'object'
+        },
+        then: {
+          required: ['entry'],
+          properties: {
+            entry: {
+              type: ['string', 'array']
+            },
+            disableMount: {
+              type: 'boolean'
+            },
+            enableFileSystemRoutes: {
+              type: 'boolean'
+            }
+          },
+          additionalProperties: false
+        },
+        else: {
+          type: ['string', 'array']
+        }
+      }
+    }
+  },
+  preEntry: {
+    type: ['string', 'array']
+  },
+  alias: {
+    typeof: ['object', 'function']
+  },
+  enableAsyncEntry: {
+    type: 'boolean'
+  },
+  disableDefaultEntries: {
+    type: 'boolean'
+  },
+  envVars: {
+    type: 'array'
+  },
+  globalVars: {
+    type: 'object'
+  },
+  moduleScopes: {
+    instanceof: ['Array', 'Function']
+  },
+  entriesDir: {
+    type: 'string'
+  },
+  configDir: {
+    type: 'string'
+  },
+  include: {
+    type: ['array']
+  }
+};
+const output = {
+  assetPrefix: {
+    type: 'string'
+  },
+  path: {
+    type: 'string'
+  },
+  jsPath: {
+    type: 'string'
+  },
+  cssPath: {
+    type: 'string'
+  },
+  htmlPath: {
+    type: 'string'
+  },
+  mediaPath: {
+    type: 'string'
+  },
+  mountId: {
+    type: 'string'
+  },
+  favicon: {
+    type: 'string'
+  },
+  faviconByEntries: {
+    type: 'object',
+    patternProperties: {
+      [ENTRY_NAME_PATTERN]: {
+        type: 'string'
+      }
+    }
+  },
+  title: {
+    type: 'string'
+  },
+  titleByEntries: {
+    type: 'object',
+    patternProperties: {
+      [ENTRY_NAME_PATTERN]: {
+        type: 'string'
+      }
+    }
+  },
+  meta: {
+    type: 'object'
+  },
+  metaByEntries: {
+    type: 'object',
+    patternProperties: {
+      [ENTRY_NAME_PATTERN]: {
+        type: 'object'
+      }
+    }
+  },
+  inject: {
+    enum: [true, 'head', 'body', false]
+  },
+  injectByEntries: {
+    type: 'object',
+    patternProperties: {
+      [ENTRY_NAME_PATTERN]: {
+        enum: [true, 'head', 'body', false]
+      }
+    }
+  },
+  copy: {
+    type: 'array'
+  },
+  scriptExt: {
+    type: 'object'
+  },
+  disableTsChecker: {
+    type: 'boolean'
+  },
+  disableHtmlFolder: {
+    type: 'boolean'
+  },
+  disableCssModuleExtension: {
+    type: 'boolean'
+  },
+  disableCssExtract: {
+    type: 'boolean'
+  },
+  enableCssModuleTSDeclaration: {
+    type: 'boolean'
+  },
+  disableMinimize: {
+    type: 'boolean'
+  },
+  enableInlineStyles: {
+    type: 'boolean'
+  },
+  enableInlineScripts: {
+    type: 'boolean'
+  },
+  disableSourceMap: {
+    type: 'boolean'
+  },
+  disableInlineRuntimeChunk: {
+    type: 'boolean'
+  },
+  disableAssetsCache: {
+    type: 'boolean'
+  },
+  enableLatestDecorators: {
+    type: 'boolean'
+  },
+  enableTsLoader: {
+    type: 'boolean'
+  },
+  dataUriLimit: {
+    type: 'number'
+  },
+  templateParameters: {
+    type: 'object'
+  },
+  templateParametersByEntries: {
+    type: 'object',
+    patternProperties: {
+      [ENTRY_NAME_PATTERN]: {
+        type: 'object'
+      }
+    }
+  },
+  polyfill: {
+    type: 'string',
+    enum: ['usage', 'entry', 'off', 'ua']
+  },
+  cssModuleLocalIdentName: {
+    type: 'string'
+  },
+  federation: {
+    type: 'object'
+  },
+  disableNodePolyfill: {
+    type: 'boolean'
+  },
+  enableModernMode: {
+    type: 'boolean'
+  }
+};
+const server = {
+  routes: {
+    type: 'object'
+  },
+  publicRoutes: {
+    type: 'object'
+  },
+  ssr: {
+    type: ['boolean', 'object']
+  },
+  ssrByEntries: {
+    type: 'object'
+  },
+  baseUrl: {
+    anyOf: [{
+      type: 'string'
+    }, {
+      type: 'array',
+      items: {
+        type: 'string'
+      }
+    }]
+  },
+  port: {
+    type: 'number'
+  },
+  logger: {
+    type: ['boolean', 'object']
+  },
+  metrics: {
+    type: ['boolean', 'object']
+  },
+  enableMicroFrontendDebug: {
+    type: 'boolean'
+  },
+  watchOptions: {
+    type: 'object'
+  },
+  compiler: {
+    type: 'string'
+  },
+  disableFrameworkExt: {
+    type: 'boolean'
+  }
+};
+const dev = {
+  proxy: {
+    type: ['boolean', 'object']
+  }
+};
+const deploy = {
+  microFrontend: {
+    type: ['boolean', 'object']
+  }
+};
+const tools = {
+  tailwindcss: {
+    type: 'object'
+  },
+  jest: {
+    typeof: ['object', 'function']
+  },
+  esbuild: {
+    typeof: ['object']
+  }
+};
+const bff = {
+  prefix: {
+    type: 'string'
+  },
+  proxy: {
+    type: 'object',
+    additionalProperties: {
+      type: 'string'
+    }
+  }
+};
+const schema = new Schema();
+schema.setSchema('bff', bff).setSchema('dev', dev).setSchema('server', server).setSchema('source', source).setSchema('output', output).setSchema('tools', tools).setSchema('deploy', deploy);
+export default schema;

package/dist/js/modern/types/config/index.js

@@ -0,0 +1,2 @@
+export * from "./output";
+export {};

package/dist/js/modern/types/index.js

@@ -0,0 +1,4 @@
+export * from "./hooks";
+export * from "./config";
+export * from "./legacyConfig";
+export {};

package/dist/js/modern/types/legacyConfig/output.js

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

package/dist/js/modern/utils/config.js

@@ -1,9 +1,6 @@
 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 * as path from 'path';
 import { bundle } from '@modern-js/node-bundle-require';
 import { CONFIG_FILE_EXTENSIONS, fs, getServerConfig, OUTPUT_CONFIG_FILE } from '@modern-js/utils';
@@ -15,9 +12,7 @@ export const buildServerConfig = async ({
   options
 }) => {
   const configFilePath = await getServerConfig(appDirectory, configFile);
-
   const getOutputFile = async filepath => path.resolve(distDirectory, `${filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
-
   if (configFilePath) {
     const configHelperFilePath = path.normalize(path.join(distDirectory, './config-helper.js'));
     const helperCode = `
@@ -29,7 +24,6 @@ export const buildServerConfig = async ({
       getOutputFile,
       esbuildPlugins: [{
         name: 'native-build-config',
-
         setup(ctx) {
           ctx.onResolve({
             filter: /app-tools\/server/
@@ -39,38 +33,33 @@ export const buildServerConfig = async ({
             };
           });
         }
-
       }]
     }));
   }
 };
+
 /**
  *
  * 处理循环引用的 replacer
  */
-
 export 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;
   };
 };
 export 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', OUTPUT_CONFIG_FILE);
+  const outputPath = path.join(appDirectory, ((_resolvedConfig$outpu = resolvedConfig.output.distPath) === null || _resolvedConfig$outpu === void 0 ? void 0 : _resolvedConfig$outpu.root) || './dist', OUTPUT_CONFIG_FILE);
   await fs.writeJSON(outputPath, resolvedConfig, {
     spaces: 2,
     replacer: safeReplacer()

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

@@ -0,0 +1,82 @@
+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;
+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 addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
+  const serverConfig = await 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.
+  if (isDev() || isTest()) {
+    const {
+      appDirectory,
+      configFile
+    } = appContext;
+    const extraFiles = await 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);
+    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)']
+    });
+    watcher.on('change', changed => {
+      const lastHash = hashMap.get(changed);
+      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'
+        });
+      }
+    });
+    watcher.on('add', name => {
+      debug(`add file: %s`, name);
+      const currentHash = md5(fs.readFileSync(path.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;
+  }
+};

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

@@ -1,9 +1,6 @@
 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';
 let server = null;
 export const getServer = () => server;
@@ -17,14 +14,12 @@ export const createServer = async options => {
   if (server) {
     await server.close();
   }
-
   server = new Server(options);
   const app = await 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': {
       path: DataLoaderPlugin,

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

@@ -1,11 +1,9 @@
 import { inquirer } from '@modern-js/utils';
 export const getSpecifiedEntries = async (entry, entrypoints) => {
   const entryNames = entrypoints.map(e => e.entryName);
-
   if (!entry) {
     return entryNames;
   }
-
   if (typeof entry === 'boolean') {
     const {
       selected
@@ -14,19 +12,15 @@ export 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(', ')}`);

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

@@ -1,7 +1,8 @@
 import { prettyInstructions, logger } from '@modern-js/utils';
 export const printInstructions = async (hookRunners, appContext, config) => {
-  const message = prettyInstructions(appContext, config); // call beforePrintInstructions hook.
+  const message = prettyInstructions(appContext, config);
 
+  // call beforePrintInstructions hook.
   const {
     instructions
   } = await hookRunners.beforePrintInstructions({

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

@@ -0,0 +1,17 @@
+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.initOptions);
+  } catch (err) {
+    console.error(err);
+    hasGetError = true;
+  } finally {
+    if (!hasGetError) {
+      program.parse(process.argv);
+    }
+  }
+}

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

@@ -1,6 +1,5 @@
 import path from 'path';
 import { fs, ROUTE_SPEC_FILE } from '@modern-js/utils';
-
 const generateRoutes = async appContext => {
   const {
     serverRoutes,
@@ -11,5 +10,4 @@ const generateRoutes = async appContext => {
   }, null, 2);
   await fs.outputFile(path.join(distDirectory, ROUTE_SPEC_FILE), output);
 };
-
 export { generateRoutes };