Skip to content

Commit db21421

Browse files
AndaristAndarist
authored
Update Babel dependencies (#51962)
### What? Update Babel packages across the board ### Why? Since you ship vendored presets and plugins it's impossible for people to update this stuff at their own pace - independently from Next. So users of `next/babel` are currently stuck with old versions and, for example, they might not be able to use the TS `satisfies` operator. ### How? I just updated ranges (to pinned ones) where I could find them, run `corepack pnpm i` and re-run build scripts in the `packages/next`. Fixes #43799
1 parent 308a327 commit db21421

File tree

191 files changed

+5032
-4555
lines changed

Some content is hidden

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

191 files changed

+5032
-4555
lines changed

‎examples/with-expo-typescript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"react-native-web": "~0.11.7"
2222
},
2323
"devDependencies": {
24-
"@babel/core": "^7.8.6",
24+
"@babel/core": "7.22.5",
2525
"@expo/next-adapter": "2.1.9",
2626
"@types/node": "14.0.4",
2727
"@types/react": "16.9.35",

‎examples/with-kea/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"reselect": "^3.0.1"
1818
},
1919
"devDependencies": {
20-
"@babel/core": "7.14.5",
21-
"@babel/plugin-proposal-decorators": "^7.1.0"
20+
"@babel/core": "7.22.5",
21+
"@babel/plugin-proposal-decorators": "7.22.5"
2222
},
2323
"babel": {
2424
"presets": [

‎examples/with-lingui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"react-dom": "^18.2.0"
1515
},
1616
"devDependencies": {
17-
"@babel/core": "7.20.12",
17+
"@babel/core": "7.22.5",
1818
"@lingui/cli": "^3.17.1",
1919
"@lingui/core": "3.17.1",
2020
"@lingui/loader": "3.17.1",

‎examples/with-mocha/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"react-dom": "^18.2.0"
1313
},
1414
"devDependencies": {
15-
"@babel/core": "^7.0.1",
16-
"@babel/register": "^7.0.0",
15+
"@babel/core": "7.22.5",
16+
"@babel/register": "7.22.5",
1717
"cross-env": "7.0.2",
1818
"enzyme": "^3.11.0",
1919
"enzyme-adapter-react-16": "^1.15.2",

‎examples/with-reasonml-todo/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"reason-react": "^0.7.0"
1616
},
1717
"devDependencies": {
18-
"@babel/core": "^7.4.3",
18+
"@babel/core": "7.22.5",
1919
"bs-platform": "7.2.2",
2020
"concurrently": "^4.1.0"
2121
}

‎examples/with-reasonml/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"reason-react": "^0.7.0"
1616
},
1717
"devDependencies": {
18-
"@babel/core": "^7.8.4",
18+
"@babel/core": "7.22.5",
1919
"bs-platform": "^7.1.0",
2020
"concurrently": "^5.1.0"
2121
}

