Skip to content

Commit e2de6ef

Browse files
lukastaegertlukastaegert
committed
fix(alias,auto-install,babel,beep,buble,commonjs,data-uri,dsv,dynamic-import-vars,eslint,esm-shim,graphql,html,image,inject,json,legacy,multi-entry): ensure rollup 4 compatibility
1 parent 4fcc32a commit e2de6ef

Some content is hidden

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

58 files changed

+401
-378
lines changed

‎packages/alias/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
"alias"
5252
],
5353
"peerDependencies": {
54-
"rollup": "^1.20.0||^2.0.0||^3.0.0"
54+
"rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
5555
},
5656
"peerDependenciesMeta": {
5757
"rollup": {
@@ -65,7 +65,7 @@
6565
"@rollup/plugin-node-resolve": "^15.0.0",
6666
"@rollup/plugin-typescript": "^9.0.1",
6767
"del-cli": "^5.0.0",
68-
"rollup": "^3.2.3",
68+
"rollup": "^4.0.0-23",
6969
"typescript": "^4.8.3"
7070
},
7171
"types": "./types/index.d.ts",

‎packages/alias/test/test.mjs

+5-5
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ test('Forwards isEntry and custom options to a custom resolver', (t) => {
455455
{
456456
source: 'nonEntry',
457457
importer: '/src/importer.js',
458-
options: { assertions: {}, isEntry: false, custom: { test: 42 } }
458+
options: { attributes: {}, isEntry: false, custom: { test: 42 } }
459459
}
460460
]
461461
).then((result) => {
@@ -464,7 +464,7 @@ test('Forwards isEntry and custom options to a custom resolver', (t) => {
464464
'entry-point',
465465
'/src/importer.js',
466466
{
467-
assertions: {},
467+
attributes: {},
468468
custom: void 0,
469469
isEntry: true
470470
}
@@ -473,7 +473,7 @@ test('Forwards isEntry and custom options to a custom resolver', (t) => {
473473
'non-entry-point',
474474
'/src/importer.js',
475475
{
476-
assertions: {},
476+
attributes: {},
477477
custom: { test: 42 },
478478
isEntry: false
479479
}
@@ -514,7 +514,7 @@ test('Forwards isEntry and custom options to other plugins', (t) => {
514514
'entry-point',
515515
'/src/importer.js',
516516
{
517-
assertions: {},
517+
attributes: {},
518518
custom: void 0,
519519
isEntry: true
520520
}
@@ -523,7 +523,7 @@ test('Forwards isEntry and custom options to other plugins', (t) => {
523523
'non-entry-point',
524524
'/src/importer.js',
525525
{
526-
assertions: {},
526+
attributes: {},
527527
custom: { test: 42 },
528528
isEntry: false
529529
}

‎packages/auto-install/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"modules"
5454
],
5555
"peerDependencies": {
56-
"rollup": "^1.20.0||^2.0.0||^3.0.0"
56+
"rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
5757
},
5858
"peerDependenciesMeta": {
5959
"rollup": {
@@ -65,7 +65,7 @@
6565
"@rollup/plugin-typescript": "^9.0.1",
6666
"del": "^6.1.1",
6767
"node-noop": "^1.0.0",
68-
"rollup": "^3.2.3",
68+
"rollup": "^4.0.0-23",
6969
"typescript": "^4.8.3"
7070
},
7171
"types": "./types/index.d.ts",

‎packages/babel/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"peerDependencies": {
5656
"@babel/core": "^7.0.0",
5757
"@types/babel__core": "^7.1.9",
58-
"rollup": "^1.20.0||^2.0.0||^3.0.0"
58+
"rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
5959
},
6060
"peerDependenciesMeta": {
6161
"rollup": {
@@ -79,7 +79,7 @@
7979
"@rollup/plugin-json": "^5.0.0",
8080
"@rollup/plugin-node-resolve": "^15.0.0",
8181
"@types/babel__core": "^7.1.9",
82-
"rollup": "^3.2.3",
82+
"rollup": "^4.0.0-23",
8383
"source-map": "^0.7.4"
8484
},
8585
"types": "./types/index.d.ts",

‎packages/beep/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
"rollup"
3838
],
3939
"peerDependencies": {
40-
"rollup": "^1.20.0||^2.0.0||^3.0.0"
40+
"rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
4141
},
4242
"peerDependenciesMeta": {
4343
"rollup": {
4444
"optional": true
4545
}
4646
},
4747
"devDependencies": {
48-
"rollup": "^3.2.3",
48+
"rollup": "^4.0.0-23",
4949
"strip-ansi": "^7.0.1"
5050
},
5151
"types": "types/index.d.ts",

‎packages/buble/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"modules"
5454
],
5555
"peerDependencies": {
56-
"rollup": "^1.20.0||^2.0.0||^3.0.0"
56+
"rollup": "^1.20.0||^2.0.0||^3.0.0||^4.0.0"
5757
},
5858
"peerDependenciesMeta": {
5959
"rollup": {
@@ -68,7 +68,7 @@
6868
"devDependencies": {
6969
"@rollup/plugin-typescript": "^9.0.1",
7070
"del-cli": "^5.0.0",
71-
"rollup": "^3.2.3",
71+
"rollup": "^4.0.0-23",
7272
"source-map": "^0.7.4",
7373
"typescript": "^4.8.3"
7474
},

‎packages/commonjs/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"require"
5555
],
5656
"peerDependencies": {
57-
"rollup": "^2.68.0||^3.0.0"
57+
"rollup": "^2.68.0||^3.0.0||^4.0.0"
5858
},
5959
"peerDependenciesMeta": {
6060
"rollup": {
@@ -74,7 +74,7 @@
7474
"@rollup/plugin-node-resolve": "^15.0.0",
7575
"locate-character": "^2.0.5",
7676
"require-relative": "^0.8.7",
77-
"rollup": "^3.19.0",
77+
"rollup": "^4.0.0-23",
7878
"shx": "^0.3.4",
7979
"source-map": "^0.7.4",
8080
"source-map-support": "^0.5.21",

‎packages/commonjs/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ export default function commonjs(options = {}) {
306306
try {
307307
return transformAndCheckExports.call(this, code, id);
308308
} catch (err) {
309-
return this.error(err, err.loc);
309+
return this.error(err, err.pos);
310310
}
311311
}
312312
};

‎packages/commonjs/src/resolve-require-sources.js

+1
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ export function getRequireResolver(extensions, detectCyclesAndConditional, curre
170170
currentlyResolvingForParent.add(source);
171171
const resolved =
172172
(await rollupContext.resolve(source, parentId, {
173+
skipSelf: false,
173174
custom: { 'node-resolve': { isRequire: true } }
174175
})) || resolveExtensions(source, parentId, extensions);
175176
currentlyResolvingForParent.delete(source);

‎packages/commonjs/src/transform-commonjs.js

+3
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,9 @@ export default async function transformCommonjs(
300300
}
301301
if (!ignoreDynamicRequires) {
302302
if (isShorthandProperty(parent)) {
303+
// as key and value are the same object, isReference regards
304+
// both as references, so we need to skip now
305+
skippedNodes.add(parent.value);
303306
magicString.prependRight(node.start, 'require: ');
304307
}
305308
replacedDynamicRequires.push(node);

‎packages/commonjs/test/fixtures/function/custom-options/_config.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ module.exports = {
1313
plugins: [
1414
{
1515
async buildStart() {
16-
await this.resolve('./other.js', ID_MAIN, { isEntry: true, custom: { test: 42 } });
16+
await this.resolve('./other.js', ID_MAIN, {
17+
skipSelf: false,
18+
isEntry: true,
19+
custom: { test: 42 }
20+
});
1721
},
1822
buildEnd() {
1923
assert.deepStrictEqual(resolveIdArgs, [
20-
['other.js', 'main.js', { assertions: {}, custom: { test: 42 }, isEntry: true }],
21-
['main.js', void 0, { assertions: {}, custom: {}, isEntry: true }]
24+
['other.js', 'main.js', { attributes: {}, custom: { test: 42 }, isEntry: true }],
25+
['main.js', void 0, { attributes: {}, custom: {}, isEntry: true }]
2226
]);
2327
},
2428
resolveId(source, importer, options) {

‎packages/commonjs/test/snapshots/function.js.md

+46-69
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,24 @@ Generated by [AVA](https://avajs.dev).
10811081
> Snapshot 1
10821082
10831083
{
1084-
'generated-lib2.js': `'use strict';␊
1084+
'main.js': `'use strict';␊
1085+
␊
1086+
var main2 = require('./main2.js');␊
1087+
␊
1088+
/* eslint-disable import/no-dynamic-require, global-require */␊
1089+
␊
1090+
let message;␊
1091+
␊
1092+
for (const index of [1, 2]) {␊
1093+
try {␊
1094+
message = main2.createCommonjsRequire("/fixtures/function/dynamic-require-code-splitting")(\`./target${index}.js\`);␊
1095+
} catch (err) {␊
1096+
({ message } = err);␊
1097+
}␊
1098+
t.is(message, index.toString());␊
1099+
}␊
1100+
`,
1101+
'main2.js': `'use strict';␊
10851102
␊
10861103
var target1;␊
10871104
var hasRequiredTarget1;␊
@@ -1211,28 +1228,6 @@ Generated by [AVA](https://avajs.dev).
12111228
␊
12121229
exports.createCommonjsRequire = createCommonjsRequire;␊
12131230
`,
1214-
'main.js': `'use strict';␊
1215-
␊
1216-
var lib2 = require('./generated-lib2.js');␊
1217-
␊
1218-
/* eslint-disable import/no-dynamic-require, global-require */␊
1219-
␊
1220-
let message;␊
1221-
␊
1222-
for (const index of [1, 2]) {␊
1223-
try {␊
1224-
message = lib2.createCommonjsRequire("/fixtures/function/dynamic-require-code-splitting")(\`./target${index}.js\`);␊
1225-
} catch (err) {␊
1226-
({ message } = err);␊
1227-
}␊
1228-
t.is(message, index.toString());␊
1229-
}␊
1230-
`,
1231-
'main2.js': `'use strict';␊
1232-
␊
1233-
require('./generated-lib2.js');␊
1234-
␊
1235-
`,
12361231
}
12371232

12381233
## dynamic-require-different-loader
@@ -1511,6 +1506,7 @@ Generated by [AVA](https://avajs.dev).
15111506
␊
15121507
/* eslint-disable import/no-dynamic-require, global-require */␊
15131508
␊
1509+
␊
15141510
t.is(result, 'submodule');␊
15151511
`,
15161512
}
@@ -3454,6 +3450,9 @@ Generated by [AVA](https://avajs.dev).
34543450
const getGlobalPollution = () => 'foo';␊
34553451
␊
34563452
// this test makes sure that "submodule" is not wrapped in commonjs␊
3453+
// helper due to its use of "typeof module", given that "submodule" has es6 exports.␊
3454+
// any attempt to wrap it in a function will just fail as it's invalid syntax.␊
3455+
␊
34573456
␊
34583457
t.is(getGlobalPollution(), global.pollution);␊
34593458
`,
@@ -4023,11 +4022,11 @@ Generated by [AVA](https://avajs.dev).
40234022
{
40244023
'main.js': `'use strict';␊
40254024
␊
4026-
var other = require('./other-77ad7026.js');␊
4025+
var other = require('./other.js');␊
40274026
␊
4028-
t.is(other.foo, 'foo');␊
4027+
t.is(other, 'foo');␊
40294028
`,
4030-
'other-77ad7026.js': `'use strict';␊
4029+
'other.js': `'use strict';␊
40314030
␊
40324031
function getDefaultExportFromCjs (x) {␊
40334032
return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
@@ -4037,15 +4036,7 @@ Generated by [AVA](https://avajs.dev).
40374036
␊
40384037
var foo = /*@__PURE__*/getDefaultExportFromCjs(other);␊
40394038
␊
4040-
exports.foo = foo;␊
4041-
`,
4042-
'other.js': `'use strict';␊
4043-
␊
4044-
var other = require('./other-77ad7026.js');␊
4045-
␊
4046-
␊
4047-
␊
4048-
module.exports = other.foo;␊
4039+
module.exports = foo;␊
40494040
`,
40504041
}
40514042

@@ -5124,6 +5115,16 @@ Generated by [AVA](https://avajs.dev).
51245115
return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
51255116
}␊
51265117
␊
5118+
var foo;␊
5119+
var hasRequiredFoo;␊
5120+
␊
5121+
function requireFoo () {␊
5122+
if (hasRequiredFoo) return foo;␊
5123+
hasRequiredFoo = 1;␊
5124+
foo = 1;␊
5125+
return foo;␊
5126+
}␊
5127+
␊
51275128
var multiply;␊
51285129
var hasRequiredMultiply;␊
51295130
␊
@@ -5136,16 +5137,6 @@ Generated by [AVA](https://avajs.dev).
51365137
return multiply;␊
51375138
}␊
51385139
␊
5139-
var foo;␊
5140-
var hasRequiredFoo;␊
5141-
␊
5142-
function requireFoo () {␊
5143-
if (hasRequiredFoo) return foo;␊
5144-
hasRequiredFoo = 1;␊
5145-
foo = 1;␊
5146-
return foo;␊
5147-
}␊
5148-
␊
51495140
/* eslint-disable global-require */␊
51505141
␊
51515142
var main = function () {␊
@@ -5930,45 +5921,31 @@ Generated by [AVA](https://avajs.dev).
59305921
> Snapshot 1
59315922
59325923
{
5933-
'_virtual/_commonjsHelpers.js': `'use strict';␊
5924+
'main.js': `'use strict';␊
59345925
␊
59355926
var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};␊
59365927
␊
59375928
function getDefaultExportFromCjs (x) {␊
59385929
return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;␊
59395930
}␊
59405931
␊
5941-
exports.commonjsGlobal = commonjsGlobal;␊
5942-
exports.getDefaultExportFromCjs = getDefaultExportFromCjs;␊
5943-
`,
5944-
'main.js': `'use strict';␊
5945-
␊
5946-
var _commonjsHelpers = require('./_virtual/_commonjsHelpers.js');␊
5947-
var main$1 = require('./main2.js');␊
5948-
␊
5949-
var mainExports = main$1.__require();␊
5950-
var main = /*@__PURE__*/_commonjsHelpers.getDefaultExportFromCjs(mainExports);␊
5951-
␊
5952-
module.exports = main;␊
5953-
`,
5954-
'main2.js': `'use strict';␊
5955-
␊
5956-
var _commonjsHelpers = require('./_virtual/_commonjsHelpers.js');␊
5957-
␊
5958-
var main;␊
5932+
var main$1;␊
59595933
var hasRequiredMain;␊
59605934
␊
59615935
function requireMain () {␊
5962-
if (hasRequiredMain) return main;␊
5936+
if (hasRequiredMain) return main$1;␊
59635937
hasRequiredMain = 1;␊
5964-
_commonjsHelpers.commonjsGlobal.main = 'main';␊
5938+
commonjsGlobal.main = 'main';␊
59655939
console.log('main');␊
59665940
␊
5967-
main = 'main';␊
5968-
return main;␊
5941+
main$1 = 'main';␊
5942+
return main$1;␊
59695943
}␊
59705944
␊
5971-
exports.__require = requireMain;␊
5945+
var mainExports = requireMain();␊
5946+
var main = /*@__PURE__*/getDefaultExportFromCjs(mainExports);␊
5947+
␊
5948+
module.exports = main;␊
59725949
`,
59735950
}
59745951

‎packages/commonjs/test/snapshots/function.js.snap

-82 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)