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

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

@@ -1,284 +1,149 @@
-import { ENTRY_NAME_PATTERN } from '@modern-js/utils/constants';
+import { ENTRY_NAME_PATTERN } from "@modern-js/utils/constants";
 import { Schema } from "./Schema";
 const source = {
   entries: {
-    type: 'object',
+    type: "object",
     patternProperties: {
       [ENTRY_NAME_PATTERN]: {
-        if: {
-          type: 'object'
-        },
+        if: { type: "object" },
         then: {
-          required: ['entry'],
+          required: ["entry"],
           properties: {
-            entry: {
-              type: ['string', 'array']
-            },
-            disableMount: {
-              type: 'boolean'
-            },
-            enableFileSystemRoutes: {
-              type: 'boolean'
-            }
+            entry: { type: ["string", "array"] },
+            disableMount: { type: "boolean" },
+            enableFileSystemRoutes: { type: "boolean" }
           },
           additionalProperties: false
         },
-        else: {
-          type: ['string', 'array']
-        }
+        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']
-  }
+  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'
-  },
+  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'
+    type: "object",
+    patternProperties: { [ENTRY_NAME_PATTERN]: { type: "string" } }
   },
+  title: { type: "string" },
   titleByEntries: {
-    type: 'object',
-    patternProperties: {
-      [ENTRY_NAME_PATTERN]: {
-        type: 'string'
-      }
-    }
-  },
-  meta: {
-    type: 'object'
+    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]
+    type: "object",
+    patternProperties: { [ENTRY_NAME_PATTERN]: { type: "object" } }
   },
+  inject: { enum: [true, "head", "body", false] },
   injectByEntries: {
-    type: 'object',
+    type: "object",
     patternProperties: {
-      [ENTRY_NAME_PATTERN]: {
-        enum: [true, 'head', 'body', false]
-      }
+      [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'
-  },
+  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'
-      }
-    }
+    type: "object",
+    patternProperties: { [ENTRY_NAME_PATTERN]: { type: "object" } }
   },
   polyfill: {
-    type: 'string',
-    enum: ['usage', 'entry', 'off', 'ua']
-  },
-  cssModuleLocalIdentName: {
-    type: 'string'
-  },
-  federation: {
-    type: 'object'
+    type: "string",
+    enum: ["usage", "entry", "off", "ua"]
   },
