@modern-js/builder 2.0.0-beta.6 → 2.0.0

package/dist/plugins/cache.d.ts

@@ -0,0 +1,2 @@
+import { DefaultBuilderPlugin } from '@modern-js/builder-shared';
+export declare const PluginCache: () => DefaultBuilderPlugin;

package/dist/plugins/cache.js

@@ -0,0 +1,96 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PluginCache = void 0;
+const path_1 = require("path");
+const builder_shared_1 = require("@modern-js/builder-shared");
+async function validateCache(cacheDirectory, buildDependencies) {
+    const { fs } = await Promise.resolve().then(() => __importStar(require('@modern-js/utils')));
+    const configFile = (0, path_1.join)(cacheDirectory, 'buildDependencies.json');
+    if (await (0, builder_shared_1.isFileExists)(configFile)) {
+        const prevBuildDependencies = await fs.readJSON(configFile);
+        if (JSON.stringify(prevBuildDependencies) ===
+            JSON.stringify(buildDependencies)) {
+            return;
+        }
+        /**
+         * If the filenames in the buildDependencies are changed, webpack will not invalidate the previous cache.
+         * So we need to remove the cache directory to make sure the cache is invalidated.
+         */
+        await fs.remove(cacheDirectory);
+    }
+    await fs.outputJSON(configFile, buildDependencies);
+}
+function getCacheDirectory({ cacheDirectory }, context) {
+    if (cacheDirectory) {
+        return (0, path_1.isAbsolute)(cacheDirectory)
+            ? cacheDirectory
+            : (0, path_1.join)(context.rootPath, cacheDirectory);
+    }
+    return (0, path_1.join)(context.cachePath, context.bundlerType);
+}
+const PluginCache = () => ({
+    name: 'builder-plugin-cache',
+    setup(api) {
+        api.modifyBundlerChain(async (chain, { target, env }) => {
+            const { buildCache } = api.getNormalizedConfig().performance;
+            if (buildCache === false) {
+                chain.cache(false);
+                return;
+            }
+            const { context } = api;
+            const cacheConfig = typeof buildCache === 'boolean' ? {} : buildCache;
+            const cacheDirectory = getCacheDirectory(cacheConfig, context);
+            const rootPackageJson = (0, path_1.join)(context.rootPath, 'package.json');
+            const browserslistConfig = (0, path_1.join)(context.rootPath, '.browserslistrc');
+            /**
+             * webpack can't detect the changes of framework config, tsconfig and browserslist config.
+             * but they will affect the compilation result, so they need to be added to buildDependencies.
+             */
+            const buildDependencies = {
+                packageJson: [rootPackageJson],
+            };
+            if (context.configPath) {
+                buildDependencies.config = [context.configPath];
+            }
+            if (context.tsconfigPath) {
+                buildDependencies.tsconfig = [context.tsconfigPath];
+            }
+            if (await (0, builder_shared_1.isFileExists)(browserslistConfig)) {
+                buildDependencies.browserslistrc = [browserslistConfig];
+            }
+            await validateCache(cacheDirectory, buildDependencies);
+            chain.cache({
+                // The default cache name of webpack is '${name}-${env}', and the `name` is `default` by default.
+                // We set cache name to avoid cache conflicts of different targets.
+                name: `${target}-${env}`,
+                type: 'filesystem',
+                cacheDirectory,
+                buildDependencies,
+            });
+        });
+    },
+});
+exports.PluginCache = PluginCache;

package/dist/plugins/entry.d.ts

@@ -0,0 +1,2 @@
+import { DefaultBuilderPlugin } from '@modern-js/builder-shared';
+export declare const PluginEntry: () => DefaultBuilderPlugin;

package/dist/plugins/entry.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PluginEntry = void 0;
+const lodash_1 = __importDefault(require("@modern-js/utils/lodash"));
+const PluginEntry = () => ({
+    name: 'builder-plugin-entry',
+    setup(api) {
+        api.modifyBundlerChain(async (chain) => {
+            const { entry } = api.context;
+            const { preEntry } = api.getNormalizedConfig().source;
+            Object.keys(entry).forEach(entryName => {
+                const appendEntry = (file) => chain.entry(entryName).add(file);
+                preEntry.forEach(appendEntry);
+                lodash_1.default.castArray(entry[entryName]).forEach(appendEntry);
+            });
+        });
+    },
+});
+exports.PluginEntry = PluginEntry;

package/dist/plugins/index.d.ts

@@ -4,4 +4,6 @@ export declare const plugins: {
     fileSize: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
     devtool: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
     target: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
+    entry: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
+    cache: () => Promise<import("@modern-js/builder-shared").DefaultBuilderPlugin>;
 };

package/dist/plugins/index.js

@@ -30,4 +30,6 @@ exports.plugins = {
     fileSize: () => Promise.resolve().then(() => __importStar(require('./fileSize'))).then(m => m.PluginFileSize()),
     devtool: () => Promise.resolve().then(() => __importStar(require('./devtool'))).then(m => m.PluginDevtool()),
     target: () => Promise.resolve().then(() => __importStar(require('./target'))).then(m => m.PluginTarget()),
+    entry: () => Promise.resolve().then(() => __importStar(require('./entry'))).then(m => m.PluginEntry()),
+    cache: () => Promise.resolve().then(() => __importStar(require('./cache'))).then(m => m.PluginCache()),
 };

package/package.json

@@ -14,7 +14,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -27,8 +27,8 @@
     }
   },
   "dependencies": {
-    "@modern-js/builder-shared": "2.0.0-beta.6",
-    "@modern-js/utils": "2.0.0-beta.6"
+    "@modern-js/builder-shared": "2.0.0",
+    "@modern-js/utils": "2.0.0"
   },
   "devDependencies": {
     "@babel/core": "7.18.0",
@@ -36,7 +36,7 @@
     "@types/babel__preset-env": "^7.9.2",
     "@types/node": "^14",
     "typescript": "^4",
-    "@scripts/vitest-config": "2.0.0-beta.6"
+    "@scripts/vitest-config": "2.0.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/vitest.config.ts

@@ -12,6 +12,7 @@ const config = defineConfig({
   test: {
     root: __dirname,
     environment: 'node',
+    setupFiles: ['./tests/setup.ts'],
   },
 });