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

package/dist/utils/style.js

@@ -0,0 +1,129 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+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());
+  });
+};
+var style_exports = {};
+__export(style_exports, {
+  getLessConfig: () => getLessConfig,
+  getPostcssConfig: () => getPostcssConfig,
+  getSassConfig: () => getSassConfig,
+  getStyleConfig: () => getStyleConfig
+});
+module.exports = __toCommonJS(style_exports);
+const getLessConfig = (config) => __async(void 0, null, function* () {
+  var _a;
+  const { applyOptionsChain } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+  const { getCompiledPath } = yield Promise.resolve().then(() => __toESM(require("./path")));
+  const mergedOptions = applyOptionsChain(
+    {
+      lessOptions: { javascriptEnabled: true },
+      implementation: yield getCompiledPath("less")
+    },
+    ((_a = config == null ? void 0 : config.style) == null ? void 0 : _a.less) || {}
+  );
+  return mergedOptions;
+});
+const getSassConfig = (config) => __async(void 0, null, function* () {
+  var _a;
+  const { applyOptionsChain } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+  const { getCompiledPath } = yield Promise.resolve().then(() => __toESM(require("./path")));
+  const mergedOptions = applyOptionsChain(
+    {
+      implementation: yield getCompiledPath("sass")
+    },
+    ((_a = config == null ? void 0 : config.style) == null ? void 0 : _a.sass) || {}
+  );
+  return mergedOptions;
+});
+const getPostcssConfig = (config) => __async(void 0, null, function* () {
+  var _a;
+  const { applyOptionsChain } = yield Promise.resolve().then(() => __toESM(require("@modern-js/utils")));
+  const { getCompiledPath } = yield Promise.resolve().then(() => __toESM(require("./path")));
+  const extraPlugins = [];
+  const utils = {
+    addPlugins(plugins) {
+      if (Array.isArray(plugins)) {
+        extraPlugins.push(...plugins);
+      } else {
+        extraPlugins.push(plugins);
+      }
+    }
+  };
+  const mergedConfig = applyOptionsChain(
+    {
+      plugins: [
+        require(yield getCompiledPath("postcss-flexbugs-fixes")),
+        require(yield getCompiledPath("postcss-custom-properties")),
+        require(yield getCompiledPath("postcss-initial")),
+        require(yield getCompiledPath("postcss-page-break")),
+        require(yield getCompiledPath("postcss-font-variant")),
+        require(yield getCompiledPath("postcss-media-minmax")),
+        require(yield getCompiledPath("postcss-nesting"))
+      ].filter(Boolean)
+    },
+    ((_a = config == null ? void 0 : config.style) == null ? void 0 : _a.postcss) || {},
+    utils
+  );
+  if (extraPlugins.length) {
+    mergedConfig.plugins.push(...extraPlugins);
+  }
+  return mergedConfig;
+});
+const getStyleConfig = (config) => __async(void 0, null, function* () {
+  const postcssConfig = yield getPostcssConfig(config);
+  const lessConfig = yield getLessConfig(config);
+  const sassConfig = yield getSassConfig(config);
+  return {
+    less: lessConfig,
+    sass: sassConfig,
+    postcss: postcssConfig
+  };
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  getLessConfig,
+  getPostcssConfig,
+  getSassConfig,
+  getStyleConfig
+});
+
+//# sourceMappingURL=style.js.map

package/dist/utils/style.js.map

