[internal] Use the Node.js behavior for default imports (#12795)

This commit is contained in:
Nicolò Ribaudo
2021-03-04 13:55:15 +01:00
committed by GitHub
parent ac758f7d70
commit d9ebfab07f
6 changed files with 74 additions and 16 deletions

View File

@@ -13,10 +13,12 @@ import assert from "assert";
import fs from "fs";
import path from "path";
import vm from "vm";
import checkDuplicatedNodes from "babel-check-duplicated-nodes";
import QuickLRU from "quick-lru";
import escapeRegExp from "./escape-regexp.cjs";
import _checkDuplicatedNodes from "babel-check-duplicated-nodes";
const checkDuplicatedNodes = _checkDuplicatedNodes.default;
const EXTERNAL_HELPERS_VERSION = "7.100.0";
const cachedScripts = new QuickLRU({ maxSize: 10 });

View File

@@ -1,7 +1,8 @@
/// <reference path="../../../lib/third-party-libs.d.ts" />
import jsTokens, * as jsTokensNs from "js-tokens";
import type { Token, JSXToken } from "js-tokens";
import jsTokens from "js-tokens";
import {
isStrictReservedWord,
isKeyword,
@@ -158,9 +159,6 @@ if (process.env.BABEL_8_BREAKING) {
}
};
} else {
// This is only available in js-tokens@4, and not in js-tokens@6
const { matchToToken } = jsTokensNs as any;
/**
* RegExp to test for what seems to be a JSX tag name.
*/
@@ -204,8 +202,8 @@ if (process.env.BABEL_8_BREAKING) {
tokenize = function* (text: string) {
let match;
while ((match = (jsTokens as any).exec(text))) {
const token = matchToToken(match);
while ((match = (jsTokens as any).default.exec(text))) {
const token = (jsTokens as any).matchToToken(match);
yield {
type: getTokenType(token, match.index, text),

View File

@@ -5,9 +5,12 @@ import { types as t } from "@babel/core";
import { hasMinVersion } from "./helpers";
import getRuntimePath from "./get-runtime-path";
import pluginCorejs2 from "babel-plugin-polyfill-corejs2";
import pluginCorejs3 from "babel-plugin-polyfill-corejs3";
import pluginRegenerator from "babel-plugin-polyfill-regenerator";
import _pluginCorejs2 from "babel-plugin-polyfill-corejs2";
import _pluginCorejs3 from "babel-plugin-polyfill-corejs3";
import _pluginRegenerator from "babel-plugin-polyfill-regenerator";
const pluginCorejs2 = _pluginCorejs2.default;
const pluginCorejs3 = _pluginCorejs3.default;
const pluginRegenerator = _pluginRegenerator.default;
const pluginsCompat = "#__secret_key__@babel/runtime__compatibility";

View File

@@ -16,9 +16,12 @@ import overlappingPlugins from "@babel/compat-data/overlapping-plugins";
import removeRegeneratorEntryPlugin from "./polyfills/regenerator";
import legacyBabelPolyfillPlugin from "./polyfills/babel-polyfill";
import pluginCoreJS2 from "babel-plugin-polyfill-corejs2";
import pluginCoreJS3 from "babel-plugin-polyfill-corejs3";
import pluginRegenerator from "babel-plugin-polyfill-regenerator";
import _pluginCoreJS2 from "babel-plugin-polyfill-corejs2";
import _pluginCoreJS3 from "babel-plugin-polyfill-corejs3";
import _pluginRegenerator from "babel-plugin-polyfill-regenerator";
const pluginCoreJS2 = _pluginCoreJS2.default;
const pluginCoreJS3 = _pluginCoreJS3.default;
const pluginRegenerator = _pluginRegenerator.default;
import getTargets, {
prettifyTargets,