Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Support Rollup 3.0.0 #120

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support Rollup 3.0.0 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rollup-plugin-terser",
"version": "7.0.2",
"version": "7.1.0",
"description": "Rollup plugin to minify generated es bundle",
"type": "commonjs",
"main": "rollup-plugin-terser.js",
Expand Down Expand Up @@ -32,18 +32,18 @@
"author": "Bogdan Chadkin <trysound@yandex.ru>",
"license": "MIT",
"dependencies": {
"@babel/code-frame": "^7.10.4",
"jest-worker": "^26.2.1",
"serialize-javascript": "^4.0.0",
"terser": "^5.0.0"
"@babel/code-frame": "^7.18.6",
"jest-worker": "^29.1.2",
"serialize-javascript": "^6.0.0",
"terser": "^5.15.1"
},
"peerDependencies": {
"rollup": "^2.0.0"
"rollup": ">=2.0.0"
Copy link

Choose a reason for hiding this comment

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

I would use ^2.0.0 || ^3.0.0 instead. There is no guarantee that the plugin supports Rollup 4 without changes the day it comes out

},
"devDependencies": {
"@babel/core": "^7.11.1",
"jest": "^26.2.2",
"prettier": "^2.0.5",
"rollup": "^2.23.1"
"@babel/core": "^7.19.3",
"jest": "^29.1.2",
"prettier": "^2.7.1",
"rollup": ">=2.0.0"
}
}
38 changes: 29 additions & 9 deletions rollup-plugin-terser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
const { codeFrameColumns } = require("@babel/code-frame");
const Worker = require("jest-worker").default;
const {
codeFrameColumns
} = require("@babel/code-frame");
const {
Worker
} = require("jest-worker");
const serialize = require("serialize-javascript");

function terser(userOptions = {}) {
Expand Down Expand Up @@ -28,8 +32,7 @@ function terser(userOptions = {}) {
this.numOfBundles++;

const defaultOptions = {
sourceMap:
outputOptions.sourcemap === true ||
sourceMap: outputOptions.sourcemap === true ||
typeof outputOptions.sourcemap === "string",
};
if (outputOptions.format === "es" || outputOptions.format === "esm") {
Expand All @@ -39,7 +42,10 @@ function terser(userOptions = {}) {
defaultOptions.toplevel = true;
}

const normalizedOptions = { ...defaultOptions, ...userOptions };
const normalizedOptions = {
...defaultOptions,
...userOptions
};

// remove plugin specific options
for (let key of ["numWorkers"]) {
Expand All @@ -54,7 +60,10 @@ function terser(userOptions = {}) {
const result = await this.worker.transform(code, serializedOptions);

if (result.nameCache) {
let { vars, props } = userOptions.nameCache;
let {
vars,
props
} = userOptions.nameCache;

// only assign nameCache.vars if it was provided, and if terser produced values:
if (vars) {
Expand Down Expand Up @@ -82,9 +91,20 @@ function terser(userOptions = {}) {

return result.result;
} catch (error) {
const { message, line, col: column } = error;
const {
message,
line,
col: column
} = error;
console.error(
codeFrameColumns(code, { start: { line, column } }, { message })
codeFrameColumns(code, {
start: {
line,
column
}
}, {
message
})
);
throw error;
} finally {
Expand All @@ -99,4 +119,4 @@ function terser(userOptions = {}) {
};
}

exports.terser = terser;
exports.terser = terser;
34 changes: 17 additions & 17 deletions test/__snapshots__/test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`works with code splitting 1`] = `
Object {
"chunk-1.js": Object {
"code": "console.log(\\"chunk-1\\");
{
"chunk-1.js": {
"code": "console.log(\"chunk-1\");
",
"dynamicImports": Array [],
"exports": Array [],
"dynamicImports": [],
"exports": [],
"fileName": "chunk-1.js",
"implicitlyLoadedBefore": Array [],
"imports": Array [],
"implicitlyLoadedBefore": [],
"importedBindings": {},
"imports": [],
"isDynamicEntry": false,
"isEntry": true,
"isImplicitEntry": false,
"map": null,
"name": "chunk-1",
"referencedFiles": Array [],
"referencedFiles": [],
"type": "chunk",
},
"chunk-2.js": Object {
"code": "console.log(\\"chunk-2\\");
"chunk-2.js": {
"code": "console.log(\"chunk-2\");
",
"dynamicImports": Array [],
"exports": Array [],
"dynamicImports": [],
"exports": [],
"fileName": "chunk-2.js",
"implicitlyLoadedBefore": Array [],
"imports": Array [],
"implicitlyLoadedBefore": [],
"importedBindings": {},
"imports": [],
"isDynamicEntry": false,
"isEntry": true,
"isImplicitEntry": false,
"map": null,
"name": "chunk-2",
"referencedFiles": Array [],
"referencedFiles": [],
"type": "chunk",
},
}
Expand Down