Skip to content

Commit f82e577

Browse files
authored
Merge pull request #202 from rollup/sync-1fa79d01
docs(en): merge rollup/master into rollup-docs-cn/master @ 1fa79d0
2 parents 72e9cad + 9fbbfea commit f82e577

55 files changed

Lines changed: 887 additions & 872 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/install-and-cache-node-deps/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ runs:
55
steps:
66
- name: Restore Node dependencies cache
77
id: cache-node-modules
8-
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
8+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
99
with:
1010
path: |
1111
node_modules
@@ -24,7 +24,7 @@ runs:
2424
shell: bash
2525
- name: Save Node dependencies cache
2626
if: steps.cache-node-modules.outputs.cache-hit != 'true' && github.ref == 'refs/heads/master'
27-
uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
27+
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
2828
with:
2929
path: |
3030
node_modules

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ jobs:
236236
if: ${{ contains(matrix.settings.target, 'ohos') }}
237237
uses: openharmony-rs/setup-ohos-sdk@eb82b94ef522b07269679195c2512f22e922ef3b # v1.0.0
238238
- name: Restore Cargo cache
239-
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
239+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
240240
if: matrix.settings.cache-cargo != false
241241
with:
242242
path: |
@@ -252,7 +252,7 @@ jobs:
252252
with:
253253
version: 0.14.1
254254
- name: Install cargo-zigbuild
255-
uses: taiki-e/install-action@bfadeaba214680fb4ab63e710bcb2a6a17019fdc # v2.70.4
255+
uses: taiki-e/install-action@85b24a67ef0c632dfefad70b9d5ce8fddb040754 # v2.75.10
256256
if: ${{ matrix.settings.cross == 'zig' }}
257257
env:
258258
GITHUB_TOKEN: ${{ github.token }}
@@ -284,7 +284,7 @@ jobs:
284284
shell: bash
285285
- name: Save Cargo cache
286286
if: github.ref == 'refs/heads/master' && matrix.settings.cache-cargo != false
287-
uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
287+
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
288288
with:
289289
path: |
290290
~/.cargo/registry/index/
@@ -294,14 +294,14 @@ jobs:
294294
rust/target/
295295
key: ${{ matrix.settings.name || matrix.settings.target }}-cargo-${{ matrix.settings.host }}-${{ hashFiles('rust/Cargo.lock') }}
296296
- name: Upload wasm artifact
297-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
297+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
298298
with:
299299
name: bindings-${{ matrix.settings.name }}
300300
path: ${{ matrix.settings.path }}
301301
if-no-files-found: error
302302
if: ${{ matrix.settings.is-wasm-build }}
303303
- name: Upload napi artifact
304-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
304+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
305305
with:
306306
name: bindings-${{ matrix.settings.target }}
307307
path: ${{ env.APP_NAME }}.*.node
@@ -323,7 +323,7 @@ jobs:
323323
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
324324

325325
- name: Restore Cargo cache
326-
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
326+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
327327
with:
328328
path: |
329329
~/.cargo/registry/index/
@@ -338,19 +338,19 @@ jobs:
338338
uses: ./.github/actions/install-and-cache-node-deps
339339

340340
- name: Build (OpenBSD)
341-
uses: cross-platform-actions/action@492b0c80085400348c599edace11141a4ee73524 # v0.32.0
341+
uses: cross-platform-actions/action@233156312992f3f169d8d0c633c21d12a5d30455 # v1.0.0
342342
with:
343343
operating_system: ${{ matrix.os.name }}
344344
architecture: ${{ matrix.os.architecture }}
345345
version: ${{ matrix.os.version }}
346346
run: |
347347
sudo pkg_add rust node cmake
348348
sed -i 's^rustflags.*^^g' rust/bindings_napi/.cargo/config.toml
349-
npm run build:napi
349+
npm run build:napi -- --release
350350
351351
- name: Save Cargo cache
352352
if: github.ref == 'refs/heads/master'
353-
uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
353+
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
354354
with:
355355
path: |
356356
~/.cargo/registry/index/
@@ -361,7 +361,7 @@ jobs:
361361
key: x86_64-unknown-openbsd-cargo-ubuntu-latest-${{ hashFiles('rust/Cargo.lock') }}
362362

