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

package/dist/js/treeshaking/schema/index.js

@@ -0,0 +1,138 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { ENTRY_NAME_PATTERN } from '@modern-js/utils/constants';
+import { Schema } from "./Schema";
+var source = {
+  entries: {
+    type: 'object',
+    patternProperties: _defineProperty({}, 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']
+      }
+    })
+  },
+  enableAsyncEntry: {
+    type: 'boolean'
+  },
+  disableDefaultEntries: {
+    type: 'boolean'
+  },
+  entriesDir: {
+    type: 'string'
+  },
+  configDir: {
+    type: 'string'
+  },
+  designSystem: {
+    type: 'object'
+  }
+};
+var bff = {
+  prefix: {
+    type: 'string'
+  },
+  proxy: {
+    type: 'object',
+    additionalProperties: {
+      type: 'string'
+    }
+  }
+};
+var output = {
+  ssg: {
+    "typeof": ['boolean', 'object', 'function']
+  },
+  enableModernMode: {
+    type: 'boolean'
+  },
+  disableNodePolyfill: {
+    type: 'boolean'
+  }
+};
+var dev = {
+  proxy: {
+    type: ['boolean', 'object']
+  }
+};
+var 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'
+  }
+};
+var tools = {
+  tailwindcss: {
+    type: 'object'
+  },
+  jest: {
+    "typeof": ['object', 'function']
+  },
+  esbuild: {
+    "typeof": ['object']
+  }
+};
+var deploy = {
+  microFrontend: {
+    type: ['boolean', 'object']
+  }
+};
+var 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 as legacySchema } from "./legacy";
+export { schema };

package/dist/js/treeshaking/schema/legacy.js

@@ -0,0 +1,273 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { ENTRY_NAME_PATTERN } from '@modern-js/utils/constants';
+import { Schema } from "./Schema";
+var source = {
+  entries: {
+    type: 'object',
+    patternProperties: _defineProperty({}, 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']
+  }
+};
+var 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: _defineProperty({}, ENTRY_NAME_PATTERN, {
+      type: 'string'
+    })
+  },
+  title: {
+    type: 'string'
+  },
+  titleByEntries: {
+    type: 'object',
+    patternProperties: _defineProperty({}, ENTRY_NAME_PATTERN, {
+      type: 'string'
+    })
+  },
+  meta: {
+    type: 'object'
+  },
+  metaByEntries: {
+    type: 'object',
+    patternProperties: _defineProperty({}, ENTRY_NAME_PATTERN, {
+      type: 'object'
+    })
+  },
+  inject: {
+    "enum": [true, 'head', 'body', false]
+  },
+  injectByEntries: {
+    type: 'object',
+    patternProperties: _defineProperty({}, 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: _defineProperty({}, 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'
+  }
+};
+var 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'
+  }
+};
+var dev = {
+  proxy: {
+    type: ['boolean', 'object']
+  }
+};
+var deploy = {
+  microFrontend: {
+    type: ['boolean', 'object']
+  }
+};
+var tools = {
+  tailwindcss: {
+    type: 'object'
+  },
+  jest: {
+    "typeof": ['object', 'function']
+  },
+  esbuild: {
+    "typeof": ['object']
+  }
+};
+var bff = {
+  prefix: {
+    type: 'string'
+  },
+  proxy: {
+    type: 'object',
+    additionalProperties: {
+      type: 'string'
+    }
+  }
+};
+var 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/treeshaking/types/config/index.js

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

package/dist/js/treeshaking/types/index.js

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

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

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

package/dist/js/treeshaking/utils/config.js

