Skip to content

Commit 5315446

Browse files
nicolo-ribaudonicolo-ribaudo
authored
[babel 8] Remove babel 7-specific imports (#17111)
1 parent 6eecc4c commit 5315446

File tree

21 files changed

+170
-93
lines changed

21 files changed

+170
-93
lines changed

‎babel.config.js

+118-21
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,16 @@ module.exports = function (api) {
244244
name: "process.env.IS_PUBLISH",
245245
value: bool(process.env.IS_PUBLISH),
246246
},
247+
"flag-IS_PUBLISH",
247248
],
248249

249-
process.env.STRIP_BABEL_8_FLAG && [
250+
[
250251
pluginToggleBooleanFlag,
251252
{
252253
name: "process.env.BABEL_8_BREAKING",
253-
value: bool(process.env.BABEL_8_BREAKING),
254+
value: process.env.STRIP_BABEL_8_FLAG
255+
? bool(process.env.BABEL_8_BREAKING)
256+
: null,
254257
},
255258
"flag-BABEL_8_BREAKING",
256259
],
@@ -572,39 +575,48 @@ function pluginPolyfillsOldNode({ template, types: t }) {
572575
}
573576

574577
/**
578+
* If `value` is null, it will leave the conditions in code. It will remove
579+
* them in attributes by replacing them with <if true> || <if false>
580+
*
575581
* @param {import("@babel/core")} pluginAPI
576582
* @returns {import("@babel/core").PluginObject}
577583
*/
578-
function pluginToggleBooleanFlag({ types: t }, { name, value }) {
579-
if (typeof value !== "boolean") throw new Error(`.value must be a boolean`);
584+
function pluginToggleBooleanFlag({ types: t, template }, { name, value }) {
585+
if (typeof value !== "boolean" && value !== null) {
586+
throw new Error(`.value must be a boolean, or null`);
587+
}
580588

581-
function evaluate(test) {
589+
function parseExpression(source) {
590+
// eslint-disable-next-line regexp/no-useless-assertions
591+
return template.expression(source, { placeholderPattern: /(?!.)./ })({});
592+
}
593+
594+
/**
595+
* @param {import("@babel/core").types.Expression} test
596+
*/
597+
function evaluate(test, value) {
582598
const res = {
583599
replace: replacement => ({ replacement, value: null, unrelated: false }),
584600
value: value => ({ replacement: null, value, unrelated: false }),
585-
unrelated: () => ({
586-
replacement: test.node,
587-
value: null,
588-
unrelated: true,
589-
}),
601+
unrelated: () => ({ replacement: test, value: null, unrelated: true }),
590602
};
591603

592-
if (test.isIdentifier({ name }) || test.matchesPattern(name)) {
604+
if (t.isIdentifier(test, { name }) || t.matchesPattern(test, name)) {
593605
return res.value(value);
594606
}
595607

596-
if (test.isUnaryExpression({ operator: "!" })) {
597-
const arg = evaluate(test.get("argument"));
608+
if (t.isUnaryExpression(test, { operator: "!" })) {
609+
const arg = evaluate(test.argument, value);
598610
return arg.unrelated
599611
? res.unrelated()
600612
: arg.replacement
601613
? res.replacement(t.unaryExpression("!", arg.replacement))
602614
: res.value(!arg.value);
603615
}
604616

605-
if (test.isLogicalExpression({ operator: "||" })) {
606-
const left = evaluate(test.get("left"));
607-
const right = evaluate(test.get("right"));
617+
if (t.isLogicalExpression(test, { operator: "||" })) {
618+
const left = evaluate(test.left, value);
619+
const right = evaluate(test.right, value);
608620

609621
if (left.value === true || right.value === true) return res.value(true);
610622
if (left.value === false && right.value === false) {
@@ -618,9 +630,9 @@ function pluginToggleBooleanFlag({ types: t }, { name, value }) {
618630
);
619631
}
620632

621-
if (test.isLogicalExpression({ operator: "&&" })) {
622-
const left = evaluate(test.get("left"));
623-
const right = evaluate(test.get("right"));
633+
if (t.isLogicalExpression(test, { operator: "&&" })) {
634+
const left = evaluate(test.left, value);
635+
const right = evaluate(test.right, value);
624636

625637
if (left.value === true && right.value === true) return res.value(true);
626638
if (left.value === false || right.value === false) {
@@ -640,6 +652,8 @@ function pluginToggleBooleanFlag({ types: t }, { name, value }) {
640652
return {
641653
visitor: {
642654
"IfStatement|ConditionalExpression"(path) {
655+
if (value === null) return;
656+
643657
let test = path.get("test");
644658

645659
// yarn-plugin-conditions injects bool(process.env.BABEL_8_BREAKING)
@@ -652,7 +666,7 @@ function pluginToggleBooleanFlag({ types: t }, { name, value }) {
652666
test = test.get("arguments")[0];
653667
}
654668

655-
const res = evaluate(test);
669+
const res = evaluate(test.node, value);
656670

657671
if (res.unrelated) return;
658672
if (res.replacement) {
@@ -666,7 +680,9 @@ function pluginToggleBooleanFlag({ types: t }, { name, value }) {
666680
}
667681
},
668682
LogicalExpression(path) {
669-
const res = evaluate(path);
683+
if (value === null) return;
684+
685+
const res = evaluate(path.node, value);
670686
if (res.unrelated) return;
671687
if (res.replacement) {
672688
path.replaceWith(res.replacement);
@@ -675,15 +691,90 @@ function pluginToggleBooleanFlag({ types: t }, { name, value }) {
675691
}
676692
},
677693
MemberExpression(path) {
694+
if (value === null) return;
695+
678696
if (path.matchesPattern(name)) {
679697
throw path.buildCodeFrameError("This check could not be stripped.");
680698
}
681699
},
682700
ReferencedIdentifier(path) {
701+
if (value === null) return;
702+
683703
if (path.node.name === name) {
684704
throw path.buildCodeFrameError("This check could not be stripped.");
685705
}
686706
},
707+
ImportDeclaration(path) {
708+
if (!path.node.attributes) return;
709+
710+
/** @type {null | import("@babel/core").NodePath<import("@babel/core").types.ImportAttribute>} */
711+
const ifAttribute = path
712+
.get("attributes")
713+
.find(attr => attr.node.key.name === "if");
714+
if (ifAttribute == null) {
715+
return;
716+
}
717+
718+
const condition = parseExpression(ifAttribute.node.value.value);
719+
720+
let res;
721+
res_block: if (value !== null) {
722+
res = evaluate(condition, value);
723+
} else {
724+
const ifTrue = evaluate(condition, true);
725+
if (ifTrue.unrelated || ifTrue.value === true) {
726+
res = ifTrue;
727+
break res_block;
728+
}
729+
const ifFalse = evaluate(condition, false);
730+
if (ifFalse.unrelated) throw new Error("Cannot be unrelated");
731+
if (ifFalse.value === true) {
732+
res = ifFalse;
733+
break res_block;
734+
}
735+
736+
if (ifTrue.value === false) {
737+
res = ifFalse;
738+
break res_block;
739+
}
740+
if (ifTrue.value === false) {
741+
res = ifTrue;
742+
break res_block;
743+
}
744+
745+
if (!ifTrue.replacement && !ifFalse.replacement) {
746+
throw new Error("Expected two replacements");
747+
}
748+
749+
res = {
750+
replacement: t.binaryExpression(
751+
"||",
752+
ifTrue.replacement,
753+
ifFalse.replacement
754+
),
755+
value: null,
756+
unrelated: false,
757+
};
758+
}
759+
760+
if (res.unrelated) return;
761+
if (res.replacement) {
762+
ifAttribute
763+
.get("value")
764+
.replaceWith(
765+
t.stringLiteral(
766+
ifAttribute.toString.call({ node: res.replacement })
767+
)
768+
);
769+
} else if (res.value === true) {
770+
ifAttribute.remove();
771+
if (path.node.attributes.length === 0) {
772+
path.node.attributes = null;
773+
}
774+
} else if (res.value === false) {
775+
path.remove();
776+
}
777+
},
687778
},
688779
};
689780
}
@@ -916,6 +1007,12 @@ function pluginImportMetaUrl({ types: t, template }) {
9161007

9171008
// Let's just remove this declaration to unshadow the "global" cjs require.
9181009
path.remove();
1010+
path.scope.crawl();
1011+
1012+
const createRequireBinding = path.scope.getBinding("createRequire");
1013+
if (!createRequireBinding.referenced) {
1014+
createRequireBinding.path.remove();
1015+
}
9191016
},
9201017

9211018
// import.meta.url

‎packages/babel-core/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ export const DEFAULT_EXTENSIONS = Object.freeze([
9292
".cjs",
9393
] as const);
9494

95-
import Module from "module";
96-
import * as thisFile from "./index.ts";
95+
import Module from "module" with { if: "USE_ESM && !IS_STANDALONE" };
96+
import * as thisFile from "./index.ts" with { if: "USE_ESM && !IS_STANDALONE" };
9797
if (USE_ESM && !IS_STANDALONE) {
9898
// Pass this module to the CJS proxy, so that it can be synchronously accessed.
9999
const cjsProxy = Module.createRequire(import.meta.url)("../cjs-proxy.cjs");

‎packages/babel-core/src/transformation/file/babel-7-helpers.cjs

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
// TODO(Babel 8): Remove this file
22

3-
exports.getModuleName = () =>
4-
require("@babel/helper-module-transforms").getModuleName;
3+
if (!process.env.BABEL_8_BREAKING) {
4+
exports.getModuleName = () =>
5+
require("@babel/helper-module-transforms").getModuleName;
6+
} else if (process.env.IS_PUBLISH) {
7+
throw new Error(
8+
"Internal Babel error: This file should only be loaded in Babel 7",
9+
);
10+
}

‎packages/babel-core/src/transformation/file/file.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import semver from "semver";
1010
import type { NormalizedFile } from "../normalize-file.ts";
1111

1212
// @ts-expect-error This file is `any`
13-
import * as babel7 from "./babel-7-helpers.cjs";
13+
import babel7 from "./babel-7-helpers.cjs" with { if: "!process.env.BABEL_8_BREAKING && (!USE_ESM || IS_STANDALONE)" };
1414

1515
const errorVisitor: Visitor<{ loc: t.SourceLocation | null }> = {
1616
enter(path, state) {

‎packages/babel-helper-create-class-features-plugin/src/decorators-2018-09.ts

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
// TODO(Babel 8): Remove this file
2+
if (process.env.BABEL_8_BREAKING && process.env.IS_PUBLISH) {
3+
throw new Error(
4+
"Internal Babel error: This file should only be loaded in Babel 7",
5+
);
6+
}
27

38
import { types as t, template } from "@babel/core";
49
import type { File, NodePath } from "@babel/core";
510
import ReplaceSupers from "@babel/helper-replace-supers";
611

712
type Decoratable = Extract<t.Node, { decorators?: t.Decorator[] | null }>;
813

9-
export function hasOwnDecorators(node: t.Class | t.ClassBody["body"][number]) {
10-
// @ts-expect-error: 'decorators' not in TSIndexSignature
11-
return !!node.decorators?.length;
12-
}
13-
14-
export function hasDecorators(node: t.Class) {
15-
return hasOwnDecorators(node) || node.body.body.some(hasOwnDecorators);
16-
}
17-
1814
function prop(key: string, value?: t.Expression) {
1915
if (!value) return null;
2016
return t.objectProperty(t.identifier(key), value);

‎packages/babel-helper-create-class-features-plugin/src/decorators.ts

+9
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ import {
99
} from "./fields.ts";
1010
import { memoiseComputedKey } from "./misc.ts";
1111

12+
export function hasOwnDecorators(node: t.Class | t.ClassBody["body"][number]) {
13+
// @ts-expect-error: 'decorators' not in TSIndexSignature
14+
return !!node.decorators?.length;
15+
}
16+
17+
export function hasDecorators(node: t.Class) {
18+
return hasOwnDecorators(node) || node.body.body.some(hasOwnDecorators);
19+
}
20+
1221
// We inline this package
1322
// eslint-disable-next-line import/no-extraneous-dependencies
1423
import * as charCodes from "charcodes";

‎packages/babel-helper-create-class-features-plugin/src/features.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { File, types as t } from "@babel/core";
22
import type { NodePath } from "@babel/core";
3-
import { hasOwnDecorators } from "./decorators-2018-09.ts";
3+
import { hasOwnDecorators } from "./decorators.ts";
44

55
export const FEATURES = Object.freeze({
66
//classes: 1 << 0,

‎packages/babel-helper-create-class-features-plugin/src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { types as t } from "@babel/core";
22
import type { PluginAPI, PluginObject, NodePath } from "@babel/core";
3-
import createDecoratorTransform from "./decorators.ts";
4-
import type { DecoratorVersionKind } from "./decorators.ts";
53

64
import semver from "semver";
75

@@ -13,7 +11,9 @@ import {
1311
buildCheckInRHS,
1412
} from "./fields.ts";
1513
import type { PropPath } from "./fields.ts";
16-
import { buildDecoratedClass, hasDecorators } from "./decorators-2018-09.ts";
14+
import createDecoratorTransform, { hasDecorators } from "./decorators.ts";
15+
import type { DecoratorVersionKind } from "./decorators.ts";
16+
import { buildDecoratedClass } from "./decorators-2018-09.ts" with { if: "!process.env.BABEL_8_BREAKING" };
1717
import { injectInitialization, extractComputedKeys } from "./misc.ts";
1818
import {
1919
enableFeature,

‎packages/babel-plugin-transform-for-of/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { declare } from "@babel/helper-plugin-utils";
22
import { template, types as t, type NodePath } from "@babel/core";
33

4-
import transformWithoutHelper from "./no-helper-implementation.ts";
4+
import transformWithoutHelper from "./no-helper-implementation.ts" with { if: "!process.env.BABEL_8_BREAKING" };
55
import { skipTransparentExprWrapperNodes } from "@babel/helper-skip-transparent-expression-wrappers";
66

77
export interface Options {

‎packages/babel-plugin-transform-for-of/src/no-helper-implementation.ts

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
if (process.env.BABEL_8_BREAKING && process.env.IS_PUBLISH) {
2+
throw new Error(
3+
"Internal Babel error: This file should only be loaded in Babel 7",
4+
);
5+
}
6+
17
import { template, types as t } from "@babel/core";
28
import type { PluginPass, NodePath } from "@babel/core";
39

‎packages/babel-plugin-transform-runtime/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { hasMinVersion } from "./helpers.ts";
66
import getRuntimePath, { resolveFSPath } from "./get-runtime-path/index.ts";
77

88
// TODO(Babel 8): Remove this
9-
import babel7 from "./babel-7/index.cjs";
9+
import babel7 from "./babel-7/index.cjs" with { if: "!process.env.BABEL_8_BREAKING" };
1010

1111
export interface Options {
1212
absoluteRuntime?: boolean;

0 commit comments

Comments
 (0)