cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rely entirely on sourceType for module vs script differentiation. (#7417)

Browse Source
This commit is contained in:
Logan Smyth 2018-02-27 18:11:13 -08:00 committed by GitHub
parent bf8b25289b
commit ddd40bf5c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
packages/babel-core/test/api.js
View File

@ -214,6 +214,7 @@ describe("api", function() {
function execTest(passPerPreset) {
return babel.transform("type Foo = number; let x = (y): Foo => y;", {
sourceType: "script",
passPerPreset: passPerPreset,
presets: [
// First preset with our plugin, "before"

2
packages/babel-helper-module-imports/src/import-injector.js
View File

@ -209,7 +209,7 @@ export default class ImportInjector {
// to a variable.
let name = nameHint || importName;
const isMod = isModule(this._programPath, true);
const isMod = isModule(this._programPath);
const isModuleForNode = isMod && importingInterop === "node";
const isModuleForBabel = isMod && importingInterop === "babel";

24
packages/babel-helper-module-imports/src/is-module.js
View File

@ -1,11 +1,7 @@
/**
* A small utility to check if a file qualifies as a module, based on a few
* possible conditions.
* A small utility to check if a file qualifies as a module.
*/
export default function isModule(
path: NodePath,
requireUnambiguous: boolean = false,
) {
export default function isModule(path: NodePath) {
const { sourceType } = path.node;
if (sourceType !== "module" && sourceType !== "script") {
throw path.buildCodeFrameError(
@ -13,19 +9,5 @@ export default function isModule(
);
}
const filename = path.hub.file.opts.filename;
if (/\.mjs$/.test(filename)) {
requireUnambiguous = false;
}
return (
path.node.sourceType === "module" &&
(!requireUnambiguous || isUnambiguousModule(path))
);
}
// This approach is not ideal. It is here to preserve compatibility for now,
// but really this should just return true or be deleted.
function isUnambiguousModule(path) {
return path.get("body").some(p => p.isModuleDeclaration());
return path.node.sourceType === "module";
}

1
packages/babel-helper-transform-fixture-test-runner/src/index.js
View File

@ -330,6 +330,7 @@ function run(task) {
const newOpts = merge(
{
filename: self.loc,
sourceType: "unambiguous",
},
opts,
);

1
packages/babel-plugin-transform-modules-amd/test/fixtures/amd/get-module-name-option/options.json vendored
View File

@ -1,4 +1,5 @@
{
"sourceType": "module",
"moduleIds": true,
"moduleId": "my custom module name"
}

1
packages/babel-plugin-transform-modules-amd/test/fixtures/amd/module-name/options.json vendored
View File

@ -1,3 +1,4 @@
{
"sourceType": "module",
"moduleIds": true
}

1
packages/babel-plugin-transform-modules-amd/test/fixtures/loose/get-module-name-option/options.json vendored
View File

@ -1,4 +1,5 @@
{
"sourceType": "module",
"moduleIds": true,
"moduleId": "my custom module name",
"plugins": [

1
packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name/options.json vendored
View File

@ -1,4 +1,5 @@
{
"sourceType": "module",
"moduleIds": true,
"plugins": [
"external-helpers",

4
packages/babel-plugin-transform-modules-commonjs/src/index.js
View File

@ -98,9 +98,7 @@ export default function(api, options) {
visitor: {
Program: {
exit(path) {
// For now this requires unambiguous rather that just sourceType
// because Babel currently parses all files as sourceType:module.
if (!isModule(path, true /* requireUnambiguous */)) return;
if (!isModule(path)) return;
// Rename the bindings auto-injected into the scope so there is no
// risk of conflict between the bindings.

1
packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/options.json vendored
View File

@ -1,4 +1,5 @@
{
"sourceType": "module",
"moduleIds": true,
"moduleId": "my custom module name",
"plugins": [

1
packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id/options.json vendored
View File

@ -1,4 +1,5 @@
{
"sourceType": "module",
"moduleId": "MyLib",
"plugins": [
"external-helpers",

1
packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/options.json vendored
View File

@ -1,4 +1,5 @@
{
"sourceType": "module",
"moduleIds": true,
"plugins": [
"external-helpers",

1
packages/babel-plugin-transform-modules-umd/test/fixtures/umd/get-module-name-option/options.json vendored
View File

@ -1,4 +1,5 @@
{
"sourceType": "module",
"moduleIds": true,
"moduleId": "my custom module name"
}

1
packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id/options.json vendored
View File

@ -1,3 +1,4 @@
{
"sourceType": "module",
"moduleId": "MyLib"
}

1
packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/options.json vendored
View File

@ -1,3 +1,4 @@
{
"sourceType": "module",
"moduleIds": true
}

4
packages/babel-preset-env-standalone/test/babel-preset-env.js
View File

@ -7,6 +7,7 @@ require("../babel-preset-env");
describe("babel-preset-env-standalone", () => {
it("works w/o targets", () => {
const output = Babel.transform("const a = 1;", {
sourceType: "script",
presets: ["env"],
}).code;
assert.equal(output, "var a = 1;");
@ -14,6 +15,7 @@ describe("babel-preset-env-standalone", () => {
it("doesn't transpile `const` with chrome 60", () => {
const output = Babel.transform("const a = 1;", {
sourceType: "script",
presets: [
[
"env",
@ -30,6 +32,7 @@ describe("babel-preset-env-standalone", () => {
it("transpiles `const` with chrome 60 and preset-es2015", () => {
const output = Babel.transform("const a = 1;", {
sourceType: "script",
presets: [
[
"env",
@ -47,6 +50,7 @@ describe("babel-preset-env-standalone", () => {
it("uses transform-new-targets plugin", () => {
const output = Babel.transform("function Foo() {new.target}", {
sourceType: "script",
presets: ["env"],
}).code;
assert.equal(

1
packages/babel-preset-env/test/fixtures/preset-options-add-used-built-ins/test-modules-tranform/options.json vendored
View File

@ -1,4 +1,5 @@
{
"sourceType": "module",
"presets": [
["../../../../lib", {
"useBuiltIns": "usage"

1
packages/babel-preset-env/test/fixtures/preset-options/shippedProposals-use-builtins-usage/options.json vendored
View File

@ -1,4 +1,5 @@
{
"sourceType": "module",
"presets": [
["../../../../lib", {
"shippedProposals": true,

3
packages/babel-standalone/test/babel.js
View File

@ -16,6 +16,7 @@ describe("@babel/standalone", () => {
});
it("handles the es2015-loose preset", () => {
const output = Babel.transform("class A {}", {
sourceType: "script",
presets: ["es2015-loose"],
}).code;
assert.equal(output, "var A = function A() {};");
@ -52,7 +53,7 @@ describe("@babel/standalone", () => {
},
},
],
sourceType: "module",
sourceType: "script",
};
const output = Babel.transformFromAst(ast, "42", { presets: ["es2015"] })
.code;