363363
- name: Upload napi artifact
364-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
364+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
365365
with:
366366
name: bindings-x86_64-unknown-openbsd
367367
path: ${{ env.APP_NAME }}.*.node
@@ -546,7 +546,7 @@ jobs:
546546
pull-requests: write # for writing comments
547547
issues: write # for writing comments
548548
contents: write # for creating a release
549-
id-token: write # Required for OIDC
549+
id-token: write # Required for OIDC
550550
name: Publish
551551
runs-on: ubuntu-latest
552552
timeout-minutes: 15

.github/workflows/performance-report.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
toolchain: nightly-2025-07-25
4141
components: rust-src
4242
- name: Restore Cargo cache
43-
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
43+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
4444
with:
4545
path: |
4646
~/.cargo/registry/index/
@@ -59,7 +59,7 @@ jobs:
5959
- name: Build artefacts 123
6060
run: npm exec -- concurrently -c green,blue 'npm:build:napi -- --release' 'npm:build:cjs' && npm run build:copy-native && npm run build:bootstrap:cjs && npm run build:copy-native
6161
- name: Upload artifact
62-
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
62+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6363
with:
6464
name: ${{ matrix.settings.name }}
6565
path: dist/
@@ -82,7 +82,7 @@ jobs:
8282
toolchain: nightly-2025-07-25
8383
components: rust-src
8484
- name: Restore Cargo cache
85-
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
85+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
8686
with:
8787
path: |
8888
~/.cargo/registry/index/

.github/workflows/repl-artefacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
toolchain: nightly-2025-07-25
4141
components: rust-src
4242
- name: Restore Cargo cache
43-
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
43+
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
4444
with:
4545
path: |
4646
~/.cargo/registry/index/

CHANGELOG-0.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ _2018-06-23_
328328
_2018-06-21_
329329

