Merge branch 'main' of github.com:modern-js-dev/modern.js into refact…

…or/module-tools
web-infra-dev · Sep 21, 2023 · a54fe27 · a54fe27
2 parents 4c5170f + 4590cc2
commit a54fe27
Show file tree

Hide file tree

Showing 382 changed files with 2,607 additions and 1,850 deletions.
diff --git a/.changeset/big-snakes-kick.md b/.changeset/big-snakes-kick.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/builder': patch
+---
+
+chore(builder): simplify assets rule
+
+chore(builder): 简化 assets 规则
diff --git a/.changeset/few-icons-scream.md b/.changeset/few-icons-scream.md
diff --git a/.changeset/four-beds-glow.md b/.changeset/four-beds-glow.md
diff --git a/.changeset/hot-grapes-shop.md b/.changeset/hot-grapes-shop.md
diff --git a/.changeset/khaki-pumas-exercise.md b/.changeset/khaki-pumas-exercise.md
diff --git a/.changeset/large-olives-march.md b/.changeset/large-olives-march.md
diff --git a/.changeset/rotten-bees-wash.md b/.changeset/rotten-bees-wash.md
diff --git a/.changeset/pink-olives-matter.md → .changeset/rude-ghosts-reflect.md b/.changeset/pink-olives-matter.md → .changeset/rude-ghosts-reflect.md
@@ -4,6 +4,6 @@
 '@modern-js/builder-shared': patch
 ---
 
-chore(builder): move duplicated prebundle packages to shared
+feat(builder): improve time logs format
 
-chore(builder): 合并重复的预打包 packages 到 shared
+feat(builder): 优化时间日志的格式
diff --git a/.changeset/rude-walls-work.md b/.changeset/rude-walls-work.md
diff --git a/.changeset/shaggy-ants-worry.md b/.changeset/shaggy-ants-worry.md
@@ -0,0 +1,7 @@
+---
+'@modern-js/plugin-proxy': patch
+---
+
+fix(plugin-proxy): failed to run networksetup command in Windows
+
+fix(plugin-proxy): 修复 Windows 下运行 networksetup 失败的问题
diff --git a/.changeset/slimy-seals-battle.md b/.changeset/slimy-seals-battle.md
diff --git a/.changeset/stale-comics-change.md b/.changeset/stale-comics-change.md
diff --git a/.changeset/strange-dingos-train.md b/.changeset/strange-dingos-train.md
diff --git a/.changeset/thin-ducks-sort.md b/.changeset/thin-ducks-sort.md
diff --git a/.changeset/unlucky-ants-greet.md b/.changeset/unlucky-ants-greet.md
diff --git a/.github/workflows/build-builder-website.yml b/.github/workflows/build-builder-website.yml
@@ -51,4 +51,6 @@ jobs:
           target-folder: modern-js/builder
           git-config-name: gh-pages-bot
           git-config-email: 41898282+github-actions[bot]@users.noreply.github.com
+          # enable single-commit to reduce the repo size
+          single-commit: true
           clean: true
diff --git a/.github/workflows/build-devtools-website.yml b/.github/workflows/build-devtools-website.yml
diff --git a/.github/workflows/build-main-website.yml b/.github/workflows/build-main-website.yml
@@ -55,6 +55,8 @@ jobs:
           target-folder: modern-js
           git-config-name: gh-pages-bot
           git-config-email: 41898282+github-actions[bot]@users.noreply.github.com
