docs(en): merge rollup/master into rollup-docs-cn/master @ f58d2788

.github/workflows/build-and-tests.yml

@@ -252,7 +252,7 @@ jobs:
         with:
           version: 0.14.1
       - name: Install cargo-zigbuild
-        uses: taiki-e/install-action@bfadeaba214680fb4ab63e710bcb2a6a17019fdc # v2.70.4
+        uses: taiki-e/install-action@80e6af7a2ec7f280fffe2d0a9d3a12a9d11d86e9 # v2.75.1
         if: ${{ matrix.settings.cross == 'zig' }}
         env:
           GITHUB_TOKEN: ${{ github.token }}
@@ -346,7 +346,7 @@ jobs:
           run: |
             sudo pkg_add rust node cmake
             sed -i 's^rustflags.*^^g' rust/bindings_napi/.cargo/config.toml
-            npm run build:napi
+            npm run build:napi -- --release
 
       - name: Save Cargo cache
         if: github.ref == 'refs/heads/master'
@@ -546,7 +546,7 @@ jobs:
       pull-requests: write # for writing comments
       issues: write # for writing comments
       contents: write # for creating a release
-      id-token: write  # Required for OIDC
+      id-token: write # Required for OIDC
     name: Publish
     runs-on: ubuntu-latest
     timeout-minutes: 15

CHANGELOG-0.md