@@ -0,0 +1 @@
+{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AASO,MAAM,gBAAgB,CAAO,WAAmC;AATvE;AAUE,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,QAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO;AAEzC,QAAM,gBAAgB;AAAA,IACpB;AAAA,MACE,aAAa,EAAE,mBAAmB,KAAK;AAAA,MACvC,gBAAgB,MAAM,gBAAgB,MAAM;AAAA,IAC9C;AAAA,MACA,sCAAQ,UAAR,mBAAe,SAAQ,CAAC;AAAA,EAC1B;AAEA,SAAO;AACT;AAEO,MAAM,gBAAgB,CAAO,WAAmC;AAxBvE;AAyBE,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,QAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO;AAEzC,QAAM,gBAAgB;AAAA,IACpB;AAAA,MACE,gBAAgB,MAAM,gBAAgB,MAAM;AAAA,IAC9C;AAAA,MACA,sCAAQ,UAAR,mBAAe,SAAQ,CAAC;AAAA,EAC1B;AAEA,SAAO;AACT;AAEO,MAAM,mBAAmB,CAAO,WAAmC;AAtC1E;AAuCE,QAAM,EAAE,kBAAkB,IAAI,MAAM,6CAAO;AAC3C,QAAM,EAAE,gBAAgB,IAAI,MAAM,6CAAO;AACzC,QAAM,eAAiC,CAAC;AAExC,QAAM,QAAQ;AAAA,IACZ,WAAW,SAA4C;AACrD,UAAI,MAAM,QAAQ,OAAO,GAAG;AAC1B,qBAAa,KAAK,GAAG,OAAO;AAAA,MAC9B,OAAO;AACL,qBAAa,KAAK,OAAO;AAAA,MAC3B;AAAA,IACF;AAAA,EACF;AAEA,QAAM,eAAe;AAAA,IAInB;AAAA,MAGE,SAAS;AAAA,QACP,QAAQ,MAAM,gBAAgB,wBAAwB,CAAC;AAAA,QACvD,QAAQ,MAAM,gBAAgB,2BAA2B,CAAC;AAAA,QAC1D,QAAQ,MAAM,gBAAgB,iBAAiB,CAAC;AAAA,QAChD,QAAQ,MAAM,gBAAgB,oBAAoB,CAAC;AAAA,QACnD,QAAQ,MAAM,gBAAgB,sBAAsB,CAAC;AAAA,QACrD,QAAQ,MAAM,gBAAgB,sBAAsB,CAAC;AAAA,QACrD,QAAQ,MAAM,gBAAgB,iBAAiB,CAAC;AAAA,MAClD,EAAE,OAAO,OAAO;AAAA,IAClB;AAAA,MACA,sCAAQ,UAAR,mBAAe,YAAW,CAAC;AAAA,IAC3B;AAAA,EACF;AACA,MAAI,aAAa,QAAQ;AACvB,iBAAa,QAAS,KAAK,GAAG,YAAY;AAAA,EAC5C;AAEA,SAAO;AACT;AAEO,MAAM,iBAAiB,CAAO,WAAmC;AACtE,QAAM,gBAAgB,MAAM,iBAAiB,MAAM;AACnD,QAAM,aAAa,MAAM,cAAc,MAAM;AAC7C,QAAM,aAAa,MAAM,cAAc,MAAM;AAC7C,SAAO;AAAA,IACL,MAAM;AAAA,IACN,MAAM;AAAA,IACN,SAAS;AAAA,EACX;AACF;;;;;;;;","names":[],"sources":["../../src/utils/style.ts"],"sourcesContent":["import type { AcceptedPlugin } from 'postcss';\nimport type { PostcssOptions } from '@modern-js/libuild';\nimport type {\n  PartialBaseBuildConfig,\n  PostCSSConfigUtils,\n  LessOptions,\n  SassOptions,\n} from '../types';\n\nexport const getLessConfig = async (config: PartialBaseBuildConfig) => {\n  const { applyOptionsChain } = await import('@modern-js/utils');\n  const { getCompiledPath } = await import('./path');\n\n  const mergedOptions = applyOptionsChain<LessOptions, never>(\n    {\n      lessOptions: { javascriptEnabled: true },\n      implementation: await getCompiledPath('less'),\n    },\n    config?.style?.less || {},\n  );\n\n  return mergedOptions;\n};\n\nexport const getSassConfig = async (config: PartialBaseBuildConfig) => {\n  const { applyOptionsChain } = await import('@modern-js/utils');\n  const { getCompiledPath } = await import('./path');\n\n  const mergedOptions = applyOptionsChain<SassOptions, never>(\n    {\n      implementation: await getCompiledPath('sass'),\n    },\n    config?.style?.sass || {},\n  );\n\n  return mergedOptions;\n};\n\nexport const getPostcssConfig = async (config: PartialBaseBuildConfig) => {\n  const { applyOptionsChain } = await import('@modern-js/utils');\n  const { getCompiledPath } = await import('./path');\n  const extraPlugins: AcceptedPlugin[] = [];\n\n  const utils = {\n    addPlugins(plugins: AcceptedPlugin | AcceptedPlugin[]) {\n      if (Array.isArray(plugins)) {\n        extraPlugins.push(...plugins);\n      } else {\n        extraPlugins.push(plugins);\n      }\n    },\n  };\n\n  const mergedConfig = applyOptionsChain<\n    PostcssOptions & { $$tools?: string },\n    PostCSSConfigUtils\n  >(\n    {\n      // TODO: when schema support redefine\n      // $$tools: 'module-tools',\n      plugins: [\n        require(await getCompiledPath('postcss-flexbugs-fixes')),\n        require(await getCompiledPath('postcss-custom-properties')),\n        require(await getCompiledPath('postcss-initial')),\n        require(await getCompiledPath('postcss-page-break')),\n        require(await getCompiledPath('postcss-font-variant')),\n        require(await getCompiledPath('postcss-media-minmax')),\n        require(await getCompiledPath('postcss-nesting')),\n      ].filter(Boolean),\n    },\n    config?.style?.postcss || {},\n    utils,\n  );\n  if (extraPlugins.length) {\n    mergedConfig.plugins!.push(...extraPlugins);\n  }\n\n  return mergedConfig;\n};\n\nexport const getStyleConfig = async (config: PartialBaseBuildConfig) => {\n  const postcssConfig = await getPostcssConfig(config);\n  const lessConfig = await getLessConfig(config);\n  const sassConfig = await getSassConfig(config);\n  return {\n    less: lessConfig,\n    sass: sassConfig,\n    postcss: postcssConfig,\n  };\n};\n"]}

package/dist/utils/tspaths-transform.js

@@ -0,0 +1,119 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var tspaths_transform_exports = {};
+__export(tspaths_transform_exports, {
+  transformDtsAlias: () => transformDtsAlias
+});
+module.exports = __toCommonJS(tspaths_transform_exports);
+var path = __toESM(require("path"));
+var import_tsconfig_paths = require("@modern-js/utils/tsconfig-paths");
+var import_utils = require("@modern-js/utils");
+var parser = __toESM(require("../../compiled/@babel/parser"));
+var import_generator = __toESM(require("../../compiled/@babel/generator"));
+var t = __toESM(require("../../compiled/@babel/types"));
+var import_traverse = __toESM(require("../../compiled/@babel/traverse"));
+var import_file = require("../constants/file");
+function mapPathString(nodePath, { filename, baseUrl, paths }) {
+  if (!t.isStringLiteral(nodePath)) {
+    return;
+  }
+  const sourcePath = nodePath.node.value;
+  const currentFile = filename;
+  const matchPath = (0, import_tsconfig_paths.createMatchPath)(
+    baseUrl,
+    paths,
+    ["index"]
+  );
+  const result = matchPath(
+    sourcePath,
+    (packageJsonPath) => {
+      if (!import_utils.fs.existsSync(packageJsonPath)) {
+        return void 0;
+      }
+      return import_utils.fs.readJSONSync(packageJsonPath);
+    },
+    (filePath) => import_utils.fs.existsSync(filePath),
+    import_file.dtsAliasExts
+  );
+  if (result) {
+    const relativePath = path.relative(
+      path.dirname(currentFile),
+      path.dirname(result)
+    );
+    const fileName = path.basename(result);
+    const filePath = path.normalize(
+      `${relativePath.length === 0 ? "." : relativePath}/${fileName}`
+    );
+    const replaceString = filePath.startsWith(".") ? filePath : `./${filePath}`;
+    nodePath.replaceWith(t.stringLiteral(replaceString));
+  }
+}
+const transformImport = (option) => (nodePath) => {
+  mapPathString(nodePath.get("source"), option);
+};
+const transformExport = (option) => (nodePath) => {
+  mapPathString(nodePath.get("source"), option);
+};
+const transformSingleFileAlias = ({
+  filename,
+  baseUrl,
+  paths
+}) => {
+  const sourceCode = import_utils.fs.readFileSync(filename, "utf-8");
+  const ast = parser.parse(sourceCode, {
+    sourceType: "module",
+    errorRecovery: true,
+    plugins: ["typescript"]
+  });
+  (0, import_traverse.default)(ast, {
+    ImportDeclaration: transformImport({
+      filename,
+      baseUrl,
+      paths
+    }),
+    ExportDeclaration: transformExport({
+      filename,
+      baseUrl,
+      paths
+    })
+  });
+  return (0, import_generator.default)(ast).code;
+};
+const transformDtsAlias = (option) => {
+  const { filenames = [], baseUrl, paths } = option;
+  const transformResult = [];
+  for (const filename of filenames) {
+    transformResult.push({
+      path: filename,
+      content: transformSingleFileAlias({ filename, baseUrl, paths })
+    });
+  }
+  return transformResult;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  transformDtsAlias
+});
+
+//# sourceMappingURL=tspaths-transform.js.map

package/dist/utils/tspaths-transform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":null,"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,WAAsB;AACtB,4BAAgC;AAChC,mBAAmB;AACnB,aAAwB;AACxB,uBAAsB;AACtB,QAAmB;AACnB,sBAAmC;AACnC,kBAA6B;AAU7B,SAAS,cACP,UACA,EAAE,UAAU,SAAS,MAAM,GAC3B;AACA,MAAI,CAAC,EAAE,gBAAgB,QAAQ,GAAG;AAChC;AAAA,EACF;AAEA,QAAM,aAAa,SAAS,KAAK;AACjC,QAAM,cAAc;AACpB,QAAM,gBAAY;AAAA,IAChB;AAAA,IACA;AAAA,IACA,CAAC,OAAO;AAAA,EACV;AACA,QAAM,SAAS;AAAA,IACb;AAAA,IACA,qBAAmB;AACjB,UAAI,CAAC,gBAAG,WAAW,eAAe,GAAG;AACnC,eAAO;AAAA,MACT;AACA,aAAO,gBAAG,aAAa,eAAe;AAAA,IACxC;AAAA,IACA,cAAY,gBAAG,WAAW,QAAQ;AAAA,IAClC;AAAA,EACF;AACA,MAAI,QAAQ;AACV,UAAM,eAAe,KAAK;AAAA,MACxB,KAAK,QAAQ,WAAW;AAAA,MACxB,KAAK,QAAQ,MAAM;AAAA,IACrB;AACA,UAAM,WAAW,KAAK,SAAS,MAAM;AAErC,UAAM,WAAW,KAAK;AAAA,MACpB,GAAG,aAAa,WAAW,IAAI,MAAM,gBAAgB;AAAA,IACvD;AACA,UAAM,gBAAgB,SAAS,WAAW,GAAG,IAAI,WAAW,KAAK;AACjE,aAAS,YAAY,EAAE,cAAc,aAAa,CAAC;AAAA,EACrD;AACF;AAgBA,MAAM,kBACJ,CAAC,WAA4B,CAAC,aAA4C;AACxE,gBAAc,SAAS,IAAI,QAAQ,GAAG,MAAM;AAC9C;AAEF,MAAM,kBACJ,CAAC,WAA4B,CAAC,aAA4C;AACxE,gBAAc,SAAS,IAAI,QAAQ,GAAgC,MAAM;AAC3E;AAEF,MAAM,2BAA2B,CAAC;AAAA,EAChC;AAAA,EACA;AAAA,EACA;AACF,MAAuB;AACrB,QAAM,aAAa,gBAAG,aAAa,UAAU,OAAO;AACpD,QAAM,MAAM,OAAO,MAAM,YAAY;AAAA,IACnC,YAAY;AAAA,IACZ,eAAe;AAAA,IACf,SAAS,CAAC,YAAY;AAAA,EACxB,CAAC;AACD,+BAAS,KAAK;AAAA,IAGZ,mBAAmB,gBAAgB;AAAA,MACjC;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,IACD,mBAAmB,gBAAgB;AAAA,MACjC;AAAA,MACA;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH,CAAC;AACD,aAAO,0BAAU,GAAG,EAAE;AACxB;AAOO,MAAM,oBAAoB,CAAC,WAAoC;AACpE,QAAM,EAAE,YAAY,CAAC,GAAG,SAAS,MAAM,IAAI;AAC3C,QAAM,kBAAuD,CAAC;AAC9D,aAAW,YAAY,WAAW;AAChC,oBAAgB,KAAK;AAAA,MACnB,MAAM;AAAA,MACN,SAAS,yBAAyB,EAAE,UAAU,SAAS,MAAM,CAAC;AAAA,IAChE,CAAC;AAAA,EACH;AACA,SAAO;AACT;;;;;","names":[],"sources":["../../src/utils/tspaths-transform.ts"],"sourcesContent":["import * as path from 'path';\nimport { createMatchPath } from '@modern-js/utils/tsconfig-paths';\nimport { fs } from '@modern-js/utils';\nimport * as parser from '../../compiled/@babel/parser';\nimport generator from '../../compiled/@babel/generator';\nimport * as t from '../../compiled/@babel/types';\nimport traverse, { NodePath } from '../../compiled/@babel/traverse';\nimport { dtsAliasExts } from '../constants/file';\n// import { defaultTransformedFunctions } from '../constants/dts';\n// import { matchesPattern, isImportCall } from './dts';\n\nexport interface TransformOption {\n  filename: string;\n  baseUrl: string;\n  paths: Record<string, string[] | string>;\n}\n\nfunction mapPathString(\n  nodePath: NodePath<t.StringLiteral>,\n  { filename, baseUrl, paths }: TransformOption,\n) {\n  if (!t.isStringLiteral(nodePath)) {\n    return;\n  }\n\n  const sourcePath = nodePath.node.value;\n  const currentFile = filename;\n  const matchPath = createMatchPath(\n    baseUrl,\n    paths as { [key: string]: Array<string> },\n    ['index'],\n  );\n  const result = matchPath(\n    sourcePath,\n    packageJsonPath => {\n      if (!fs.existsSync(packageJsonPath)) {\n        return undefined;\n      }\n      return fs.readJSONSync(packageJsonPath);\n    },\n    filePath => fs.existsSync(filePath),\n    dtsAliasExts,\n  );\n  if (result) {\n    const relativePath = path.relative(\n      path.dirname(currentFile),\n      path.dirname(result),\n    );\n    const fileName = path.basename(result);\n    // 如果是同级文件，则返回的是 ''\n    const filePath = path.normalize(\n      `${relativePath.length === 0 ? '.' : relativePath}/${fileName}`,\n    );\n    const replaceString = filePath.startsWith('.') ? filePath : `./${filePath}`;\n    nodePath.replaceWith(t.stringLiteral(replaceString));\n  }\n}\n\n// const transformCall =\n//   (option: TransformOption) => (nodePath: NodePath<t.CallExpression>) => {\n//     const calleePath = nodePath.get('callee') as NodePath;\n//     const isNormalCall = defaultTransformedFunctions.some(pattern =>\n//       matchesPattern(calleePath, pattern),\n//     );\n//     if (isNormalCall || isImportCall(nodePath)) {\n//       mapPathString(\n//         nodePath.get('arguments.0') as NodePath<t.StringLiteral>,\n//         option,\n//       );\n//     }\n//   };\n\nconst transformImport =\n  (option: TransformOption) => (nodePath: NodePath<t.ImportDeclaration>) => {\n    mapPathString(nodePath.get('source'), option);\n  };\n\nconst transformExport =\n  (option: TransformOption) => (nodePath: NodePath<t.ExportDeclaration>) => {\n    mapPathString(nodePath.get('source') as NodePath<t.StringLiteral>, option);\n  };\n\nconst transformSingleFileAlias = ({\n  filename,\n  baseUrl,\n  paths,\n}: TransformOption) => {\n  const sourceCode = fs.readFileSync(filename, 'utf-8');\n  const ast = parser.parse(sourceCode, {\n    sourceType: 'module',\n    errorRecovery: true, // 防止typescript不支持的语法出现而报错\n    plugins: ['typescript'],\n  });\n  traverse(ast, {\n    // d.ts file content not have callExpression which can be parsed;\n    // CallExpression: transformCall({ filename, baseUrl, paths }) as any,\n    ImportDeclaration: transformImport({\n      filename,\n      baseUrl,\n      paths,\n    }) as any,\n    ExportDeclaration: transformExport({\n      filename,\n      baseUrl,\n      paths,\n    }) as any,\n  });\n  return generator(ast).code;\n};\n\ninterface TransformDtsAliasOption {\n  filenames?: string[];\n  baseUrl: string;\n  paths: Record<string, string[] | string>;\n}\nexport const transformDtsAlias = (option: TransformDtsAliasOption) => {\n  const { filenames = [], baseUrl, paths } = option;\n  const transformResult: { path: string; content: string }[] = [];\n  for (const filename of filenames) {\n    transformResult.push({\n      path: filename,\n      content: transformSingleFileAlias({ filename, baseUrl, paths }),\n    });\n  }\n  return transformResult;\n};\n"]}

package/package.json

@@ -6,38 +6,21 @@
   "repository": "modern-js-dev/modern.js",
   "license": "MIT",
   "keywords": [
-    "react",
-    "framework",
     "modern",
-    "modern.js"
+    "modern.js",
+    "module-tools",
+    "lib-tools"
   ],
-  "version": "2.0.0-beta.3",
+  "version": "2.0.0-beta.6",
   "bin": {
     "modern": "./bin/modern.js",
     "modern-module": "./bin/modern.js"
   },
-  "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",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/index.js",
   "exports": {
-    ".": {
-      "node": {
-        "jsnext:source": "./src/index.ts",
-        "import": "./dist/js/modern/index.js",
-        "require": "./dist/js/node/index.js"
-      },
-      "default": "./dist/js/treeshaking/index.js"
-    },
-    "./cli": {
-      "jsnext:source": "./src/index.ts",
-      "default": "./dist/js/node/index.js"
-    },
-    "./build": {
-      "jsnext:source": "./src/build.ts",
-      "default": "./dist/js/node/build.js"
-    }
+    ".": "./dist/index.js",
+    "./defineConfig": "./dist/config/defineConfig.js"
   },
   "typesVersions": {
     "*": {
@@ -46,69 +29,57 @@
       ],
       "type": [
         "./lib/types.d.ts"
+      ],
+      "defineConfig": [
+        "./dist/config/defineConfig.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@babel/generator": "^7.18.0",
-    "@babel/parser": "^7.18.0",
-    "@babel/runtime": "^7.18.0",
-    "@babel/traverse": "^7.18.0",
-    "@babel/types": "^7.18.0",
-    "@modern-js/css-config": "1.21.1",
-    "@rollup/plugin-json": "~4.1.0",
-    "@speedy-js/speedy-types": "0.13.2-modern.4",
-    "@speedy-js/speedy-core": "0.13.2-modern.4",
-    "@speedy-js/speedy-plugin-es5": "0.13.2-modern.4",
-    "normalize-path": "^3.0.0",
-    "p-map": "^4",
-    "process.argv": "^0.6.0",
-    "rollup": "^2.70.2",
-    "rollup-plugin-dts": "^4.2.1",
-    "rollup-plugin-hashbang": "^3.0.0",
-    "signal-exit": "^3.0.7",
-    "@modern-js/babel-compiler": "2.0.0-beta.3",
-    "@modern-js/babel-preset-module": "2.0.0-beta.3",
-    "@modern-js/core": "2.0.0-beta.3",
-    "@modern-js/new-action": "2.0.0-beta.3",
-    "@modern-js/upgrade": "2.0.0-beta.3",
-    "@modern-js/plugin": "2.0.0-beta.3",
-    "@modern-js/plugin-changeset": "2.0.0-beta.3",
-    "@modern-js/plugin-i18n": "2.0.0-beta.3",
-    "@modern-js/plugin-lint": "2.0.0-beta.3",
-    "@modern-js/style-compiler": "2.0.0-beta.3",
-    "@modern-js/utils": "2.0.0-beta.3"
+    "@modern-js/libuild": "~0.7.3",
+    "@modern-js/libuild-plugin-svgr": "0.6.0",
+    "@modern-js/libuild-plugin-swc": "0.6.0",
+    "@modern-js/core": "2.0.0-beta.6",
+    "@modern-js/new-action": "2.0.0-beta.6",
+    "@modern-js/plugin": "2.0.0-beta.6",
+    "@modern-js/plugin-i18n": "2.0.0-beta.6",
+    "@modern-js/upgrade": "2.0.0-beta.6",
+    "@modern-js/utils": "2.0.0-beta.6",
+    "@modern-js/plugin-changeset": "2.0.0-beta.6",
+    "@modern-js/plugin-lint": "2.0.0-beta.6"
   },
   "devDependencies": {
-    "@types/babel__core": "^7.1.15",
-    "@types/babel__generator": "^7.6.3",
-    "@types/babel__traverse": "^7.14.2",
-    "@types/glob": "^7.1.4",
+    "@modern-js/self": "npm:@modern-js/module-tools@*",
     "@types/jest": "^27",
     "@types/node": "^14",
-    "@types/normalize-path": "^3.0.0",
-    "@types/signal-exit": "^3.0.1",
+    "@types/fs-extra": "9.0.13",
+    "fs-extra": "10.1.0",
     "jest": "^27",
+    "path-browserify": "1.0.1",
+    "postcss": "8.4.6",
+    "postcss-alias": "2.0.0",
+    "react": "17",
     "typescript": "^4",
-    "ajv": "^8",
-    "ajv-keywords": "^5",
-    "@scripts/build": "2.0.0-beta.3",
-    "@scripts/jest-config": "2.0.0-beta.3"
-  },
-  "sideEffects": false,
-  "modernConfig": {
-    "output": {
-      "packageMode": "node-js"
-    }
+    "@scripts/jest-config": "2.0.0-beta.6",
+    "@scripts/build": "2.0.0-beta.6"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
+  },
+  "peerDependencies": {
+    "typescript": "^4"
+  },
   "scripts": {
-    "new": "modern-lib new",
     "build": "modern-lib build",
-    "test": "jest --passWithNoTests",
-    "dev": "modern-lib build --watch"
+    "dev": "modern-lib build --watch",
+    "test": "jest",
+    "test:update": "jest --updateSnapshot",
+    "new": "modern-lib new"
   }
 }

package/dist/js/modern/cli/build.js

@@ -1,11 +0,0 @@
-import { Import } from '@modern-js/utils';
-const local = Import.lazy('../locale/index', require);
-const command = Import.lazy('../commands/build', require);
-export const buildCli = (program, api) => {
-  return program.command('build').usage('[options]').description(local.i18n.t(local.localeKeys.command.build.describe)).option('-w, --watch', local.i18n.t(local.localeKeys.command.build.watch)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').option('--style-only', local.i18n.t(local.localeKeys.command.build.style_only)).option('-p, --platform [platform]', local.i18n.t(local.localeKeys.command.build.platform))
-  // @deprecated
-  // The `--no-tsc` option has been superceded by the `--no-dts` option.
-  .option('--no-tsc', local.i18n.t(local.localeKeys.command.build.no_tsc)).option('--dts', local.i18n.t(local.localeKeys.command.build.dts)).option('--no-clear', local.i18n.t(local.localeKeys.command.build.no_clear)).option('-c --config <config>', local.i18n.t(local.localeKeys.command.build.config)).action(async subCommand => {
-    await command.build(api, subCommand);
-  });
-};

package/dist/js/modern/cli/dev.js

@@ -1,11 +0,0 @@
-import { Import } from '@modern-js/utils';
-const local = Import.lazy('../locale', require);
-const commands = Import.lazy('../commands', require);
-export const devCli = (program, api) => {
-  program.command('dev [subCmd]').usage('[options]').description(local.i18n.t(local.localeKeys.command.dev.describe)).option('--tsconfig [tsconfig]', local.i18n.t(local.localeKeys.command.build.tsconfig), './tsconfig.json').action(async (subCmd, params) => {
-    await commands.dev(api, params, subCmd);
-    // support plugin-proxy
-    const runner = api.useHookRunners();
-    await runner.afterDev();
-  });
-};

package/dist/js/modern/cli/index.js

@@ -1,3 +0,0 @@
-export * from "./build";
-export * from "./dev";
-export * from "./new";

package/dist/js/modern/cli/new.js

@@ -1,13 +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 { Import } from '@modern-js/utils';
-const newAction = Import.lazy('@modern-js/new-action', require);
-const local = Import.lazy('../locale', require);
-export const newCli = (program, locale) => {
-  program.command('new').usage('[options]').description(local.i18n.t(local.localeKeys.command.new.describe)).option('-d, --debug', local.i18n.t(local.localeKeys.command.new.debug), false).option('-c, --config <config>', local.i18n.t(local.localeKeys.command.new.config)).option('--dist-tag <tag>', local.i18n.t(local.localeKeys.command.new.distTag)).option('--registry', local.i18n.t(local.localeKeys.command.new.registry)).action(async options => {
-    await newAction.ModuleNewAction(_objectSpread(_objectSpread({}, options), {}, {
-      locale
-    }));
-  });
-};

package/dist/js/modern/commands/build.js

@@ -1,69 +0,0 @@
-import * as path from 'path';
-import { fs, Import, dotenv, globby, slash } from '@modern-js/utils';
-import onExit from 'signal-exit';
-const tsConfigutils = Import.lazy('../utils/tsconfig', require);
-const valid = Import.lazy('../utils/valide', require);
-const buildFeature = Import.lazy('../features/build', require);
-/**
- * init work before build task.
- * @param api
- */
-export const init = api => {
-  const {
-    appDirectory
-  } = api.useAppContext();
-  dotenv.config();
-  onExit(async code => {
-    if (code === 0) {
-      return;
-    }
-    const tempTsconfigPathPattern = path.join(appDirectory, './node_modules', `./tsconfig.**.**.json`);
-    const files = globby(slash(tempTsconfigPathPattern), {
-      stats: true,
-      absolute: true
-    });
-    const currentTime = Date.now();
-    for (const file of files) {
-      // over 30s, will delete it
-      if (currentTime - file.stats.birthtimeMs >= 30 * 1000) {
-        fs.unlinkSync(file.path);
-      }
-    }
-  });
-};
-export const build = async (api, buildCommandOption) => {
-  var _modernConfig$output$, _modernConfig$output;
-  const {
-    watch = false,
-    tsconfig: tsconfigName,
-    tsc,
-    dts = false,
-    clear,
-    platform = false,
-    styleOnly = false
-  } = buildCommandOption;
-  init(api);
-  const {
-    appDirectory
-  } = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const tsconfigPath = path.join(appDirectory, tsconfigName);
-  const outputPath = (_modernConfig$output$ = modernConfig === null || modernConfig === void 0 ? void 0 : (_modernConfig$output = modernConfig.output) === null || _modernConfig$output === void 0 ? void 0 : _modernConfig$output.path) !== null && _modernConfig$output$ !== void 0 ? _modernConfig$output$ : 'dist';
-  const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
-  const enableDtsGen = isTsProject && dts;
-  valid.valideBeforeTask({
-    modernConfig,
-    tsconfigPath
-  });
-  await buildFeature.build(api, {
-    enableWatchMode: watch,
-    enableDtsGen,
-    isTsProject,
-    tsconfigName,
-    outputPath,
-    styleOnly,
-    platform,
-    clear,
-    legacyTsc: tsc
-  });
-};

package/dist/js/modern/commands/dev.js

@@ -1,43 +0,0 @@
-import * as path from 'path';
-import { dotenv, Import } from '@modern-js/utils';
-const devFeature = Import.lazy('../features/dev', require);
-const tsConfigutils = Import.lazy('../utils/tsconfig', require);
-const valid = Import.lazy('../utils/valide', require);
-const existSubCmd = subCmd => subCmd.length > 0;
-export const dev = async (api, option, subCmd = '') => {
-  const {
-    tsconfig: tsconfigName
-  } = option;
-  const appContext = api.useAppContext();
-  const modernConfig = api.useResolvedConfigContext();
-  const {
-    appDirectory
-  } = appContext;
-  const tsconfigPath = path.join(appDirectory, tsconfigName);
-  dotenv.config();
-  valid.valideBeforeTask({
-    modernConfig,
-    tsconfigPath
-  });
-  const isTsProject = tsConfigutils.existTsConfigFile(tsconfigPath);
-  if (existSubCmd(subCmd)) {
-    await devFeature.runSubCmd(api, subCmd, {
-      isTsProject,
-      appDirectory
-    });
-    return;
-  }
-
-  // Compatible with the use of jupiter, RUN_PLATFORM is used in jupiter
-  if (process.env.RUN_PLATFORM) {
-    await devFeature.showMenu(api, {
-      isTsProject,
-      appDirectory
-    });
-  } else {
-    await devFeature.devStorybook(api, {
-      isTsProject,
-      appDirectory
-    });
-  }
-};

package/dist/js/modern/commands/index.js

@@ -1,2 +0,0 @@
-export { dev } from "./dev";
-export { build } from "./build";

package/dist/js/modern/features/build/build-platform.js

@@ -1,69 +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 { execa, Import, chalk } from '@modern-js/utils';
-const lg = Import.lazy('./logger', require);
-const pMap = Import.lazy('p-map', require);
-export const buildPlatform = async (api, option) => {
-  const {
-    isTsProject = false,
-    platform
-  } = option;
-  const lm = new lg.LoggerManager();
-  // 获取platforms的参数
-  const runners = api.useHookRunners();
-  const buildTasks = await runners.platformBuild({
-    isTsProject
-  });
-  if (buildTasks.length <= 0) {
-    console.info(chalk.yellow('No build tasks detected.\nYou can use the `new` command to enable the more features'));
-    return;
-  }
-  const loggerMap = {};
-  const taskMapper = buildTasks.filter(task => platform === 'all' || task.name === platform).map(params => {
-    const logger = lm.createLoggerText({
-      title: params.title
-    });
-    loggerMap[params.name] = logger;
-    return _objectSpread({
-      logger
-    }, params);
-  });
-  if (taskMapper.length <= 0) {
-    console.info(chalk.yellow(`'${platform}' is undefined task`));
-    return;
-  }
-  lm.showCompiling();
-  await pMap(taskMapper, async ({
-    taskPath,
-    params,
-    logger: _
-  }) => {
-    const childProcess = execa.node(taskPath, params, {
-      stdio: 'inherit',
-      all: true
-    });
-
-    // lm.addStdout(logger, childProcess.stdout, {
-    //   event: { data: true, error: true },
-    // });
-
-    // lm.addStderr(logger, childProcess.stderr);
-    try {
-      await childProcess;
-    } catch (_unused) {
-      // eslint-disable-next-line no-process-exit
-      process.exit(1);
-    }
-    // lm.disappearCompiling();
-    // console.info(lg.colors.title(title));
-    // console.info(a.all);
-  }, {
-    concurrency: 1
-  });
-
-  // lm.disappearCompiling();
-  // for (const key of Object.keys(loggerMap)) {
-  //   console.info(loggerMap[key].value);
-  // }
-};