@modern-js/builder 2.25.1 → 2.26.0

package/CHANGELOG.md

@@ -1,5 +1,39 @@
 # @modern-js/builder
 
+## 2.26.0
+
+### Minor Changes
+
+- e26b05e: feat(builder): rename source field and add rule.resolve.mainFields and rule.resolve.conditionNames configuration
+  feat(builder): 重命名 source 字段,增加 rule.resolve.mainFields 和 rule.resolve.conditionName 配置
+- 786c195: feat(builder): New builder plug-in to support source code building
+  feat(builder): 新增支持源码构建的 builder 插件
+
+### Patch Changes
+
+- b36ece4: fix: rename source field name
+  fix: 重新命名源码字段
+- Updated dependencies [150ddb1]
+- Updated dependencies [786c195]
+- Updated dependencies [b36ece4]
+- Updated dependencies [15ad760]
+- Updated dependencies [786c195]
+  - @modern-js/builder-shared@2.26.0
+  - @modern-js/monorepo-utils@2.26.0
+  - @modern-js/utils@2.26.0
+
+## 2.25.2
+
+### Patch Changes
+
+- Updated dependencies [63d8247]
+- Updated dependencies [6651684]
+- Updated dependencies [15a8276]
+- Updated dependencies [272646c]
+- Updated dependencies [358ed24]
+  - @modern-js/utils@2.25.2
+  - @modern-js/builder-shared@2.25.2
+
 ## 2.25.1
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { createBuilder } from './createBuilder';
 export { mergeBuilderConfig } from '@modern-js/builder-shared';
+export { builderPluginSourceBuild } from './plugins/sourceBuild';
 export type { BuilderMode, BuilderEntry, BuilderTarget, BuilderPlugin, BuilderContext, BuilderInstance, CreateBuilderOptions, InspectConfigOptions, OnExitFn, OnAfterBuildFn, OnAfterCreateCompilerFn, OnAfterStartDevServerFn, OnBeforeBuildFn, OnBeforeStartDevServerFn, OnBeforeCreateCompilerFn, OnDevCompileDoneFn, ModifyBuilderConfigFn, } from '@modern-js/builder-shared';

package/dist/index.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeBuilderConfig = exports.createBuilder = void 0;
+exports.builderPluginSourceBuild = exports.mergeBuilderConfig = exports.createBuilder = void 0;
 var createBuilder_1 = require("./createBuilder");
 Object.defineProperty(exports, "createBuilder", { enumerable: true, get: function () { return createBuilder_1.createBuilder; } });
 var builder_shared_1 = require("@modern-js/builder-shared");
 Object.defineProperty(exports, "mergeBuilderConfig", { enumerable: true, get: function () { return builder_shared_1.mergeBuilderConfig; } });
+var sourceBuild_1 = require("./plugins/sourceBuild");
+Object.defineProperty(exports, "builderPluginSourceBuild", { enumerable: true, get: function () { return sourceBuild_1.builderPluginSourceBuild; } });

package/dist/plugins/index.js

@@ -52,4 +52,5 @@ exports.plugins = {
     wasm: () => Promise.resolve().then(() => __importStar(require('./wasm'))).then(m => m.builderPluginWasm()),
     moment: () => Promise.resolve().then(() => __importStar(require('./moment'))).then(m => m.builderPluginMoment()),
     externals: () => Promise.resolve().then(() => __importStar(require('./externals'))).then(m => m.builderPluginExternals()),
+    sourceBuild: () => Promise.resolve().then(() => __importStar(require('./sourceBuild'))).then(m => m.builderPluginSourceBuild({ sourceField: 'source' })),
 };

package/dist/plugins/sourceBuild.d.ts

@@ -0,0 +1,23 @@
+import type { BuilderPlugin } from '@modern-js/builder-shared';
+import type { BuilderPluginAPI as WebpackBuilderPluginAPI } from '@modern-js/builder-webpack-provider';
+import type { BuilderPluginAPI as RspackBuilderPluginAPI } from '@modern-js/builder-rspack-provider';
+import { type ExtraMonorepoStrategies } from '@modern-js/monorepo-utils';
+export declare const pluginName = "builder-plugin-source-build";
+export declare const getSourceInclude: (options: {
+    projectNameOrRootPath: string;
+    findMonorepoStartPath: string;
+    sourceField: string;
+    extraMonorepoStrategies?: ExtraMonorepoStrategies;
+}) => Promise<string[]>;
+export declare const sourceBuildInWebpack: (api: WebpackBuilderPluginAPI, options: {
+    sourceField: string;
+    projectRootPath: string;
+    projectName?: string;
+    extraMonorepoStrategies?: ExtraMonorepoStrategies;
+}) => void;
+export interface PluginSourceBuildOptions {
+    projectName?: string;
+    sourceField?: string;
+    extraMonorepoStrategies?: ExtraMonorepoStrategies;
+}
+export declare function builderPluginSourceBuild(options?: PluginSourceBuildOptions): BuilderPlugin<WebpackBuilderPluginAPI | RspackBuilderPluginAPI>;