‎examples/with-reflexjs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"reflexjs": "^2.0.0"
1313
},
1414
"devDependencies": {
15-
"@babel/core": "^7.12.9",
15+
"@babel/core": "7.22.5",
1616
"@types/node": "^14.14.12",
1717
"@types/react": "^17.0.0",
1818
"typescript": "^4.1.2"

‎examples/with-storybook-styled-jsx-scss/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"react-dom": "^18.2.0"
1515
},
1616
"devDependencies": {
17-
"@babel/core": "^7.12.3",
17+
"@babel/core": "7.22.5",
1818
"@storybook/addon-actions": "^6.1.11",
1919
"@storybook/addon-essentials": "^6.1.11",
2020
"@storybook/addon-links": "^6.1.11",

‎examples/with-tailwindcss-emotion/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"tailwindcss-filters": "3.0.0"
1414
},
1515
"devDependencies": {
16-
"@babel/core": "^7.13.15",
16+
"@babel/core": "7.22.5",
1717
"@emotion/babel-plugin": "11.7.2",
1818
"autoprefixer": "^10.4.4",
1919
"next": "latest",

‎examples/with-temporal/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"temporalio": "^0.17.2"
1919
},
2020
"devDependencies": {
21-
"@babel/core": "^7.15.0",
21+
"@babel/core": "7.22.5",
2222
"@tsconfig/node16": "^1.0.0",
2323
"@types/node": "^12.12.21",
2424
"@types/node-fetch": "^3.0.3",

‎package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@
5959
},
6060
"devDependencies": {
6161
"@actions/core": "1.10.1",
62-
"@babel/core": "7.18.0",
63-
"@babel/eslint-parser": "7.18.2",
64-
"@babel/generator": "7.18.0",
65-
"@babel/parser": "7.12.11",
66-
"@babel/plugin-proposal-object-rest-spread": "7.14.7",
67-
"@babel/preset-flow": "7.14.5",
68-
"@babel/preset-react": "7.14.5",
62+
"@babel/core": "7.22.5",
63+
"@babel/eslint-parser": "7.22.5",
64+
"@babel/generator": "7.22.5",
65+
"@babel/parser": "7.22.5",
66+
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
67+
"@babel/preset-flow": "7.22.5",
68+
"@babel/preset-react": "7.22.5",
6969
"@edge-runtime/jest-environment": "2.3.4",
7070
"@emotion/cache": "11.11.0",
7171
"@emotion/react": "11.11.1",
@@ -241,10 +241,10 @@
241241
"browserslist": "4.20.2",
242242
"caniuse-lite": "1.0.30001406",
243243
"@types/node": "20.2.5",
244-
"@babel/core": "7.18.0",
245-
"@babel/parser": "7.18.0",
246-
"@babel/types": "7.18.0",
247-
"@babel/traverse": "7.18.0",
244+
"@babel/core": "7.22.5",
245+
"@babel/parser": "7.22.5",
246+
"@babel/types": "7.22.5",
247+
"@babel/traverse": "7.22.5",
248248
"@types/react": "18.2.28",
249249
"@types/react-dom": "18.2.13"
250250
},

