Skip to content

Commit

Permalink
chore: Update TS 5.2 (#15897)
Browse files Browse the repository at this point in the history
  • Loading branch information
liuxingbaoyu committed Aug 31, 2023
1 parent 5ebab54 commit c39fda2
Show file tree
Hide file tree
Showing 9 changed files with 269 additions and 323 deletions.
5 changes: 4 additions & 1 deletion Gulpfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import rollupNodeResolve from "@rollup/plugin-node-resolve";
import rollupReplace from "@rollup/plugin-replace";
import rollupTerser from "@rollup/plugin-terser";
import rollupDts from "rollup-plugin-dts";
import rollupDts5 from "rollup-plugin-dts-5";
import { Worker as JestWorker } from "jest-worker";
import { Glob } from "glob";
import { resolve as importMetaResolve } from "import-meta-resolve";
Expand Down Expand Up @@ -581,7 +582,9 @@ function buildRollupDts(packages) {

const bundle = await rollup({
input,
plugins: [rollupDts()],
plugins: [
bool(process.env.BABEL_8_BREAKING) ? rollupDts() : rollupDts5(),
],
});

await bundle.write({
Expand Down
8 changes: 5 additions & 3 deletions eslint/babel-eslint-parser/src/parse.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
const semver = require("semver");
const convert = require("./convert/index.cjs");

const babelParser = require(require.resolve("@babel/parser", {
paths: [require.resolve("@babel/core/package.json")],
}));
const babelParser = require(
require.resolve("@babel/parser", {
paths: [require.resolve("@babel/core/package.json")],
}),
);

let isRunningMinSupportedCoreVersion = null;

Expand Down
4 changes: 3 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ module.exports = {
"<rootDir>/packages/babel-core/.*/vendor/.*",
],

setupFiles: ["source-map-support/register"],
setupFiles: supportsESMAndJestLightRunner
? ["@cspotcode/source-map-support/register"]
: [],

// The eslint/* packages is tested against ESLint v8, which has dropped support for Node v10.
// TODO: Remove this process.version check in Babel 8.
Expand Down
17 changes: 9 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"@babel/preset-env": "8.0.0-alpha.2",
"@babel/preset-typescript": "8.0.0-alpha.2",
"@babel/runtime": "8.0.0-alpha.2",
"@cspotcode/source-map-support": "^0.8.1",
"@eslint/eslintrc": "^2.1.0",
"@rollup/plugin-babel": "^6.0.3",
"@rollup/plugin-commonjs": "^25.0.3",
Expand All @@ -44,8 +45,8 @@
"@rollup/plugin-terser": "^0.4.3",
"@types/jest": "^29.5.2",
"@types/node": "^20.3.3",
"@typescript-eslint/eslint-plugin": "^6.3.0",
"@typescript-eslint/parser": "^6.3.0",
"@typescript-eslint/eslint-plugin": "^6.5.0",
"@typescript-eslint/parser": "^6.5.0",
"babel-plugin-transform-charcodes": "^0.2.0",
"c8": "^8.0.1",
"chalk": "^5.3.0",
Expand All @@ -68,18 +69,18 @@
"jest": "^29.6.2",
"jest-light-runner": "^0.5.1",
"jest-worker": "^29.6.2",
"lint-staged": "^13.2.3",
"lint-staged": "^14.0.1",
"mergeiterator": "^1.4.4",
"prettier": "^3.0.0",
"rollup": "^3.2.3",
"rollup-plugin-dts": "^5.3.1",
"prettier": "^3.0.3",
"rollup": "^3.28.1",
"rollup-plugin-dts": "^6.0.0",
"rollup-plugin-dts-5": "npm:rollup-plugin-dts@^5.3.1",
"rollup-plugin-polyfill-node": "^0.12.0",
"semver": "^6.3.1",
"shelljs": "^0.8.5",
"source-map-support": "^0.5.21",
"test262-stream": "^1.4.0",
"through2": "^4.0.0",
"typescript": "^5.1.6"
"typescript": "^5.2.2"
},
"workspaces": [
"codemods/*",
Expand Down
8 changes: 5 additions & 3 deletions packages/babel-code-frame/test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ describe("@babel/code-frame", function () {
resolve("chalk", resolve("@babel/highlight", import.meta.url))
));
} else {
babelHighlightChalk = require(require.resolve("chalk", {
paths: [require.resolve("@babel/highlight")],
}));
babelHighlightChalk = require(
require.resolve("chalk", {
paths: [require.resolve("@babel/highlight")],
}),
);
}
});

Expand Down
10 changes: 6 additions & 4 deletions packages/babel-core/test/config-ts.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,12 @@ const shouldSkip = semver.lt(process.version, "14.0.0") || USE_ESM;
service.enabled(true);

try {
require(path.join(
__dirname,
"fixtures/config-ts/simple-cts-with-ts-node/babel.config.cts",
));
require(
path.join(
__dirname,
"fixtures/config-ts/simple-cts-with-ts-node/babel.config.cts",
),
);

const config = loadPartialConfigSync({
configFile: path.join(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@
// https://tc39.github.io/ecma262/#sec-conformance
const version = "15.0.0";

const start = require("@unicode/unicode-" +
version +
"/Binary_Property/ID_Start/code-points.js").filter(function (ch) {
const start = require(
"@unicode/unicode-" + version + "/Binary_Property/ID_Start/code-points.js"
).filter(function (ch) {
return ch > 0x7f;
});
let last = -1;
const cont = [0x200c, 0x200d].concat(
require("@unicode/unicode-" +
version +
"/Binary_Property/ID_Continue/code-points.js").filter(function (ch) {
require(
"@unicode/unicode-" +
version +
"/Binary_Property/ID_Continue/code-points.js"
).filter(function (ch) {
return ch > 0x7f && search(start, ch, last + 1) == -1;
})
);
Expand Down
8 changes: 5 additions & 3 deletions packages/babel-node/src/_babel-node.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,11 @@ if (program.eval || program.print) {
// We have to handle require ourselves, as we want to require it in the context of babel-register
function requireArgs() {
if (program.require) {
require(require.resolve(program.require, {
paths: [process.cwd()],
}));
require(
require.resolve(program.require, {
paths: [process.cwd()],
}),
);
}
}
function replEval(
Expand Down
Loading

0 comments on commit c39fda2

Please sign in to comment.