package/dist/plugins/sourceBuild.js

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.builderPluginSourceBuild = exports.sourceBuildInWebpack = exports.getSourceInclude = exports.pluginName = void 0;
+const monorepo_utils_1 = require("@modern-js/monorepo-utils");
+exports.pluginName = 'builder-plugin-source-build';
+const getSourceInclude = async (options) => {
+    const { projectNameOrRootPath, sourceField, extraMonorepoStrategies, findMonorepoStartPath, } = options;
+    const projects = await (0, monorepo_utils_1.getDependentProjects)(projectNameOrRootPath, {
+        cwd: findMonorepoStartPath,
+        recursive: true,
+        filter: (0, monorepo_utils_1.filterByField)(sourceField),
+        extraMonorepoStrategies,
+    });
+    const includes = [];
+    for (const project of projects) {
+        includes.push(...project.getSourceEntryPaths({ field: sourceField }));
+    }
+    return includes;
+};
+exports.getSourceInclude = getSourceInclude;
+const sourceBuildInWebpack = (api, options) => {
+    const { sourceField, projectRootPath, projectName, extraMonorepoStrategies } = options;
+    api.modifyBuilderConfig(async (config) => {
+        var _a, _b, _c;
+        const { sourceBuild = true } = (_a = config.experiments) !== null && _a !== void 0 ? _a : {};
+        if (!sourceBuild) {
+            return;
+        }
+        const includes = await (0, exports.getSourceInclude)({
+            projectNameOrRootPath: projectName || projectRootPath,
+            sourceField,
+            findMonorepoStartPath: projectRootPath,
+            extraMonorepoStrategies,
+        });
+        config.source = (_b = config.source) !== null && _b !== void 0 ? _b : {};
+        config.source.include = [...((_c = config.source.include) !== null && _c !== void 0 ? _c : []), ...includes];
+    });
+    api.modifyBundlerChain(chain => {
+        const { experiments: { sourceBuild }, } = api.getNormalizedConfig();
+        if (!sourceBuild) {
+            return;
+        }
+        // Now not support chain.resolve.conditionNames API
+        // chain.resolve.conditionNames.prepend(sourcePkgField);
+        // when user not config source.resolveMainFields, mainFields is empty array
+        if (chain.resolve.mainFields.values().length === 0) {
+            // "..." is special syntax,it will retain the original value
+            chain.resolve.mainFields.prepend('...');
+            chain.resolve.mainFields.prepend(sourceField);
+        }
+    });
+    api.modifyWebpackConfig(async (config) => {
+        var _a, _b;
+        const { experiments: { sourceBuild }, } = api.getNormalizedConfig();
+        if (!sourceBuild) {
+            return;
+        }
+        config.resolve = (_a = config.resolve) !== null && _a !== void 0 ? _a : {};
+        config.resolve.conditionNames = [
+            '...',
+            sourceField,
+            ...((_b = config.resolve.conditionNames) !== null && _b !== void 0 ? _b : []),
+        ];
+    });
+};
+exports.sourceBuildInWebpack = sourceBuildInWebpack;
+function builderPluginSourceBuild(options) {
+    const { projectName, sourceField = 'source', extraMonorepoStrategies, } = options !== null && options !== void 0 ? options : {};
+    return {
+        name: exports.pluginName,
+        async setup(api) {
+            const projectRootPath = api.context.rootPath;
+            // TODO: when rspack support tsconfig paths functionality, this comment will remove
+            // if (api.context.bundlerType === 'rspack') {
+            //   (api as RspackBuilderPluginAPI).modifyRspackConfig(async config => {
+            //     // when support chain.resolve.conditionNames API, remove this logic
+            //     setConfig(config, 'resolve.conditionNames', [
+            //       '...', // Special syntax: retain the original value
+            //       sourceField,
+            //       ...(config.resolve?.conditionNames ?? []),
+            //     ]);
+            //   });
+            // }
+            if (api.context.bundlerType === 'webpack') {
+                api.modifyBuilderConfig(async (config) => {
+                    var _a, _b, _c;
+                    const { sourceBuild = true } = (_a = config.experiments) !== null && _a !== void 0 ? _a : {};
+                    if (!sourceBuild) {
+                        return;
+                    }
+                    const includes = await (0, exports.getSourceInclude)({
+                        projectNameOrRootPath: projectName || projectRootPath,
+                        sourceField,
+                        findMonorepoStartPath: projectRootPath,
+                        extraMonorepoStrategies,
+                    });
+                    config.source = (_b = config.source) !== null && _b !== void 0 ? _b : {};
+                    config.source.include = [
+                        ...((_c = config.source.include) !== null && _c !== void 0 ? _c : []),
+                        ...includes,
+                    ];
+                });
+                api.modifyBundlerChain((chain, { CHAIN_ID }) => {
+                    const { experiments: { sourceBuild }, } = api.getNormalizedConfig();
+                    if (!sourceBuild) {
+                        return;
+                    }
+                    // webpack.js.org/configuration/module/#ruleresolve
+                    chain.module
+                        .rule(CHAIN_ID.RULE.JS)
+                        .resolve.mainFields.merge(['...', sourceField]);
+                    // webpack chain not support resolve.conditionNames
+                    chain.module.rule(CHAIN_ID.RULE.JS).resolve.merge({
+                        conditionNames: ['...', sourceField],
+                    });
+                });
+            }
+        },
+    };
+}
+exports.builderPluginSourceBuild = builderPluginSourceBuild;

package/package.json

@@ -18,7 +18,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.25.1",
+  "version": "2.26.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -31,14 +31,17 @@
   },
   "dependencies": {
     "@svgr/webpack": "8.0.1",
-    "@modern-js/builder-shared": "2.25.1",
-    "@modern-js/utils": "2.25.1"
+    "@modern-js/builder-shared": "2.26.0",
+    "@modern-js/monorepo-utils": "2.26.0",
+    "@modern-js/utils": "2.26.0"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.0",
     "@types/node": "^14",
     "typescript": "^5",
-    "@scripts/vitest-config": "2.25.1"
+    "@modern-js/builder-webpack-provider": "2.26.0",
+    "@modern-js/builder-rspack-provider": "2.26.0",
+    "@scripts/vitest-config": "2.26.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",