@modern-js/core 1.8.0 → 1.9.0

package/package.json

@@ -11,20 +11,20 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.8.0",
+  "version": "1.9.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
-  "main": "./dist/js/node/index.js",
-  "module": "./dist/js/treeshaking/index.js",
-  "jsnext:modern": "./dist/js/modern/index.js",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "jsnext:modern": "./dist/index.js",
   "exports": {
     ".": {
       "node": {
         "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
+        "import": "./dist/index.js",
+        "require": "./dist/index.js"
       },
-      "default": "./dist/js/treeshaking/index.js"
+      "default": "./dist/index.js"
     },
     "./bin": {
       "jsnext:source": "./src/cli.ts",
@@ -34,28 +34,19 @@
   "typesVersions": {
     "*": {
       "config": [
-        "./dist/types/config/index.d.ts"
+        "./dist/config/index.d.ts"
       ]
     }
   },
   "bin": "./bin/modern-js.js",
   "dependencies": {
-    "@babel/code-frame": "^7.14.5",
-    "@babel/runtime": "^7",
     "@modern-js/load-config": "^1.3.1",
     "@modern-js/plugin": "^1.3.3",
-    "@modern-js/utils": "^1.5.0",
-    "address": "^1.1.2",
-    "ajv": "^8.6.2",
-    "ajv-keywords": "^5.0.0",
-    "better-ajv-errors": "1.2.0",
-    "dotenv": "^10.0.0",
-    "dotenv-expand": "^5.1.0",
-    "v8-compile-cache": "^2.3.0"
+    "@modern-js/utils": "^1.6.0"
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@modern-js/types": "^1.5.0",
+    "@modern-js/types": "1.5.1",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/babel__code-frame": "^7.0.3",
@@ -76,19 +67,14 @@
     "webpack-chain": "^6.5.1"
   },
   "sideEffects": false,
-  "modernConfig": {
-    "output": {
-      "packageMode": "node-js"
-    }
-  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "scripts": {
     "new": "modern new",
-    "build": "modern build",
-    "dev": "modern build --watch",
+    "build": "tsc",
+    "dev": "tsc --watch",
     "test": "jest"
   },
   "readme": "\n<p align=\"center\">\n  <a href=\"https://modernjs.dev\" target=\"blank\"><img src=\"https://lf3-static.bytednsdoc.com/obj/eden-cn/ylaelkeh7nuhfnuhf/modernjs-cover.png\" width=\"300\" alt=\"Modern.js Logo\" /></a>\n</p>\n<p align=\"center\">\n现代 Web 工程体系\n  <br/>\n  <a href=\"https://modernjs.dev\" target=\"blank\">\n    modernjs.dev\n  </a>\n</p>\n<p align=\"center\">\n  The meta-framework suite designed from scratch for frontend-focused modern web development\n</p>\n\n# Introduction\n\n> The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.\n\n- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)\n\n## Getting Started\n\n- [Quick Start](https://modernjs.dev/docs/start)\n- [Guides](https://modernjs.dev/docs/guides)\n- [API References](https://modernjs.dev/docs/apis)\n\n## Contributing\n\n- [Contributing Guide](https://github.com/modern-js-dev/modern.js/blob/main/CONTRIBUTING.md)\n"

package/tsconfig.json

@@ -1,12 +1,11 @@
 {
   "extends": "@modern-js/tsconfig/base",
   "compilerOptions": {
-    "declaration": false,
-    "jsx": "preserve",
+    "declaration": true,
+    "outDir": "./dist",
     "baseUrl": "./",
     "isolatedModules": true,
-    "esModuleInterop": true,
-    "paths": {}
+    "esModuleInterop": true
   },
   "include": ["src"]
 }

package/dist/js/modern/cli.js

@@ -1,29 +0,0 @@
-// 这个文件跟 bin/modern-js.js 基本一样
-// 在开发阶段，因为 package.json 的 exports['./bin']['jsnext:source'] 配置
-// 了这个文件，所以需要保留, 后续如果找到更好的方式之后会移除这个文件
-import path from 'path';
-import { cli } from ".";
-
-const {
-  version
-} = require("../../package.json"); // XXX: 通过这个方式去掉了 package.json 里面对于 @modern-js/module-tools 的 devDependencies 依赖
-// 然后可以正常的执行 modern build
-
-
-const kModuleToolsCliPath = path.resolve(__dirname, '../../../solutions/module-tools/src/index.ts');
-process.env.MODERN_JS_VERSION = version;
-
-if (!process.env.NODE_ENV) {
-  process.env.NODE_ENV = // eslint-disable-next-line no-nested-ternary
-  ['build', 'start', 'deploy'].includes(process.argv[2]) ? 'production' : process.argv[2] === 'test' ? 'test' : 'development';
-}
-
-cli.run(process.argv.slice(2), {
-  plugins: {
-    '@modern-js/module-tools': {
-      cli: kModuleToolsCliPath,
-      // 是否需要强制加载这个组件，跳过 loadPlugins 里面 filter 的检测逻辑
-      forced: true
-    }
-  }
-});

package/dist/js/modern/config/defaults.js

@@ -1,103 +0,0 @@
-const sourceDefaults = {
-  entries: undefined,
-  disableDefaultEntries: false,
-  entriesDir: './src',
-  configDir: './config',
-  apiDir: './api',
-  envVars: [],
-  globalVars: undefined,
-  alias: undefined,
-  moduleScopes: undefined,
-  include: []
-};
-const outputDefaults = {
-  assetPrefix: '/',
-  htmlPath: 'html',
-  jsPath: 'static/js',
-  cssPath: 'static/css',
-  mediaPath: 'static/media',
-  path: 'dist',
-  title: '',
-  titleByEntries: undefined,
-  meta: {
-    charset: {
-      charset: 'utf-8'
-    },
-    viewport: 'width=device-width, initial-scale=1.0, shrink-to-fit=no, viewport-fit=cover, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no',
-    'http-equiv': {
-      'http-equiv': 'x-ua-compatible',
-      content: 'ie=edge'
-    },
-    renderer: 'webkit',
-    layoutmode: 'standard',
-    imagemode: 'force',
-    'wap-font-scale': 'no',
-    'format-detection': 'telephone=no'
-  },
-  metaByEntries: undefined,
-  inject: 'head',
-  injectByEntries: undefined,
-  mountId: 'root',
-  favicon: '',
-  faviconByEntries: undefined,
-  copy: undefined,
-  scriptExt: undefined,
-  disableHtmlFolder: false,
-  disableCssModuleExtension: false,
-  disableCssExtract: false,
-  enableCssModuleTSDeclaration: false,
-  disableMinimize: false,
-  enableInlineStyles: false,
-  enableInlineScripts: false,
-  disableSourceMap: false,
-  disableInlineRuntimeChunk: false,
-  disableAssetsCache: false,
-  enableLatestDecorators: false,
-  polyfill: 'entry',
-  dataUriLimit: 10000,
-  templateParameters: {},
-  templateParametersByEntries: undefined,
-  cssModuleLocalIdentName: '[name]__[local]--[hash:base64:5]',
-  enableModernMode: false,
-  federation: undefined,
-  disableNodePolyfill: false,
-  enableTsLoader: false
-};
-const serverDefaults = {
-  routes: undefined,
-  publicRoutes: undefined,
-  ssr: undefined,
-  ssrByEntries: undefined,
-  baseUrl: '/',
-  port: 8080
-};
-const devDefaults = {
-  assetPrefix: false,
-  https: false
-};
-const deployDefaults = {
-  domain: '',
-  domainByEntries: undefined
-};
-const toolsDefaults = {
-  webpack: undefined,
-  babel: undefined,
-  postcss: undefined,
-  autoprefixer: undefined,
-  lodash: undefined,
-  devServer: undefined,
-  tsLoader: undefined,
-  terser: undefined,
-  minifyCss: undefined
-};
-export const defaults = {
-  source: sourceDefaults,
-  output: outputDefaults,
-  server: serverDefaults,
-  dev: devDefaults,
-  deploy: deployDefaults,
-  tools: toolsDefaults,
-  plugins: [],
-  runtime: {},
-  runtimeByEntries: {}
-};

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

@@ -1,115 +0,0 @@
-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 { loadConfig } from '@modern-js/load-config';
-import Ajv from 'ajv';
-import ajvKeywords from 'ajv-keywords';
-import { signale as logger, createDebugger, getPort, isDev, PLUGIN_SCHEMAS, chalk, getServerConfig } from '@modern-js/utils';
-import { mergeWith } from '@modern-js/utils/lodash';
-import betterAjvErrors from 'better-ajv-errors';
-import { codeFrameColumns } from '@babel/code-frame';
-import { repeatKeyWarning } from "../utils/repeatKeyWarning";
-import { defaults } from "./defaults";
-import { mergeConfig } from "./mergeConfig";
-import { patchSchema } from "./schema";
-const debug = createDebugger('resolve-config');
-export { defaults as defaultsConfig };
-export { mergeConfig };
-export * from "./types";
-export const addServerConfigToDeps = async (dependencies, appDirectory, serverConfigFile) => {
-  const serverConfig = await getServerConfig(appDirectory, serverConfigFile);
-
-  if (serverConfig) {
-    dependencies.push(serverConfig);
-  }
-};
-export const defineConfig = config => config;
-export const loadUserConfig = async (appDirectory, filePath, packageJsonConfig) => {
-  const loaded = await loadConfig(appDirectory, filePath, packageJsonConfig);
-  const config = !loaded ? {} : await (typeof loaded.config === 'function' ? loaded.config(0) : loaded.config);
-  return {
-    config: mergeWith({}, config || {}, (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {}),
-    jsConfig: config || {},
-    pkgConfig: (loaded === null || loaded === void 0 ? void 0 : loaded.pkgConfig) || {},
-    filePath: loaded === null || loaded === void 0 ? void 0 : loaded.path,
-    dependencies: (loaded === null || loaded === void 0 ? void 0 : loaded.dependencies) || []
-  };
-};
-
-const showAdditionalPropertiesError = error => {
-  if (error.keyword === 'additionalProperties' && error.params.additionalProperty) {
-    const target = [error.instancePath.slice(1), error.params.additionalProperty].filter(Boolean).join('.');
-    const name = Object.keys(PLUGIN_SCHEMAS).find(key => PLUGIN_SCHEMAS[key].some(schemaItem => schemaItem.target === target));
-
-    if (name) {
-      logger.warn(`The configuration of ${chalk.bold(target)} is provided by plugin ${chalk.bold(name)}. Please use ${chalk.bold('yarn new')} to enable the corresponding capability.\n`);
-    }
-  }
-};
-
-export const resolveConfig = async (loaded, configs, schemas, restartWithExistingPort, argv, onSchemaError = showAdditionalPropertiesError) => {
-  var _validate$errors;
-
-  const {
-    config: userConfig,
-    jsConfig,
-    pkgConfig
-  } = loaded;
-  const ajv = new Ajv({
-    $data: true,
-    strict: false
-  });
-  ajvKeywords(ajv);
-  const validateSchema = patchSchema(schemas);
-  const validate = ajv.compile(validateSchema);
-  repeatKeyWarning(validateSchema, jsConfig, pkgConfig); // validate user config.
-
-  const valid = validate(userConfig);
-
-  if (!valid && (_validate$errors = validate.errors) !== null && _validate$errors !== void 0 && _validate$errors.length) {
-    var _validate$errors2;
-
-    onSchemaError(validate === null || validate === void 0 ? void 0 : validate.errors[0]);
-    const errors = betterAjvErrors(validateSchema, userConfig, (_validate$errors2 = validate.errors) === null || _validate$errors2 === void 0 ? void 0 : _validate$errors2.map(e => _objectSpread(_objectSpread({}, e), {}, {
-      dataPath: e.instancePath
-    })), {
-      format: 'js',
-      indent: 2
-    });
-    logger.log(codeFrameColumns(JSON.stringify(userConfig, null, 2), {
-      start: errors === null || errors === void 0 ? void 0 : errors[0].start,
-      end: errors === null || errors === void 0 ? void 0 : errors[0].end
-    }, {
-      highlightCode: true,
-      message: errors === null || errors === void 0 ? void 0 : errors[0].error
-    }));
-    throw new Error(`Validate configuration error`);
-  } // validate config from plugins.
-
-
-  for (const config of configs) {
-    if (!validate(config)) {
-      logger.error(validate.errors);
-      throw new Error(`Validate configuration error.`);
-    }
-  }
-
-  const resolved = mergeConfig([defaults, ...configs, userConfig]);
-  resolved._raw = loaded.config;
-
-  if (isDev() && argv[0] === 'dev') {
-    if (restartWithExistingPort > 0) {
-      // dev server is restarted, should use existing port number
-      resolved.server.port = restartWithExistingPort;
-    } else {
-      // get port for new dev server
-      resolved.server.port = await getPort(resolved.server.port);
-    }
-  }
-
-  debug('resolved %o', resolved);
-  return resolved;
-};

package/dist/js/modern/config/mergeConfig.js

@@ -1,22 +0,0 @@
-import { mergeWith } from '@modern-js/utils/lodash';
-import { isFunction } from '@modern-js/utils';
-
-/**
- * merge configuration from  modern.config.js and plugins.
- *
- * @param configs - Configuration from modern.config.ts or plugin's config hook.
- * @returns - normalized user config.
- */
-export const mergeConfig = configs => mergeWith({}, ...configs, (target, source) => {
-  if (Array.isArray(target)) {
-    if (Array.isArray(source)) {
-      return [...target, ...source];
-    } else {
-      return typeof source !== 'undefined' ? [...target, source] : target;
-    }
-  } else if (isFunction(source)) {
-    return typeof target !== 'undefined' ? [target, source] : [source];
-  }
-
-  return undefined;
-});

package/dist/js/modern/config/schema/deploy.js

@@ -1,17 +0,0 @@
-import { ENTRY_NAME_PATTERN } from '@modern-js/utils';
-export const deploy = {
-  type: 'object',
-  properties: {
-    domain: {
-      type: ['array', 'string']
-    },
-    domainByEntries: {
-      type: 'object',
-      patternProperties: {
-        [ENTRY_NAME_PATTERN]: {
-          type: ['array', 'string']
-        }
-      }
-    }
-  }
-};

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

@@ -1,107 +0,0 @@
-import { isObject, createDebugger } from '@modern-js/utils';
-import { cloneDeep } from '@modern-js/utils/lodash';
-import { source } from "./source";
-import { output } from "./output";
-import { server } from "./server";
-import { deploy } from "./deploy";
-import { tools } from "./tools";
-const debug = createDebugger('validate-schema');
-const plugins = {
-  type: 'array',
-  additionalProperties: false
-};
-const dev = {
-  type: 'object',
-  properties: {
-    assetPrefix: {
-      type: ['boolean', 'string']
-    },
-    https: {
-      type: 'boolean'
-    }
-  },
-  additionalProperties: false
-};
-export const patchSchema = pluginSchemas => {
-  const finalSchema = cloneDeep({
-    type: 'object',
-    additionalProperties: false,
-    properties: {
-      source,
-      output,
-      server,
-      deploy,
-      plugins,
-      dev,
-      tools
-    }
-  });
-
-  const findTargetNode = props => {
-    let node = finalSchema.properties;
-
-    for (const prop of props) {
-      node = node[prop];
-
-      if (!node || !isObject(node)) {
-        throw new Error(`add schema ${props.join('.')} error`);
-      }
-
-      node.properties = node.hasOwnProperty('properties') ? node.properties : {};
-      node = node.properties;
-    }
-
-    return node;
-  };
-
-  const finalPluginSchemas = [];
-  pluginSchemas.forEach(item => {
-    if (Array.isArray(item)) {
-      finalPluginSchemas.push(...item);
-    } else {
-      finalPluginSchemas.push(item);
-    }
-  });
-
-  for (const {
-    target,
-    schema
-  } of finalPluginSchemas) {
-    if (!target) {
-      throw new Error(`should return target property in plugin schema.`);
-    }
-
-    const props = target.split('.');
-    const mountProperty = props.pop();
-    const targetNode = findTargetNode(props);
-
-    if (targetNode.hasOwnProperty(mountProperty)) {
-      throw new Error(`${target} already exists in current validate schema`);
-    }
-
-    targetNode[mountProperty] = cloneDeep(schema);
-  }
-
-  debug(`final validate schema: %o`, finalSchema);
-  return finalSchema;
-};
-export const traverseSchema = schema => {
-  const keys = [];
-
-  const traverse = ({
-    properties
-  }, old = []) => {
-    for (const key of Object.keys(properties)) {
-      const current = [...old, key];
-
-      if (properties[key].type === 'object' && properties[key].properties) {
-        traverse(properties[key], current);
-      } else {
-        keys.push(current.join('.'));
-      }
-    }
-  };
-
-  traverse(schema);
-  return keys;
-};

package/dist/js/modern/config/schema/output.js

@@ -1,147 +0,0 @@
-import { ENTRY_NAME_PATTERN } from '@modern-js/utils';
-export const output = {
-  type: 'object',
-  additionalProperties: false,
-  properties: {
-    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'
-    }
-  }
-};