+          # enable single-commit to reduce the repo size
+          single-commit: true
           clean: true
           clean-exclude: |
             v1/*

diff --git a/.github/workflows/build-module-website.yml b/.github/workflows/build-module-website.yml
@@ -51,4 +51,6 @@ jobs:
           target-folder: modern-js/module-tools
           git-config-name: gh-pages-bot
           git-config-email: 41898282+github-actions[bot]@users.noreply.github.com
+          # enable single-commit to reduce the repo size
+          single-commit: true
           clean: true
diff --git a/packages/builder/builder-cli/CHANGELOG.md b/packages/builder/builder-cli/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @modern-js/builder-cli
 
+## 2.35.1
+
+### Patch Changes
+
+- Updated dependencies [ea3fe18]
+- Updated dependencies [9dd3151]
+- Updated dependencies [bc1413d]
+- Updated dependencies [0988b12]
+- Updated dependencies [4980480]
+- Updated dependencies [dc93952]
+- Updated dependencies [6b03be8]
+- Updated dependencies [578f94f]
+- Updated dependencies [6a1d46e]
+- Updated dependencies [fe8caeb]
+  - @modern-js/builder-webpack-provider@2.35.1
+  - @modern-js/builder-rspack-provider@2.35.1
+  - @modern-js/builder@2.35.1
+  - @modern-js/utils@2.35.1
+
 ## 2.35.0
 
 ### Patch Changes

diff --git a/packages/builder/builder-cli/package.json b/packages/builder/builder-cli/package.json
@@ -21,7 +21,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.35.0",
+  "version": "2.35.1",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",
@@ -51,8 +51,8 @@
     "typescript": "^5"
   },
   "peerDependencies": {
-    "@modern-js/builder-webpack-provider": "workspace:^2.35.0",
-    "@modern-js/builder-rspack-provider": "workspace:^2.35.0"
+    "@modern-js/builder-webpack-provider": "workspace:^2.35.1",
+    "@modern-js/builder-rspack-provider": "workspace:^2.35.1"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-webpack-provider": {

diff --git a/packages/builder/builder-rspack-provider/CHANGELOG.md b/packages/builder/builder-rspack-provider/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @modern-js/builder-rspack-provider
 
+## 2.35.1
+
+### Patch Changes
+
+- ea3fe18: feat(app-tools): make logs easier to read
+
+  feat(app-tools): 让日志更容易阅读
+
+- bc1413d: fix(builder): resolve-url-loader performance regression issue
+
+  fix(builder): 修复 resolve-url-loader 导致的性能下降问题
+
+- 0988b12: chore(builder): move duplicated prebundle packages to shared
+
+  chore(builder): 合并重复的预打包 packages 到 shared
+
+- dc93952: fix(builder): should not apply babel in rspack mode when tools.babel not modify config
+
+  fix(builder): 在使用 rspack 构建时，如果 tools.babel 未实际修改配置时，则不使用 babel
+
+- 6b03be8: chore(builder): apply chunkIds deterministic in Rspack mode production
+
+  chore(builder): 在 Rspack 模式下，生产环境开启 chunkIds 'deterministic'
+
+- 578f94f: chore(rspack): use DataURI module instead of rspack-plugin-virtual-module
+
+  chore(rspack): 使用 DataURI module 替代 rspack-plugin-virtual-module
+
+- fe8caeb: feat(builder): unify progress bar style in webpack / Rspack mode
+
+  feat(builder): 对齐 webpack / Rspack 模式下的进度条样式
+
+- Updated dependencies [ce24aad]
+- Updated dependencies [ea3fe18]
+- Updated dependencies [de9cdee]
+- Updated dependencies [9dd3151]
+- Updated dependencies [0988b12]
+- Updated dependencies [4980480]
+- Updated dependencies [6a1d46e]
+- Updated dependencies [fe8caeb]
+  - @modern-js/builder-shared@2.35.1
+  - @modern-js/utils@2.35.1
+  - @modern-js/server@2.35.1
+  - @modern-js/types@2.35.1
+
 ## 2.35.0
 
 ### Patch Changes

diff --git a/packages/builder/builder-rspack-provider/package.json b/packages/builder/builder-rspack-provider/package.json
@@ -18,7 +18,7 @@
   "engines": {
     "node": ">=14.0.0"
   },
-  "version": "2.35.0",
+  "version": "2.35.1",
   "jsnext:source": "./src/index.ts",
   "types": "./src/index.ts",
   "main": "./dist/index.js",

diff --git a/packages/builder/builder-rspack-provider/src/core/createCompiler.ts b/packages/builder/builder-rspack-provider/src/core/createCompiler.ts
@@ -1,13 +1,11 @@
 import {
   debug,
   logger,
+  prettyTime,
   formatStats,
   TARGET_ID_MAP,
-  getProgressColor,
 } from '@modern-js/builder-shared';
 import type { Context, RspackConfig } from '../types';
-import chalk from '@modern-js/utils/chalk';
-import prettyTime from '@modern-js/builder-shared/pretty-time';
 
 export async function createCompiler({
   context,
@@ -37,13 +35,12 @@ export async function createCompiler({
     if (!stats.hasErrors()) {
       obj.children?.forEach((c, index) => {
         if (c.time) {
-          const color = chalk[getProgressColor(index)];
-          const time = prettyTime([0, c.time * 10 ** 6], 1);
+          const time = prettyTime([0, c.time * 10 ** 6]);
           const target = Array.isArray(context.target)
             ? context.target[index]
             : context.target;
           const name = TARGET_ID_MAP[target || 'web'];
-          logger.log(color(`✔ ${name}  compiled in`, time));
+          logger.ready(`${name} compiled in ${time}`);
         }
       });
     }