‎packages/next/package.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -114,26 +114,26 @@
114114
},
115115
"devDependencies": {
116116
"@ampproject/toolbox-optimizer": "2.8.3",
117-
"@babel/code-frame": "7.12.11",
118-
"@babel/core": "7.18.0",
119-
"@babel/eslint-parser": "7.18.2",
120-
"@babel/generator": "7.18.0",
121-
"@babel/plugin-proposal-class-properties": "7.14.5",
122-
"@babel/plugin-proposal-export-namespace-from": "7.14.5",
123-
"@babel/plugin-proposal-numeric-separator": "7.14.5",
124-
"@babel/plugin-proposal-object-rest-spread": "7.14.7",
117+
"@babel/code-frame": "7.22.5",
118+
"@babel/core": "7.22.5",
119+
"@babel/eslint-parser": "7.22.5",
120+
"@babel/generator": "7.22.5",
121+
"@babel/plugin-proposal-class-properties": "7.18.6",
122+
"@babel/plugin-proposal-export-namespace-from": "7.18.9",
123+
"@babel/plugin-proposal-numeric-separator": "7.18.6",
124+
"@babel/plugin-proposal-object-rest-spread": "7.20.7",
125125
"@babel/plugin-syntax-bigint": "7.8.3",
126126
"@babel/plugin-syntax-dynamic-import": "7.8.3",
127-
"@babel/plugin-syntax-import-assertions": "7.16.7",
128-
"@babel/plugin-syntax-jsx": "7.14.5",
129-
"@babel/plugin-transform-modules-commonjs": "7.18.0",
130-
"@babel/plugin-transform-runtime": "7.18.0",
131-
"@babel/preset-env": "7.18.0",
132-
"@babel/preset-react": "7.14.5",
133-
"@babel/preset-typescript": "7.17.12",
134-
"@babel/runtime": "7.15.4",
135-
"@babel/traverse": "7.18.0",
136-
"@babel/types": "7.18.0",
127+
"@babel/plugin-syntax-import-assertions": "7.22.5",
128+
"@babel/plugin-syntax-jsx": "7.22.5",
129+
"@babel/plugin-transform-modules-commonjs": "7.22.5",
130+
"@babel/plugin-transform-runtime": "7.22.5",
131+
"@babel/preset-env": "7.22.5",
132+
"@babel/preset-react": "7.22.5",
133+
"@babel/preset-typescript": "7.22.5",
134+
"@babel/runtime": "7.22.5",
135+
"@babel/traverse": "7.22.5",
136+
"@babel/types": "7.22.5",
137137
"@capsizecss/metrics": "1.1.0",
138138
"@edge-runtime/cookies": "4.0.1",
139139
"@edge-runtime/ponyfill": "2.4.1",

‎packages/next/src/build/babel/plugins/next-page-config.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,8 @@ export default function nextPageConfig({
5151
{
5252
ExportDeclaration(exportPath, exportState) {
5353
if (
54-
BabelTypes.isExportNamedDeclaration(exportPath) &&
55-
(
56-
exportPath.node as BabelTypes.ExportNamedDeclaration
57-
).specifiers?.some((specifier) => {
54+
BabelTypes.isExportNamedDeclaration(exportPath.node) &&
55+
exportPath.node.specifiers?.some((specifier) => {
5856
return (
5957
(t.isIdentifier(specifier.exported)
6058
? specifier.exported.name

‎packages/next/src/build/babel/plugins/next-ssg-transform.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -329,8 +329,8 @@ export default function nextTransformSsg({
329329
++count
330330

331331
if (
332-
t.isAssignmentExpression(sweepPath.parentPath) ||
333-
t.isVariableDeclarator(sweepPath.parentPath)
332+
t.isAssignmentExpression(sweepPath.parentPath.node) ||
333+
t.isVariableDeclarator(sweepPath.parentPath.node)
334334
) {
335335
sweepPath.parentPath.remove()
336336
} else {

‎packages/next/src/build/babel/plugins/optimize-hook-destructuring.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,14 @@ export default function ({
5757
}
5858

5959
return patterns.concat(
60-
t.objectProperty(t.numericLiteral(i), element)
60+
t.objectProperty(
61+
t.numericLiteral(i),
62+
// TODO: fix this
63+
element as Exclude<
64+
typeof element,
65+
BabelTypes.MemberExpression | BabelTypes.TSParameterProperty
66+
>
67+
)
6168
)
6269
},
6370
[]

‎packages/next/src/compiled/@babel/runtime/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@ npm install --save @babel/runtime
1515
or using yarn:
1616

1717
```sh
18-
yarn add @babel/runtime
18+
yarn add @babel/runtime
1919
```

‎packages/next/src/compiled/@babel/runtime/helpers/AsyncGenerator.js

Lines changed: 29 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,17 @@
1-
var AwaitValue = require("./AwaitValue.js");
2-
1+
var OverloadYield = require("./OverloadYield.js");
32
function AsyncGenerator(gen) {
43
var front, back;
5-
6-
function send(key, arg) {
7-
return new Promise(function (resolve, reject) {
8-
var request = {
9-
key: key,
10-
arg: arg,
11-
resolve: resolve,
12-
reject: reject,
13-
next: null
14-
};
15-
16-
if (back) {
17-
back = back.next = request;
18-
} else {
19-
front = back = request;
20-
resume(key, arg);
21-
}
22-
});
23-
}
24-
254
function resume(key, arg) {
265
try {
27-
var result = gen[key](arg);
28-
var value = result.value;
29-
var wrappedAwait = value instanceof AwaitValue;
30-
Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) {
31-
if (wrappedAwait) {
32-
resume(key === "return" ? "return" : "next", arg);
33-
return;
6+
var result = gen[key](arg),
7+
value = result.value,
8+
overloaded = value instanceof OverloadYield;
9+
Promise.resolve(overloaded ? value.v : value).then(function (arg) {
10+
if (overloaded) {
11+
var nextKey = "return" === key ? "return" : "next";
12+
if (!value.k || arg.done) return resume(nextKey, arg);
13+
arg = gen[nextKey](arg).value;
3414
}
35-
3615
settle(result.done ? "return" : "normal", arg);
3716
}, function (err) {
3817
resume("throw", err);
@@ -41,59 +20,45 @@ function AsyncGenerator(gen) {
4120
settle("throw", err);
4221
}
4322
}
44-
4523
function settle(type, value) {
4624
switch (type) {
4725
case "return":
4826
front.resolve({
4927
value: value,
50-
done: true
28+
done: !0
5129
});
5230
break;
53-
5431
case "throw":
5532
front.reject(value);
5633
break;
57-
5834
default:
5935
front.resolve({
6036
value: value,
61-
done: false
37+
done: !1
6238
});
63-
break;
64-
}
65-
66-
front = front.next;
67-
68-
if (front) {
69-
resume(front.key, front.arg);
70-
} else {
71-
back = null;
7239
}
40+
(front = front.next) ? resume(front.key, front.arg) : back = null;
7341
}
74-
75-
this._invoke = send;
76-
77-
if (typeof gen["return"] !== "function") {
78-
this["return"] = undefined;
79-
}
42+
this._invoke = function (key, arg) {
43+
return new Promise(function (resolve, reject) {
44+
var request = {
45+
key: key,
46+
arg: arg,
47+
resolve: resolve,
48+
reject: reject,
49+
next: null
50+
};
51+
back ? back = back.next = request : (front = back = request, resume(key, arg));
52+
});
53+
}, "function" != typeof gen["return"] && (this["return"] = void 0);
8054
}
81-
82-
AsyncGenerator.prototype[typeof Symbol === "function" && Symbol.asyncIterator || "@@asyncIterator"] = function () {
55+
AsyncGenerator.prototype["function" == typeof Symbol && Symbol.asyncIterator || "@@asyncIterator"] = function () {
8356
return this;
84-
};
85-
86-
AsyncGenerator.prototype.next = function (arg) {
57+
}, AsyncGenerator.prototype.next = function (arg) {
8758
return this._invoke("next", arg);
88-
};
89-
90-
AsyncGenerator.prototype["throw"] = function (arg) {
59+
}, AsyncGenerator.prototype["throw"] = function (arg) {
9160
return this._invoke("throw", arg);
92-
};
93-
94-
AsyncGenerator.prototype["return"] = function (arg) {
61+
}, AsyncGenerator.prototype["return"] = function (arg) {
9562
return this._invoke("return", arg);
9663
};
97-
98-
module.exports = AsyncGenerator;
99-
module.exports["default"] = module.exports, module.exports.__esModule = true;
64+
module.exports = AsyncGenerator, module.exports.__esModule = true, module.exports["default"] = module.exports;

‎packages/next/src/compiled/@babel/runtime/helpers/AwaitValue.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
function _AwaitValue(value) {
22
this.wrapped = value;
33
}
4-
5-
module.exports = _AwaitValue;
6-
module.exports["default"] = module.exports, module.exports.__esModule = true;
4+
module.exports = _AwaitValue, module.exports.__esModule = true, module.exports["default"] = module.exports;

‎packages/next/src/compiled/@babel/runtime/helpers/OverloadYield.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
function _OverloadYield(value, kind) {
2+
this.v = value, this.k = kind;
3+
}
4+
module.exports = _OverloadYield, module.exports.__esModule = true, module.exports["default"] = module.exports;

‎packages/next/src/compiled/@babel/runtime/helpers/applyDecoratedDescriptor.js

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,20 @@ function _applyDecoratedDescriptor(target, property, decorators, descriptor, con
55
});
66
desc.enumerable = !!desc.enumerable;
77
desc.configurable = !!desc.configurable;
8-
98
if ('value' in desc || desc.initializer) {
109
desc.writable = true;
1110
}
12-
1311
desc = decorators.slice().reverse().reduce(function (desc, decorator) {
1412
return decorator(target, property, desc) || desc;
1513
}, desc);
16-
1714
if (context && desc.initializer !== void 0) {
1815
desc.value = desc.initializer ? desc.initializer.call(context) : void 0;
1916
desc.initializer = undefined;
2017
}
21-
2218
if (desc.initializer === void 0) {
2319
Object.defineProperty(target, property, desc);
2420
desc = null;
2521
}
26-
2722
return desc;
2823
}
29-
30-
module.exports = _applyDecoratedDescriptor;
31-
module.exports["default"] = module.exports, module.exports.__esModule = true;
24+
module.exports = _applyDecoratedDescriptor, module.exports.__esModule = true, module.exports["default"] = module.exports;

0 commit comments

Comments
 (0)