@@ -328,7 +328,7 @@ _2018-06-23_
 _2018-06-21_
 
 - Do not try to deconflict "undefined" ([#2291](https://github.com/rollup/rollup/pull/2291))
-- Properly track values for loop interator declarations and reassigned namespaces, add smoke test ([#2292](https://github.com/rollup/rollup/pull/2292))
+- Properly track values for loop iterator declarations and reassigned namespaces, add smoke test ([#2292](https://github.com/rollup/rollup/pull/2292))
 
 ## 0.61.0
 
@@ -339,7 +339,7 @@ _2018-06-20_
 - Handle known undefined properties when evaluating conditionals ([#2265](https://github.com/rollup/rollup/pull/2265))
 - Access watch events via the plugin context ([#2261](https://github.com/rollup/rollup/pull/2261))
 - Add option to suppress `__esModule` flag in output ([#2287](https://github.com/rollup/rollup/pull/2287))
-- Fix issue when re-declaring variables, track reassignments in more cases ([#2279](https://github.com/rollup/rollup/pull/2279))
+- Fix issue when redeclaring variables, track reassignments in more cases ([#2279](https://github.com/rollup/rollup/pull/2279))
 - Add VSCode debug settings ([#2276](https://github.com/rollup/rollup/pull/2276))
 
 ## 0.60.7

CHANGELOG-1.md

@@ -336,7 +336,7 @@ _2019-11-12_
 ### Features
 
 - Add support for output-specific plugins (#3218)
-- Reenable parallel output processing when using the CLI (#3218)
+- Re-enable parallel output processing when using the CLI (#3218)
 - Warn if files are emitted that would overwrite previously emitted files (#3218)
 
 ### Bug Fixes
@@ -988,7 +988,7 @@ _2019-06-11_
 
 ### Bug Fixes
 
-- Handle feature detection with "typeof" for regular expressios (#2916)
+- Handle feature detection with "typeof" for regular expressions (#2916)
 - Deoptimize `'' + variable'` type coercion as expression statement for feature detection (#2917)
 - Always observe argument side-effects when tree-shaking (#2924)
 
@@ -1725,7 +1725,7 @@ _2019-01-03_
 ### Bug Fixes
 
 - Properly handle reexporting an external default export for non-ESM targets when using named exports mode (#2620)
-- Do not (wrongly) re-declare input options in the merged `RollupOptions` type (#2622)
+- Do not (wrongly) redeclare input options in the merged `RollupOptions` type (#2622)
 
 ### Pull Requests
 
@@ -1796,7 +1796,7 @@ _2018-12-28_
 
 ### Pull Requests
 
-- [#2293](https://github.com/rollup/rollup/pull/2293): Unify code paths for 1.0 relase and update documentation ( @guybedford and @lukastaegert)
+- [#2293](https://github.com/rollup/rollup/pull/2293): Unify code paths for 1.0 release and update documentation ( @guybedford and @lukastaegert)
 - [#2409](https://github.com/rollup/rollup/pull/2409): Remove old deprecated features and add new deprecation warnings ( @guybedford)
 - [#2486](https://github.com/rollup/rollup/pull/2486): Upgrade to acorn 6 (@marijnh)
 - [#2611](https://github.com/rollup/rollup/pull/2611): Fix hook's name in test description (@Andarist)

CHANGELOG-2.md

@@ -493,7 +493,7 @@ _2022-02-07_
 - [#4373](https://github.com/rollup/rollup/pull/4373): fix: even more types (@dnalborczyk)
 - [#4382](https://github.com/rollup/rollup/pull/4382): Update contribution tut link desc (@lemredd)
 - [#4383](https://github.com/rollup/rollup/pull/4383): chore: bump deps (@dnalborczyk)
-- [#4384](https://github.com/rollup/rollup/pull/4384): chore: move "wait" to utils + re-use (@dnalborczyk)
+- [#4384](https://github.com/rollup/rollup/pull/4384): chore: move "wait" to utils + reuse (@dnalborczyk)
 - [#4385](https://github.com/rollup/rollup/pull/4385): refactor: convert watch tests to async functions (@dnalborczyk)
 - [#4386](https://github.com/rollup/rollup/pull/4386): refactor: use fs.promises in resolve id, Part 4 (@dnalborczyk and @lukastaegert)
 - [#4389](https://github.com/rollup/rollup/pull/4389): refactor: use fs.promises in generate license file, rollup config, Part 5 (@dnalborczyk)
@@ -568,7 +568,7 @@ _2022-01-21_
 
 ### Pull Requests
 
-- [#4351](https://github.com/rollup/rollup/pull/4351): refactor: re-use source mapping url (@dnalborczyk)
+- [#4351](https://github.com/rollup/rollup/pull/4351): refactor: reuse source mapping url (@dnalborczyk)
 - [#4352](https://github.com/rollup/rollup/pull/4352): refactor: replace require-relative with built-in require.resolve (@dnalborczyk)
 - [#4353](https://github.com/rollup/rollup/pull/4353): chore: bump deps (@dnalborczyk)
 - [#4354](https://github.com/rollup/rollup/pull/4354): Add importedIdResolutions to moduleInfo (@lukastaegert)
@@ -641,7 +641,7 @@ _2021-12-24_
 - [#4299](https://github.com/rollup/rollup/pull/4299): Add additional string prototype methods (@dnalborczyk)
 - [#4300](https://github.com/rollup/rollup/pull/4300): Bump deps, fix expected test result for core-js (@dnalborczyk)
 - [#4302](https://github.com/rollup/rollup/pull/4302): Replace type assertion with type guard (@dnalborczyk)
-- [#4304](https://github.com/rollup/rollup/pull/4304): Re-use reserved names set (@dnalborczyk)
+- [#4304](https://github.com/rollup/rollup/pull/4304): Reuse reserved names set (@dnalborczyk)
 - [#4305](https://github.com/rollup/rollup/pull/4305): Expose isIncluded in module info (@william57m)
 - [#4306](https://github.com/rollup/rollup/pull/4306): Fix git line breaks on windows (@dnalborczyk)
 - [#4307](https://github.com/rollup/rollup/pull/4307): Add macos to pipeline (@dnalborczyk)
@@ -1580,7 +1580,7 @@ _2021-02-05_
 
 ### Bug Fixes
 
-- Prevent invalid code when simplifying assignments and delcarations (#3951)
+- Prevent invalid code when simplifying assignments and declarations (#3951)
 - Prevent behaviour-changing line-breaks when simplifying assignments in return statements (#3951)
 - Slightly improve white-space rendering when simplifying certain expressions (#3951)
 
@@ -1777,7 +1777,7 @@ _2020-11-29_
 
 ### Features
 
-- Support RequireJS comaptible AMD ids in code-splitting builds via amd.autoId (#3867)
+- Support RequireJS compatible AMD ids in code-splitting builds via amd.autoId (#3867)
 - Allow adding an AMD id base path (#3867)
 
 ### Bug Fixes
@@ -1894,7 +1894,7 @@ _2020-10-13_
 ### Pull Requests
 
 - [#3813](https://github.com/rollup/rollup/pull/3813): Add moduleParsed plugin hook (@lukastaegert)
-- [#3815](https://github.com/rollup/rollup/pull/3815): Docs: wile => while (@tjenkinson)
+- [#3815](https://github.com/rollup/rollup/pull/3815): Docs: while => while (@tjenkinson)
 - [#3817](https://github.com/rollup/rollup/pull/3817): Docs: fix code snippet (@codefrau)
 - [#3818](https://github.com/rollup/rollup/pull/3818): Update documentation on configuring Babel, removing the section on passing '{"modules": false}' as that is no longer needed since Babel 7 (@Robin-Hoodie)
 
@@ -2867,7 +2867,7 @@ _2020-04-09_
 
 ### Pull Requests
 
-- [#3492](https://github.com/rollup/rollup/pull/3492): Always use a new inclusion context when including declarations of variables, always inlcude labels when not treeshaking (@lukastaegert)
+- [#3492](https://github.com/rollup/rollup/pull/3492): Always use a new inclusion context when including declarations of variables, always include labels when not treeshaking (@lukastaegert)
 
 ## 2.3.4
 
@@ -3043,7 +3043,7 @@ _2020-03-07_
 
 ### Bug Fixes
 
-- Reenable importing rollup in Node 13.0 - 13.7 (#3428)
+- Re-enable importing rollup in Node 13.0 - 13.7 (#3428)
 
 ### Pull Requests
 

CHANGELOG-3.md

@@ -589,7 +589,7 @@ _2023-03-20_
 ### Pull Requests
 
 - [#4912](https://github.com/rollup/rollup/pull/4912): fix: make file name deterministic in parallel emits (fix #4909) ( @sun0day)
-- [#4913](https://github.com/rollup/rollup/pull/4913): Provide synthetic namespace for dynamic imports when perserving modules (@lukastaegert)
+- [#4913](https://github.com/rollup/rollup/pull/4913): Provide synthetic namespace for dynamic imports when preserving modules (@lukastaegert)
 
 ## 3.19.1
 
@@ -770,8 +770,8 @@ _2023-02-01_
 
 ### Bug Fixes
 
-- Handle self-references in class static blocks and construtors when the class is renamed (#4827)
-- Improve warnings when creating circular chunks taht reexport variables (#4829)
+- Handle self-references in class static blocks and constructors when the class is renamed (#4827)
+- Improve warnings when creating circular chunks that reexport variables (#4829)
 
 ### Pull Requests
 
@@ -1104,7 +1104,7 @@ _2022-10-18_
 
 ### Bug Fixes
 
-- Fix an issue whre Rollup confused `new.target` with `import.meta` (#4679)
+- Fix an issue where Rollup confused `new.target` with `import.meta` (#4679)
 - Ensure that Rollup does not make assumptions about the value of unknown namespace import members (#4684)
 
 ### Pull Requests

CONTRIBUTING.md

@@ -122,7 +122,7 @@ A special feature of the website is that the REPL at `http://localhost:5173/repl
 
 ## Navigating the codebase
 
-See the [architecure documentation](ARCHITECTURE.md) for an overview of the codebase and a high-level explanation of how Rollup works.
+See the [architecture documentation](ARCHITECTURE.md) for an overview of the codebase and a high-level explanation of how Rollup works.
 
 ## Submitting code
 

audit-resolve.json

@@ -2,18 +2,18 @@
   "decisions": {
     "1112706|mocha>diff": {
       "decision": "ignore",
-      "madeAt": 1772773494226,
-      "expiresAt": 1775365485778
+      "madeAt": 1775969901927,
+      "expiresAt": 1778561884409
     },
     "1113686|mocha>diff>serialize-javascript": {
       "decision": "ignore",
-      "madeAt": 1772778003517,
-      "expiresAt": 1775369996393
+      "madeAt": 1775969896563,
+      "expiresAt": 1778561884409
     },
     "1113686|@rollup/plugin-terser>serialize-javascript": {
       "decision": "ignore",
-      "madeAt": 1772778003517,
-      "expiresAt": 1775369996393
+      "madeAt": 1775969896563,
+      "expiresAt": 1778561884409
     },
     "1115519|@rollup/plugin-terser>serialize-javascript": {
       "decision": "ignore",

docs/plugin-development/index.md

@@ -1190,7 +1190,11 @@ function retainImportExpressionPlugin() {
 }
 ```
 
+<<<<<<< HEAD
 当进行动态导入时，浏览器会获取并解析请求的模块。如果目标模块被发现有导入，并且这些导入还未被获取，浏览器需要进行更多的网络请求才能执行该模块。这将导致额外一轮网络往返的延迟。对于静态模块，Rollup 会提升转移依赖（[`hoistTransitiveDependencies`](../configuration-options/index.md#output-hoisttransitiveimports)），以防止这种情况发生。然而，目前还没有自动为动态导入执行依赖提升的操作。
+=======
+When a dynamic import occurs, the browser will fetch the requested module and parse it. If the target module is discovered to have imports and they have not already been fetched, the browser must perform more network requests before it can execute the module. This will incur the latency of an additional network round trip. For static modules, Rollup will hoist transitive dependencies ([`hoistTransitiveDependencies`](../configuration-options/index.md#output-hoisttransitiveimports)) to prevent this from occurring. However, dependency hoisting is currently not automatically performed for dynamic imports.
+>>>>>>> f58d278859d247c9a9ee10cb12871ee181f2e839
 
 以下的插件可以实现类似于动态导入预加载的功能：