-  disableNodePolyfill: {
-    type: 'boolean'
-  },
-  enableModernMode: {
-    type: 'boolean'
-  }
+  cssModuleLocalIdentName: { type: "string" },
+  federation: { type: "object" },
+  disableNodePolyfill: { type: "boolean" }
 };
 const server = {
-  routes: {
-    type: 'object'
-  },
-  publicRoutes: {
-    type: 'object'
-  },
+  routes: { type: "object" },
+  publicRoutes: { type: "object" },
   ssr: {
-    type: ['boolean', 'object']
-  },
-  ssrByEntries: {
-    type: 'object'
+    type: ["boolean", "object"]
   },
+  ssrByEntries: { type: "object" },
   baseUrl: {
-    anyOf: [{
-      type: 'string'
-    }, {
-      type: 'array',
-      items: {
-        type: 'string'
+    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'
-  }
+    ]
+  },
+  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']
+    type: ["boolean", "object"]
   }
 };
 const deploy = {
-  microFrontend: {
-    type: ['boolean', 'object']
-  }
+  microFrontend: { type: ["boolean", "object"] }
 };
 const tools = {
-  tailwindcss: {
-    type: 'object'
-  },
-  jest: {
-    typeof: ['object', 'function']
-  },
-  esbuild: {
-    typeof: ['object']
-  }
+  tailwindcss: { type: "object" },
+  jest: { typeof: ["object", "function"] },
+  esbuild: { typeof: ["object"] }
 };
 const bff = {
   prefix: {
-    type: 'string'
+    type: "string"
   },
   proxy: {
-    type: 'object',
+    type: "object",
     additionalProperties: {
-      type: 'string'
+      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;
+schema.setSchema("bff", bff).setSchema("dev", dev).setSchema("server", server).setSchema("source", source).setSchema("output", output).setSchema("tools", tools).setSchema("deploy", deploy);
+var legacy_default = schema;
+export {
+  legacy_default as default
+};

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

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

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

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

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

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

package/dist/js/modern/utils/commands.js

@@ -1,5 +1,13 @@
-export const getCommand = () => {
+const getCommand = () => {
   const args = process.argv.slice(2);
   const command = args[0];
   return command;
-};
+};
+const isDevCommand = () => {
+  const command = getCommand();
+  return command === "dev" || command === "start";
+};
+export {
+  getCommand,
+  isDevCommand
+};

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

@@ -1,67 +1,128 @@
-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';
-export const defineServerConfig = config => config;
-export const buildServerConfig = async ({
+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 * 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";
+const defineServerConfig = (config) => config;
+const buildServerConfig = (_0) => __async(void 0, [_0], function* ({
   appDirectory,
   distDirectory,
   configFile,
   options
-}) => {
-  const configFilePath = await getServerConfig(appDirectory, configFile);
-  const getOutputFile = async filepath => path.resolve(distDirectory, `${filepath.replace(new RegExp(CONFIG_FILE_EXTENSIONS.join('|')), '')}.js`);
+}) {
+  const configFilePath = yield getServerConfig(appDirectory, configFile);
+  const getOutputFile = (filepath) => __async(void 0, null, function* () {
+    return 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 configHelperFilePath = path.normalize(
+      path.join(distDirectory, "./config-helper.js")
+    );
     const helperCode = `
       export const defineConfig = (config) => config;
     `;
-    await fs.ensureDir(distDirectory);
-    await fs.writeFile(configHelperFilePath, helperCode);
-    await bundle(configFilePath, _objectSpread(_objectSpread({}, options), {}, {
+    yield fs.ensureDir(distDirectory);
+    yield fs.writeFile(configHelperFilePath, helperCode);
+    yield bundle(configFilePath, __spreadProps(__spreadValues({}, options), {
       getOutputFile,
-      esbuildPlugins: [{
-        name: 'native-build-config',
-        setup(ctx) {
-          ctx.onResolve({
-            filter: /app-tools\/server/
-          }, () => {
-            return {
-              path: configHelperFilePath
-            };
-          });
+      esbuildPlugins: [
+        {
+          name: "native-build-config",
+          setup(ctx) {
+            ctx.onResolve(
+              {
+                filter: /app-tools\/server/
+              },
+              () => {
+                return {
+                  path: configHelperFilePath
+                };
+              }
+            );
+          }
         }
-      }]
+      ]
     }));
   }
-};
-
-/**
- *
- * 处理循环引用的 replacer
- */
-export const safeReplacer = () => {
+});
+const safeReplacer = () => {
   const cache = [];
   const keyCache = [];
-  return function (key, value) {
-    if (typeof value === 'object' && value !== null) {
+  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');
+      keyCache.push(key || "root");
     }
     return value;
   };
 };
-export const emitResolvedConfig = async (appDirectory, resolvedConfig) => {
-  var _resolvedConfig$outpu;
-  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, {
+const emitResolvedConfig = (appDirectory, resolvedConfig) => __async(void 0, null, function* () {
+  var _a;
+  const outputPath = path.join(
+    appDirectory,
+    ((_a = resolvedConfig.output.distPath) == null ? void 0 : _a.root) || "./dist",
+    OUTPUT_CONFIG_FILE
+  );
+  yield fs.writeJSON(outputPath, resolvedConfig, {
     spaces: 2,
     replacer: safeReplacer()
   });
-};
+});
+export {
+  buildServerConfig,
+  defineServerConfig,
+  emitResolvedConfig,
+  safeReplacer
+};