Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/rollup/rollup into sync-5…
Browse files Browse the repository at this point in the history
…3d63605
  • Loading branch information
docschina-bot committed Nov 12, 2023
2 parents 3cf878d + 53d6360 commit 3807f78
Show file tree
Hide file tree
Showing 133 changed files with 1,116 additions and 800 deletions.
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# rollup changelog

## 4.4.0

_2023-11-12_

### Features

- Replace SWC linting with faster internal linting to error on duplicate declarations etc. (#5207)

### Bug Fixes

- Show proper error when an entry exports non-existing bindings (#5207)

### Pull Requests

- [#5207](https://github.com/rollup/rollup/pull/5207): perf: run lint while constructing nodes (@sapphi-red)

## 4.3.1

_2023-11-11_
Expand Down
2 changes: 1 addition & 1 deletion browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rollup/browser",
"version": "4.3.1",
"version": "4.4.0",
"description": "Next-generation ES module bundler browser build",
"main": "dist/rollup.browser.js",
"module": "dist/es/rollup.browser.js",
Expand Down
108 changes: 54 additions & 54 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rollup",
"version": "4.3.1",
"version": "4.4.0",
"description": "Next-generation ES module bundler",
"main": "dist/rollup.js",
"module": "dist/es/rollup.js",
Expand Down Expand Up @@ -38,14 +38,14 @@
"build:wasm": "wasm-pack build rust/bindings_wasm --out-dir ../../wasm --target web --no-pack && shx rm wasm/.gitignore",
"build:wasm:node": "wasm-pack build rust/bindings_wasm --out-dir ../../wasm-node --target nodejs --no-pack && shx rm wasm-node/.gitignore",
"update:napi": "npm run build:napi && npm run build:copy-native",
"build:js": "rollup --config rollup.config.ts --configPlugin typescript",
"build:js:node": "rollup --config rollup.config.ts --configPlugin typescript --configIsBuildNode",
"build:js": "rollup --config rollup.config.ts --configPlugin typescript --forceExit",
"build:js:node": "rollup --config rollup.config.ts --configPlugin typescript --configIsBuildNode --forceExit",
"build:prepare": "concurrently -c green,blue \"npm run build:napi -- --release\" \"npm:build:js:node\" && npm run build:copy-native",
"update:js": "npm run build:js && npm run build:copy-native",
"build:copy-native": "shx mkdir -p dist && shx cp rollup.*.node dist/",
"dev": "vitepress dev docs",
"build:cjs": "rollup --config rollup.config.ts --configPlugin typescript --configTest",
"build:bootstrap": "shx mv dist dist-build && node dist-build/bin/rollup --config rollup.config.ts --configPlugin typescript && shx rm -rf dist-build",
"build:cjs": "rollup --config rollup.config.ts --configPlugin typescript --configTest --forceExit",
"build:bootstrap": "shx mv dist dist-build && node dist-build/bin/rollup --config rollup.config.ts --configPlugin typescript --forceExit && shx rm -rf dist-build",
"build:docs": "vitepress build docs",
"preview:docs": "vitepress preview docs",
"ci:artifacts": "napi artifacts",
Expand Down Expand Up @@ -165,7 +165,7 @@
"pretty-bytes": "^6.1.1",
"pretty-ms": "^8.0.0",
"requirejs": "^2.3.6",
"rollup": "^4.3.0",
"rollup": "^4.3.1",
"rollup-plugin-license": "^3.2.0",
"rollup-plugin-string": "^3.0.0",
"rollup-plugin-thatworks": "^1.0.4",
Expand Down
14 changes: 1 addition & 13 deletions rollup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,16 +99,6 @@ export default async function (
return commonJSBuild;
}

const exitOnCloseBundle: Plugin = {
closeBundle() {
// On CI, macOS runs sometimes do not close properly. This is a hack
// to fix this until the problem is understood.
console.log('Force quit.');
setTimeout(() => process.exit(0));
},
name: 'force-close'
};

const esmBuild: RollupOptions = {
...commonJSBuild,
input: {
Expand All @@ -127,7 +117,6 @@ export default async function (
};

if (command.configIsBuildNode) {
(esmBuild.plugins as Plugin[]).push(exitOnCloseBundle);
return [commonJSBuild, esmBuild];
}

Expand Down Expand Up @@ -164,8 +153,7 @@ export default async function (
collectLicensesBrowser(),
writeLicenseBrowser(),
cleanBeforeWrite('browser/dist'),
emitWasmFile(),
exitOnCloseBundle
emitWasmFile()
],
strictDeprecations: true,
treeshake
Expand Down
Loading

1 comment on commit 3807f78

@vercel
Copy link

@vercel vercel bot commented on 3807f78 Nov 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.