@@ -105,7 +105,7 @@ export var emitResolvedConfig = /*#__PURE__*/function () {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            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);
+            outputPath = path.join(appDirectory, ((_resolvedConfig$outpu = resolvedConfig.output.distPath) === null || _resolvedConfig$outpu === void 0 ? void 0 : _resolvedConfig$outpu.root) || './dist', OUTPUT_CONFIG_FILE);
             _context3.next = 3;
             return fs.writeJSON(outputPath, resolvedConfig, {
               spaces: 2,

package/dist/js/treeshaking/utils/createFileWatcher.js

@@ -0,0 +1,123 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+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 getPackageConfig = function getPackageConfig(appDirectory, packageJsonConfig) {
+  var PACKAGE_JSON_CONFIG_NAME = 'modernConfig';
+  var json = JSON.parse(fs.readFileSync(path.resolve(appDirectory, './package.json'), 'utf8'));
+  return json[packageJsonConfig !== null && packageJsonConfig !== void 0 ? packageJsonConfig : PACKAGE_JSON_CONFIG_NAME];
+};
+export var addServerConfigToDeps = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dependencies, appDirectory, serverConfigFile) {
+    var serverConfig;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return getServerConfig(appDirectory, serverConfigFile);
+          case 2:
+            serverConfig = _context.sent;
+            if (serverConfig) {
+              dependencies.push(serverConfig);
+            }
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return function addServerConfigToDeps(_x, _x2, _x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var debug = createDebugger('watch-files');
+var md5 = function md5(data) {
+  return crypto.createHash('md5').update(data).digest('hex');
+};
+var hashMap = new Map();
+export var createFileWatcher = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(appContext, configDir, hooksRunner) {
+    var appDirectory, configFile, extraFiles, configPath, dependencies, watched, watcher;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            if (!(isDev() || isTest())) {
+              _context2.next = 17;
+              break;
+            }
+            appDirectory = appContext.appDirectory, configFile = appContext.configFile;
+            _context2.next = 4;
+            return hooksRunner.watchFiles();
+          case 4:
+            extraFiles = _context2.sent;
+            configPath = path.join(appDirectory, configDir);
+            dependencies = getPackageConfig(appContext.appDirectory, appContext.packageName) ? [path.resolve(appDirectory, './package.json')] : []; // 将 server.config 加入到 loaded.dependencies，以便对文件监听做热更新
+            _context2.next = 9;
+            return addServerConfigToDeps(dependencies, appContext.appDirectory, appContext.serverConfigFile);
+          case 9:
+            watched = ["".concat(configPath, "/html")].concat(_toConsumableArray(extraFiles), dependencies, [configFile]).filter(Boolean);
+            debug("watched: %o", watched);
+            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', function (changed) {
+              var lastHash = hashMap.get(changed);
+              var 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', function (name) {
+              debug("add file: %s", name);
+              var currentHash = md5(fs.readFileSync(path.join(appDirectory, name), 'utf8'));
+              hashMap.set(name, currentHash);
+              hooksRunner.fileChange({
+                filename: name,
+                eventType: 'add'
+              });
+            });
+            watcher.on('unlink', function (name) {
+              debug("remove file: %s", name);
+              if (hashMap.has(name)) {
+                hashMap["delete"](name);
+              }
+              hooksRunner.fileChange({
+                filename: name,
+                eventType: 'unlink'
+              });
+            });
+            watcher.on('error', function (err) {
+              throw err;
+            });
+            return _context2.abrupt("return", watcher);
+          case 17:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return function createFileWatcher(_x4, _x5, _x6) {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/dist/js/treeshaking/utils/restart.js

@@ -0,0 +1,45 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { cli } from '@modern-js/core';
+import { logger, program } from '@modern-js/utils';
+export function restart(_x) {
+  return _restart.apply(this, arguments);
+}
+function _restart() {
+  _restart = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(hooksRunner) {
+    var hasGetError;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            logger.info('Restart...\n');
+            hasGetError = false;
+            _context.next = 4;
+            return hooksRunner.beforeRestart();
+          case 4:
+            _context.prev = 4;
+            _context.next = 7;
+            return cli.init(cli.getPrevInitOptions());
+          case 7:
+            _context.next = 13;
+            break;
+          case 9:
+            _context.prev = 9;
+            _context.t0 = _context["catch"](4);
+            console.error(_context.t0);
+            hasGetError = true;
+          case 13:
+            _context.prev = 13;
+            if (!hasGetError) {
+              program.parse(process.argv);
+            }
+            return _context.finish(13);
+          case 16:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[4, 9, 13, 16]]);
+  }));
+  return _restart.apply(this, arguments);
+}

package/dist/types/analyze/constants.d.ts

@@ -4,6 +4,8 @@ export declare const APP_FILE_NAME = "App";
 export declare const PAGES_DIR_NAME = "pages";
 export declare const NESTED_ROUTES_DIR = "routes";
 export declare const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+export declare const LOADER_EXPORT_NAME = "loader";
+export declare const TEMP_LOADERS_DIR = "__loaders__";
 export declare const ENTRY_POINT_FILE_NAME = "index.js";
 export declare const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.js";
 export declare const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: RegExp;

package/dist/types/analyze/generateCode.d.ts

@@ -1,4 +1,5 @@
-import { IAppContext, NormalizedConfig, PluginAPI, ImportStatement } from '@modern-js/core';
+import { IAppContext, PluginAPI } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
+import { AppNormalizedConfig, AppTools, ImportStatement } from '../types';
 export declare const createImportStatements: (statements: ImportStatement[]) => string;
-export declare const generateCode: (appContext: IAppContext, config: NormalizedConfig, entrypoints: Entrypoint[], api: PluginAPI) => Promise<void>;
+export declare const generateCode: (appContext: IAppContext, config: AppNormalizedConfig, entrypoints: Entrypoint[], api: PluginAPI<AppTools>) => Promise<void>;

package/dist/types/analyze/getBundleEntry.d.ts

@@ -1,3 +1,3 @@
-import type { IAppContext, NormalizedConfig } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
-export declare const getBundleEntry: (appContext: IAppContext, config: NormalizedConfig) => Entrypoint[];
+import type { AppNormalizedConfig, IAppContext } from '../types';
+export declare const getBundleEntry: (appContext: IAppContext, config: AppNormalizedConfig) => Entrypoint[];

package/dist/types/analyze/getFileSystemEntry.d.ts

@@ -1,4 +1,4 @@
-import type { NormalizedConfig, IAppContext } from '@modern-js/core';
 import type { Entrypoint } from '@modern-js/types';
+import type { AppNormalizedConfig, IAppContext } from '../types';
 export type { Entrypoint };
-export declare const getFileSystemEntry: (appContext: IAppContext, config: NormalizedConfig) => Entrypoint[];
+export declare const getFileSystemEntry: (appContext: IAppContext, config: AppNormalizedConfig) => Entrypoint[];

package/dist/types/analyze/getHtmlTemplate.d.ts

@@ -1,9 +1,9 @@
-import type { IAppContext, NormalizedConfig, PluginAPI } from '@modern-js/core';
 import type { Entrypoint, HtmlTemplates } from '@modern-js/types';
-export declare const getHtmlTemplate: (entrypoints: Entrypoint[], api: PluginAPI, {
+import type { AppNormalizedConfig, AppTools, IAppContext, PluginAPI } from '../types';
+export declare const getHtmlTemplate: (entrypoints: Entrypoint[], api: PluginAPI<AppTools>, {
   appContext,
   config
 }: {
   appContext: IAppContext;
-  config: NormalizedConfig;
+  config: AppNormalizedConfig;
 }) => Promise<HtmlTemplates>;