330330
- Do not try to deconflict "undefined" ([#2291](https://github.com/rollup/rollup/pull/2291))
331-
- Properly track values for loop interator declarations and reassigned namespaces, add smoke test ([#2292](https://github.com/rollup/rollup/pull/2292))
331+
- Properly track values for loop iterator declarations and reassigned namespaces, add smoke test ([#2292](https://github.com/rollup/rollup/pull/2292))
332332

333333
## 0.61.0
334334

@@ -339,7 +339,7 @@ _2018-06-20_
339339
- Handle known undefined properties when evaluating conditionals ([#2265](https://github.com/rollup/rollup/pull/2265))
340340
- Access watch events via the plugin context ([#2261](https://github.com/rollup/rollup/pull/2261))
341341
- Add option to suppress `__esModule` flag in output ([#2287](https://github.com/rollup/rollup/pull/2287))
342-
- Fix issue when re-declaring variables, track reassignments in more cases ([#2279](https://github.com/rollup/rollup/pull/2279))
342+
- Fix issue when redeclaring variables, track reassignments in more cases ([#2279](https://github.com/rollup/rollup/pull/2279))
343343
- Add VSCode debug settings ([#2276](https://github.com/rollup/rollup/pull/2276))
344344

345345
## 0.60.7

CHANGELOG-1.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ _2019-11-12_
336336
### Features
337337

338338
- Add support for output-specific plugins (#3218)
339-
- Reenable parallel output processing when using the CLI (#3218)
339+
- Re-enable parallel output processing when using the CLI (#3218)
340340
- Warn if files are emitted that would overwrite previously emitted files (#3218)
341341

342342
### Bug Fixes
@@ -988,7 +988,7 @@ _2019-06-11_
988988

989989
### Bug Fixes
990990

991-
- Handle feature detection with "typeof" for regular expressios (#2916)
991+
- Handle feature detection with "typeof" for regular expressions (#2916)
992992
- Deoptimize `'' + variable'` type coercion as expression statement for feature detection (#2917)
993993
- Always observe argument side-effects when tree-shaking (#2924)
994994

@@ -1725,7 +1725,7 @@ _2019-01-03_
17251725
### Bug Fixes
17261726

17271727
- Properly handle reexporting an external default export for non-ESM targets when using named exports mode (#2620)
1728-
- Do not (wrongly) re-declare input options in the merged `RollupOptions` type (#2622)
1728+
- Do not (wrongly) redeclare input options in the merged `RollupOptions` type (#2622)
17291729

17301730
### Pull Requests
17311731

@@ -1796,7 +1796,7 @@ _2018-12-28_
17961796

17971797
### Pull Requests
17981798

1799-
- [#2293](https://github.com/rollup/rollup/pull/2293): Unify code paths for 1.0 relase and update documentation ( @guybedford and @lukastaegert)
1799+
- [#2293](https://github.com/rollup/rollup/pull/2293): Unify code paths for 1.0 release and update documentation ( @guybedford and @lukastaegert)
18001800
- [#2409](https://github.com/rollup/rollup/pull/2409): Remove old deprecated features and add new deprecation warnings ( @guybedford)
18011801
- [#2486](https://github.com/rollup/rollup/pull/2486): Upgrade to acorn 6 (@marijnh)
18021802
- [#2611](https://github.com/rollup/rollup/pull/2611): Fix hook's name in test description (@Andarist)

CHANGELOG-2.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ _2022-02-07_
493493
- [#4373](https://github.com/rollup/rollup/pull/4373): fix: even more types (@dnalborczyk)
494494
- [#4382](https://github.com/rollup/rollup/pull/4382): Update contribution tut link desc (@lemredd)
495495
- [#4383](https://github.com/rollup/rollup/pull/4383): chore: bump deps (@dnalborczyk)
496-
- [#4384](https://github.com/rollup/rollup/pull/4384): chore: move "wait" to utils + re-use (@dnalborczyk)
496+
- [#4384](https://github.com/rollup/rollup/pull/4384): chore: move "wait" to utils + reuse (@dnalborczyk)
497497
- [#4385](https://github.com/rollup/rollup/pull/4385): refactor: convert watch tests to async functions (@dnalborczyk)
498498
- [#4386](https://github.com/rollup/rollup/pull/4386): refactor: use fs.promises in resolve id, Part 4 (@dnalborczyk and @lukastaegert)
499499
- [#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_
568568

569569
### Pull Requests
570570

571-
- [#4351](https://github.com/rollup/rollup/pull/4351): refactor: re-use source mapping url (@dnalborczyk)
571+
- [#4351](https://github.com/rollup/rollup/pull/4351): refactor: reuse source mapping url (@dnalborczyk)
572572
- [#4352](https://github.com/rollup/rollup/pull/4352): refactor: replace require-relative with built-in require.resolve (@dnalborczyk)
573573
- [#4353](https://github.com/rollup/rollup/pull/4353): chore: bump deps (@dnalborczyk)
574574
- [#4354](https://github.com/rollup/rollup/pull/4354): Add importedIdResolutions to moduleInfo (@lukastaegert)
@@ -641,7 +641,7 @@ _2021-12-24_
641641
- [#4299](https://github.com/rollup/rollup/pull/4299): Add additional string prototype methods (@dnalborczyk)
642642
- [#4300](https://github.com/rollup/rollup/pull/4300): Bump deps, fix expected test result for core-js (@dnalborczyk)
643643
- [#4302](https://github.com/rollup/rollup/pull/4302): Replace type assertion with type guard (@dnalborczyk)
644-
- [#4304](https://github.com/rollup/rollup/pull/4304): Re-use reserved names set (@dnalborczyk)
644+
- [#4304](https://github.com/rollup/rollup/pull/4304): Reuse reserved names set (@dnalborczyk)
645645
- [#4305](https://github.com/rollup/rollup/pull/4305): Expose isIncluded in module info (@william57m)
646646
- [#4306](https://github.com/rollup/rollup/pull/4306): Fix git line breaks on windows (@dnalborczyk)
647647
- [#4307](https://github.com/rollup/rollup/pull/4307): Add macos to pipeline (@dnalborczyk)
@@ -1580,7 +1580,7 @@ _2021-02-05_
15801580

15811581
### Bug Fixes
15821582

1583-
- Prevent invalid code when simplifying assignments and delcarations (#3951)
1583+
- Prevent invalid code when simplifying assignments and declarations (#3951)
15841584
- Prevent behaviour-changing line-breaks when simplifying assignments in return statements (#3951)
15851585
- Slightly improve white-space rendering when simplifying certain expressions (#3951)
15861586

@@ -1777,7 +1777,7 @@ _2020-11-29_
17771777

17781778
### Features
17791779

1780-
- Support RequireJS comaptible AMD ids in code-splitting builds via amd.autoId (#3867)
1780+
- Support RequireJS compatible AMD ids in code-splitting builds via amd.autoId (#3867)
17811781
- Allow adding an AMD id base path (#3867)
17821782

17831783
### Bug Fixes
@@ -1894,7 +1894,7 @@ _2020-10-13_
18941894
### Pull Requests
18951895

18961896
- [#3813](https://github.com/rollup/rollup/pull/3813): Add moduleParsed plugin hook (@lukastaegert)
1897-
- [#3815](https://github.com/rollup/rollup/pull/3815): Docs: wile => while (@tjenkinson)
1897+
- [#3815](https://github.com/rollup/rollup/pull/3815): Docs: while => while (@tjenkinson)
18981898
- [#3817](https://github.com/rollup/rollup/pull/3817): Docs: fix code snippet (@codefrau)
18991899
- [#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)
19001900

@@ -2867,7 +2867,7 @@ _2020-04-09_
28672867

28682868
### Pull Requests
28692869

2870-
- [#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)
2870+
- [#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)
28712871

28722872
## 2.3.4
28732873

@@ -3043,7 +3043,7 @@ _2020-03-07_
30433043

30443044
### Bug Fixes
30453045

3046-
- Reenable importing rollup in Node 13.0 - 13.7 (#3428)
3046+
- Re-enable importing rollup in Node 13.0 - 13.7 (#3428)
30473047

30483048
### Pull Requests
30493049

CHANGELOG-3.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,7 @@ _2023-03-20_
589589
### Pull Requests
590590

591591
- [#4912](https://github.com/rollup/rollup/pull/4912): fix: make file name deterministic in parallel emits (fix #4909) ( @sun0day)
592-
- [#4913](https://github.com/rollup/rollup/pull/4913): Provide synthetic namespace for dynamic imports when perserving modules (@lukastaegert)
592+
- [#4913](https://github.com/rollup/rollup/pull/4913): Provide synthetic namespace for dynamic imports when preserving modules (@lukastaegert)
593593

594594
## 3.19.1
595595

@@ -770,8 +770,8 @@ _2023-02-01_
770770

771771
### Bug Fixes
772772

773-
- Handle self-references in class static blocks and construtors when the class is renamed (#4827)
774-
- Improve warnings when creating circular chunks taht reexport variables (#4829)
773+
- Handle self-references in class static blocks and constructors when the class is renamed (#4827)
774+
- Improve warnings when creating circular chunks that reexport variables (#4829)
775775

776776
### Pull Requests
777777

@@ -1104,7 +1104,7 @@ _2022-10-18_
11041104

11051105
### Bug Fixes
11061106

1107-
- Fix an issue whre Rollup confused `new.target` with `import.meta` (#4679)
1107+
- Fix an issue where Rollup confused `new.target` with `import.meta` (#4679)
11081108
- Ensure that Rollup does not make assumptions about the value of unknown namespace import members (#4684)
11091109

11101110
### Pull Requests

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ A special feature of the website is that the REPL at `http://localhost:5173/repl
122122

123123
## Navigating the codebase
124124

125-
See the [architecure documentation](ARCHITECTURE.md) for an overview of the codebase and a high-level explanation of how Rollup works.
125+
See the [architecture documentation](ARCHITECTURE.md) for an overview of the codebase and a high-level explanation of how Rollup works.
126126

127127
## Submitting code
128128

audit-resolve.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"decisions": {
33
"1112706|mocha>diff": {
44
"decision": "ignore",
5-
"madeAt": 1772773494226,
6-
"expiresAt": 1775365485778
5+
"madeAt": 1775969901927,
6+
"expiresAt": 1778561884409
77
},
88
"1113686|mocha>diff>serialize-javascript": {
99
"decision": "ignore",
10-
"madeAt": 1772778003517,
11-
"expiresAt": 1775369996393
10+
"madeAt": 1775969896563,
11+
"expiresAt": 1778561884409
1212
},
1313
"1113686|@rollup/plugin-terser>serialize-javascript": {
1414
"decision": "ignore",
15-
"madeAt": 1772778003517,
16-
"expiresAt": 1775369996393
15+
"madeAt": 1775969896563,
16+
"expiresAt": 1778561884409
1717
},
1818
"1115519|@rollup/plugin-terser>serialize-javascript": {
1919
"decision": "ignore",

0 commit comments

Comments
 (0)