Skip to content

Commit 371f424

Browse files
lukastaegertlukastaegert
authored
refactor: audit for Rollup@2.0.0 (#244)
* chore: prepare for Rollup 2 * chore(commonjs): fix separator in test * chore: Use actual Rollup 2 * chore: fix peerDependencies version ranges
1 parent bf94a85 commit 371f424

File tree

29 files changed

+186
-186
lines changed

29 files changed

+186
-186
lines changed

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"pnpm": "^4.6.0",
3939
"prettier": "^1.19.1",
4040
"prettier-plugin-package": "^0.3.1",
41-
"rollup": "^1.27.14",
41+
"rollup": "^2.0.0",
4242
"ts-node": "^8.5.4",
4343
"tsconfig-paths": "^3.9.0",
4444
"tslib": "^1.10.0",

‎packages/alias/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"alias"
4444
],
4545
"peerDependencies": {
46-
"rollup": "^1.20.0"
46+
"rollup": "^1.20.0||^2.0.0"
4747
},
4848
"dependencies": {
4949
"slash": "^3.0.0"
@@ -52,7 +52,7 @@
5252
"@rollup/plugin-node-resolve": "^7.0.0",
5353
"@rollup/plugin-typescript": "^3.0.0",
5454
"del-cli": "^3.0.0",
55-
"rollup": "^1.27.14"
55+
"rollup": "^2.0.0"
5656
},
5757
"ava": {
5858
"compileEnhancements": false,

‎packages/alias/test/test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,12 +333,11 @@ test('Alias + rollup-plugin-node-resolve', (t) =>
333333
.then(getModuleIdsFromBundle)
334334
.then((moduleIds) => {
335335
const normalizedIds = moduleIds.map((id) => path.resolve(id)).sort();
336-
t.is(normalizedIds.length, 7);
336+
t.is(normalizedIds.length, 6);
337337
[
338338
'/fixtures/aliasMe.js',
339339
'/fixtures/folder/anotherNumber.js',
340340
'/fixtures/folder/deep/deep2/index.js',
341-
'/fixtures/folder/index.js',
342341
'/fixtures/index.js',
343342
'/fixtures/localAliasMe.js',
344343
'/fixtures/nonAliased.js'

‎packages/auto-install/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
"modules"
4343
],
4444
"peerDependencies": {
45-
"rollup": "^1.20.0"
45+
"rollup": "^1.20.0||^2.0.0"
4646
},
4747
"devDependencies": {
4848
"@rollup/plugin-node-resolve": "^7.0.0",
4949
"@rollup/plugin-typescript": "^3.0.0",
5050
"del": "^5.1.0",
5151
"node-noop": "^1.0.0",
52-
"rollup": "^1.27.14"
52+
"rollup": "^2.0.0"
5353
},
5454
"ava": {
5555
"compileEnhancements": false,

‎packages/beep/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
"rollup"
3737
],
3838
"peerDependencies": {
39-
"rollup": "^1.20.0"
39+
"rollup": "^1.20.0||^2.0.0"
4040
},
4141
"devDependencies": {
42-
"rollup": "^1.20.0",
42+
"rollup": "^2.0.0",
4343
"strip-ansi": "^5.2.0"
4444
},
4545
"ava": {

‎packages/buble/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"modules"
4747
],
4848
"peerDependencies": {
49-
"rollup": "^1.20.0"
49+
"rollup": "^1.20.0||^2.0.0"
5050
},
5151
"dependencies": {
5252
"@rollup/pluginutils": "^3.0.8",
@@ -56,7 +56,7 @@
5656
"devDependencies": {
5757
"@rollup/plugin-typescript": "^3.0.0",
5858
"del-cli": "^3.0.0",
59-
"rollup": "^1.27.14",
59+
"rollup": "^2.0.0",
6060
"source-map": "^0.7.3",
6161
"typescript": "^3.7.4"
6262
},

‎packages/commonjs/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"require"
4747
],
4848
"peerDependencies": {
49-
"rollup": "^1.20.0"
49+
"rollup": "^1.20.0||^2.0.0"
5050
},
5151
"dependencies": {
5252
"@rollup/pluginutils": "^3.0.8",
@@ -65,7 +65,7 @@
6565
"locate-character": "^2.0.5",
6666
"prettier": "^1.19.1",
6767
"require-relative": "^0.8.7",
68-
"rollup": "^1.27.14",
68+
"rollup": "^2.0.0",
6969
"rollup-plugin-babel": "^4.3.3",
7070
"shx": "^0.3.2",
7171
"source-map": "^0.6.1",

‎packages/commonjs/test/test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ test('does not reexport named contents', async (t) => {
402402
} catch (error) {
403403
t.is(
404404
error.message,
405-
`'named' is not exported by fixtures${path.sep}samples${path.sep}reexport${path.sep}reexport.js`
405+
`'named' is not exported by fixtures${path.sep}samples${path.sep}reexport${path.sep}reexport.js, ` +
406+
`imported by fixtures${path.sep}samples${path.sep}reexport${path.sep}main.js`
406407
);
407408
}
408409
});

‎packages/data-uri/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
"url"
4646
],
4747
"peerDependencies": {
48-
"rollup": "^1.20.0"
48+
"rollup": "^1.20.0||^2.0.0"
4949
},
5050
"devDependencies": {
5151
"@rollup/plugin-typescript": "^3.0.0",
5252
"@rollup/pluginutils": "^3.0.1",
53-
"rollup": "^1.27.14",
53+
"rollup": "^2.0.0",
5454
"typescript": "^3.7.4"
5555
},
5656
"ava": {

‎packages/dsv/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"devDependencies": {
4141
"del-cli": "^3.0.0",
42-
"rollup": "^1.27.14"
42+
"rollup": "^2.0.0"
4343
},
4444
"ava": {
4545
"files": [

‎packages/html/lib/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const { extname } = require('path');
22

33
const getFiles = (bundle) => {
44
const files = Object.values(bundle).filter(
5-
(file) => file.isEntry || file.type === 'asset' || file.isAsset
5+
(file) => file.isEntry || (typeof file.type === 'string' ? file.type === 'asset' : file.isAsset)
66
);
77
const result = {};
88
for (const file of files) {

‎packages/html/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
"template"
3939
],
4040
"peerDependencies": {
41-
"rollup": "^1.20.0"
41+
"rollup": "^1.20.0||^2.0.0"
4242
},
4343
"devDependencies": {
44-
"rollup": "^1.27.5",
44+
"rollup": "^2.0.0",
4545
"rollup-plugin-postcss": "^2.0.3"
4646
},
4747
"ava": {

‎packages/image/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,15 @@
4242
"modules"
4343
],
4444
"peerDependencies": {
45-
"rollup": "^1.20.0"
45+
"rollup": "^1.20.0||^2.0.0"
4646
},
4747
"dependencies": {
4848
"@rollup/pluginutils": "^3.0.4",
4949
"mini-svg-data-uri": "^1.1.3"
5050
},
5151
"devDependencies": {
5252
"@rollup/plugin-buble": "^0.21.0",
53-
"rollup": "^1.29.0"
53+
"rollup": "^2.0.0"
5454
},
5555
"ava": {
5656
"files": [

‎packages/inject/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"modules"
4444
],
4545
"peerDependencies": {
46-
"rollup": "^1.20.0"
46+
"rollup": "^1.20.0||^2.0.0"
4747
},
4848
"dependencies": {
4949
"@rollup/pluginutils": "^3.0.4",
@@ -54,7 +54,7 @@
5454
"@rollup/plugin-buble": "^0.21.0",
5555
"del-cli": "^3.0.0",
5656
"locate-character": "^2.0.5",
57-
"rollup": "^1.27.14",
57+
"rollup": "^2.0.0",
5858
"source-map": "^0.7.3",
5959
"typescript": "^3.7.4"
6060
},

‎packages/json/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"modules"
4545
],
4646
"peerDependencies": {
47-
"rollup": "^1.20.0"
47+
"rollup": "^1.20.0||^2.0.0"
4848
},
4949
"dependencies": {
5050
"@rollup/pluginutils": "^3.0.8"

‎packages/legacy/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
"plugin"
3838
],
3939
"peerDependencies": {
40-
"rollup": "^1.20.0"
40+
"rollup": "^1.20.0||^2.0.0"
4141
},
4242
"devDependencies": {
4343
"@rollup/plugin-buble": "^0.20.0",
4444
"del-cli": "^3.0.0",
45-
"rollup": "^1.27.2"
45+
"rollup": "^2.0.0"
4646
},
4747
"ava": {
4848
"files": [

‎packages/multi-entry/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
"entries"
4242
],
4343
"peerDependencies": {
44-
"rollup": "^1.20.0"
44+
"rollup": "^1.20.0||^2.0.0"
4545
},
4646
"dependencies": {
4747
"matched": "^1.0.2"
4848
},
4949
"devDependencies": {
5050
"@babel/core": "^7.2.0",
5151
"@babel/preset-env": "^7.2.0",
52-
"rollup": "^1.20.1",
52+
"rollup": "^2.0.0",
5353
"rollup-plugin-babel": "^4.0.3"
5454
},
5555
"ava": {

‎packages/node-resolve/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"modules"
4646
],
4747
"peerDependencies": {
48-
"rollup": "^1.20.0"
48+
"rollup": "^1.20.0||^2.0.0"
4949
},
5050
"dependencies": {
5151
"@rollup/pluginutils": "^3.0.8",
@@ -59,7 +59,7 @@
5959
"@babel/preset-env": "^7.8.3",
6060
"@rollup/plugin-json": "^4.0.1",
6161
"es5-ext": "^0.10.53",
62-
"rollup": "^1.29.0",
62+
"rollup": "^2.0.0",
6363
"rollup-plugin-babel": "^4.3.3",
6464
"rollup-plugin-commonjs": "^10.1.0",
6565
"source-map": "^0.7.3",

‎packages/pluginutils/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"utils"
4545
],
4646
"peerDependencies": {
47-
"rollup": "^1.20.0"
47+
"rollup": "^1.20.0||^2.0.0"
4848
},
4949
"dependencies": {
5050
"@types/estree": "0.0.39",

‎packages/replace/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"modules"
4444
],
4545
"peerDependencies": {
46-
"rollup": "^1.20.0"
46+
"rollup": "^1.20.0||^2.0.0"
4747
},
4848
"dependencies": {
4949
"@rollup/pluginutils": "^3.0.8",
@@ -53,7 +53,7 @@
5353
"@rollup/plugin-buble": "^0.21.0",
5454
"del-cli": "^3.0.0",
5555
"locate-character": "^2.0.5",
56-
"rollup": "^1.27.14",
56+
"rollup": "^2.0.0",
5757
"source-map": "^0.7.3",
5858
"typescript": "^3.7.4"
5959
},

‎packages/run/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@
3333
"run"
3434
],
3535
"peerDependencies": {
36-
"rollup": "^1.20.0"
36+
"rollup": "^1.20.0||^2.0.0"
3737
},
3838
"devDependencies": {
3939
"@types/node": "13.1.6",
4040
"del": "^5.1.0",
41-
"rollup": "^1.27.14",
41+
"rollup": "^2.0.0",
4242
"sinon": "8.0.4"
4343
},
4444
"ava": {

‎packages/strip/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"javascript"
3535
],
3636
"peerDependencies": {
37-
"rollup": "^1.20.0"
37+
"rollup": "^1.20.0||^2.0.0"
3838
},
3939
"dependencies": {
4040
"@rollup/pluginutils": "^3.0.4",
@@ -43,7 +43,7 @@
4343
},
4444
"devDependencies": {
4545
"acorn": "7.1.0",
46-
"rollup": "^1.27.14"
46+
"rollup": "^2.0.0"
4747
},
4848
"ava": {
4949
"files": [

‎packages/sucrase/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
"jsx"
4545
],
4646
"peerDependencies": {
47-
"rollup": "^1.20.0"
47+
"rollup": "^1.20.0||^2.0.0"
4848
},
4949
"dependencies": {
5050
"@rollup/pluginutils": "^3.0.1",
5151
"sucrase": "^3.10.1"
5252
},
5353
"devDependencies": {
54-
"rollup": "^1.27.13"
54+
"rollup": "^2.0.0"
5555
},
5656
"ava": {
5757
"files": [

‎packages/typescript/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"es2015"
4545
],
4646
"peerDependencies": {
47-
"rollup": "^1.20.0",
47+
"rollup": "^1.20.0||^2.0.0",
4848
"tslib": "*",
4949
"typescript": ">=2.1.0"
5050
},
@@ -57,7 +57,7 @@
5757
"@rollup/plugin-commonjs": "^11.0.1",
5858
"@rollup/plugin-typescript": "^3.0.0",
5959
"buble": "^0.19.8",
60-
"rollup": "^1.27.14",
60+
"rollup": "^2.0.0",
6161
"tslib": "^1.10.0",
6262
"typescript": "^3.7.4"
6363
},

‎packages/url/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"url"
4242
],
4343
"peerDependencies": {
44-
"rollup": "^1.20.0"
44+
"rollup": "^1.20.0||^2.0.0"
4545
},
4646
"dependencies": {
4747
"@rollup/pluginutils": "^3.0.4",
@@ -54,7 +54,7 @@
5454
"@babel/register": "^7.7.7",
5555
"del": "^5.1.0",
5656
"globby": "^10.0.1",
57-
"rollup": "^1.27.14",
57+
"rollup": "^2.0.0",
5858
"rollup-plugin-babel": "^4.3.3"
5959
},
6060
"ava": {

‎packages/virtual/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
"virtual"
4242
],
4343
"peerDependencies": {
44-
"rollup": "^1.20.0"
44+
"rollup": "^1.20.0||^2.0.0"
4545
},
4646
"devDependencies": {
4747
"@rollup/plugin-node-resolve": "^7.0.0",
48-
"rollup": "^1.27.14"
48+
"rollup": "^2.0.0"
4949
},
5050
"ava": {
5151
"files": [

‎packages/wasm/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
"emscripten"
4444
],
4545
"peerDependencies": {
46-
"rollup": "^1.20.0"
46+
"rollup": "^1.20.0||^2.0.0"
4747
},
4848
"devDependencies": {
4949
"del-cli": "^3.0.0",
50-
"rollup": "^1.20.0",
50+
"rollup": "^2.0.0",
5151
"source-map": "^0.7.3"
5252
},
5353
"ava": {

0 commit comments

Comments
 (0)