From 292c3ca2061c6b86a09622d6552621eb57ec3b38 Mon Sep 17 00:00:00 2001 From: Sergey Rubanov Date: Mon, 16 Jan 2017 19:25:04 +0300 Subject: [PATCH] Refactor test packages to use ES modules instead of CJS (#5138) --- packages/babel-code-frame/test/index.js | 6 +-- packages/babel-core/test/api.js | 12 +++--- packages/babel-core/test/browserify.js | 8 ++-- packages/babel-core/test/config-chain.js | 6 +-- packages/babel-core/test/evaluation.js | 6 +-- .../test/get-possible-plugin-names.js | 4 +- .../test/get-possible-preset-names.js | 4 +- packages/babel-core/test/path.js | 6 +-- packages/babel-core/test/plugins.js | 4 +- packages/babel-core/test/resolution.js | 10 ++--- packages/babel-core/test/transformation.js | 4 +- packages/babel-core/test/util.js | 6 +-- packages/babel-generator/test/index.js | 39 ++++++++++--------- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../src/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../src/index.js | 7 +++- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- .../test/index.js | 4 +- packages/babel-preset-es2015/test/esnext.js | 4 +- packages/babel-preset-es2015/test/index.js | 4 +- .../test/preset-options.js | 4 +- packages/babel-preset-es2015/test/traceur.js | 5 ++- packages/babel-preset-latest/test/index.js | 4 +- packages/babel-template/test/index.js | 6 +-- packages/babel-types/test/cloning.js | 6 +-- packages/babel-types/test/validators.js | 6 +-- 75 files changed, 247 insertions(+), 126 deletions(-) diff --git a/packages/babel-code-frame/test/index.js b/packages/babel-code-frame/test/index.js index b00b88386db4..e11f0c8a7f91 100644 --- a/packages/babel-code-frame/test/index.js +++ b/packages/babel-code-frame/test/index.js @@ -1,6 +1,6 @@ -const assert = require("assert"); -const chalk = require("chalk"); -const codeFrame = require(".."); +import assert from "assert"; +import chalk from "chalk"; +import codeFrame from ".."; describe("babel-code-frame", function () { it("basic usage", function () { diff --git a/packages/babel-core/test/api.js b/packages/babel-core/test/api.js index 70823258e5cf..6342792020af 100644 --- a/packages/babel-core/test/api.js +++ b/packages/babel-core/test/api.js @@ -1,9 +1,9 @@ -const babel = require("../lib/api/node"); -const buildExternalHelpers = require("../lib/tools/build-external-helpers"); -const sourceMap = require("source-map"); -const assert = require("assert"); -const Plugin = require("../lib/transformation/plugin"); -const generator = require("babel-generator").default; +import * as babel from "../lib/api/node"; +import buildExternalHelpers from "../lib/tools/build-external-helpers"; +import sourceMap from "source-map"; +import assert from "assert"; +import Plugin from "../lib/transformation/plugin"; +import generator from "babel-generator"; function assertIgnored(result) { assert.ok(result.ignored); diff --git a/packages/babel-core/test/browserify.js b/packages/babel-core/test/browserify.js index 730ace945ab7..e8e8f27c829a 100644 --- a/packages/babel-core/test/browserify.js +++ b/packages/babel-core/test/browserify.js @@ -1,7 +1,7 @@ -const browserify = require("browserify"); -const assert = require("assert"); -const path = require("path"); -const vm = require("vm"); +import browserify from "browserify"; +import assert from "assert"; +import path from "path"; +import vm from "vm"; describe("browserify", function() { it("babel/register may be used without breaking browserify", function(done) { diff --git a/packages/babel-core/test/config-chain.js b/packages/babel-core/test/config-chain.js index 95d17eeb15dc..71df017004af 100644 --- a/packages/babel-core/test/config-chain.js +++ b/packages/babel-core/test/config-chain.js @@ -1,6 +1,6 @@ -const assert = require("assert"); -const path = require("path"); -const buildConfigChain = require("../lib/transformation/file/options/build-config-chain"); +import assert from "assert"; +import path from "path"; +import buildConfigChain from "../lib/transformation/file/options/build-config-chain"; function fixture() { const args = [__dirname, "fixtures", "config"]; diff --git a/packages/babel-core/test/evaluation.js b/packages/babel-core/test/evaluation.js index 4378bb417649..b0741a5149b0 100644 --- a/packages/babel-core/test/evaluation.js +++ b/packages/babel-core/test/evaluation.js @@ -1,6 +1,6 @@ -const traverse = require("babel-traverse").default; -const assert = require("assert"); -const parse = require("babylon").parse; +import traverse from "babel-traverse"; +import assert from "assert"; +import { parse } from "babylon"; describe("evaluation", function () { function addTest(code, type, value, notConfident) { diff --git a/packages/babel-core/test/get-possible-plugin-names.js b/packages/babel-core/test/get-possible-plugin-names.js index d9d730bd6cda..7ce864476924 100644 --- a/packages/babel-core/test/get-possible-plugin-names.js +++ b/packages/babel-core/test/get-possible-plugin-names.js @@ -1,5 +1,5 @@ -const assert = require("assert"); -const getPossiblePluginNames = require("../lib/helpers/get-possible-plugin-names"); +import assert from "assert"; +import getPossiblePluginNames from "../lib/helpers/get-possible-plugin-names"; describe("getPossiblePluginNames", function () { it("adds the babel-plugin prefix", function() { diff --git a/packages/babel-core/test/get-possible-preset-names.js b/packages/babel-core/test/get-possible-preset-names.js index 64de8897b884..df32d037ee29 100644 --- a/packages/babel-core/test/get-possible-preset-names.js +++ b/packages/babel-core/test/get-possible-preset-names.js @@ -1,5 +1,5 @@ -const assert = require("assert"); -const getPossiblePresetNames = require("../lib/helpers/get-possible-preset-names"); +import assert from "assert"; +import getPossiblePresetNames from "../lib/helpers/get-possible-preset-names"; describe("getPossiblePresetNames", function () { it("adds the babel-preset prefix", function() { diff --git a/packages/babel-core/test/path.js b/packages/babel-core/test/path.js index e60c68c9f8b6..72642c64801a 100644 --- a/packages/babel-core/test/path.js +++ b/packages/babel-core/test/path.js @@ -1,6 +1,6 @@ -const transform = require("../lib/api/node").transform; -const Plugin = require("../lib/transformation/plugin"); -const chai = require("chai"); +import { transform } from "../lib/api/node"; +import Plugin from "../lib/transformation/plugin"; +import chai from "chai"; describe("traversal path", function () { it("replaceWithSourceString", function () { diff --git a/packages/babel-core/test/plugins.js b/packages/babel-core/test/plugins.js index 1ca0caf9cab7..0f1e3245adc4 100644 --- a/packages/babel-core/test/plugins.js +++ b/packages/babel-core/test/plugins.js @@ -1 +1,3 @@ -require("babel-helper-transform-fixture-test-runner")(__dirname + "/fixtures/plugins", "plugins"); +import runner from "babel-helper-transform-fixture-test-runner"; + +runner(`${__dirname}/fixtures/plugins`, "plugins"); diff --git a/packages/babel-core/test/resolution.js b/packages/babel-core/test/resolution.js index 622ddac038c8..21d945706dae 100644 --- a/packages/babel-core/test/resolution.js +++ b/packages/babel-core/test/resolution.js @@ -1,8 +1,8 @@ -const assert = require("assert"); -const async = require("async"); -const babel = require("../lib/api/node"); -const fs = require("fs"); -const path = require("path"); +import assert from "assert"; +import async from "async"; +import * as babel from "../lib/api/node"; +import fs from "fs"; +import path from "path"; // Test that plugins & presets are resolved relative to `filename`. describe("addon resolution", function () { diff --git a/packages/babel-core/test/transformation.js b/packages/babel-core/test/transformation.js index 1bacd8562388..6b663895d6bb 100644 --- a/packages/babel-core/test/transformation.js +++ b/packages/babel-core/test/transformation.js @@ -1 +1,3 @@ -require("babel-helper-transform-fixture-test-runner")(__dirname + "/fixtures/transformation", "transformation"); +import runner from "babel-helper-transform-fixture-test-runner"; + +runner(`${__dirname}/fixtures/transformation`, "transformation"); diff --git a/packages/babel-core/test/util.js b/packages/babel-core/test/util.js index 1e879f41a585..5d84ad41f679 100644 --- a/packages/babel-core/test/util.js +++ b/packages/babel-core/test/util.js @@ -1,6 +1,6 @@ -const assert = require("assert"); -const util = require("../lib/util"); -const t = require("babel-types"); +import assert from "assert"; +import * as util from "../lib/util"; +import * as t from "babel-types"; describe("util", function () { it("canCompile", function () { diff --git a/packages/babel-generator/test/index.js b/packages/babel-generator/test/index.js index cb4141d92b30..813bd57f592d 100644 --- a/packages/babel-generator/test/index.js +++ b/packages/babel-generator/test/index.js @@ -1,12 +1,13 @@ -const Whitespace = require("../lib/whitespace"); -const Printer = require("../lib/printer"); -const generate = require("../lib"); -const assert = require("assert"); -const parse = require("babylon").parse; -const chai = require("chai"); -const t = require("babel-types"); -const fs = require("fs"); -const path = require("path"); +import Whitespace from "../lib/whitespace"; +import Printer from "../lib/printer"; +import generate from "../lib"; +import assert from "assert"; +import { parse } from "babylon"; +import chai from "chai"; +import * as t from "babel-types"; +import fs from "fs"; +import path from "path"; +import fixtures from "babel-helper-fixtures"; describe("generation", function () { it("completeness", function () { @@ -39,7 +40,7 @@ describe("generation", function () { } }; - const generated = generate.default(combinedAst, { sourceMaps: true }, sources); + const generated = generate(combinedAst, { sourceMaps: true }, sources); chai.expect(generated.map).to.deep.equal({ version: 3, @@ -140,7 +141,7 @@ describe("generation", function () { id2.name += "2"; id2.loc.identiferName = "bar"; - const generated = generate.default(ast, { + const generated = generate(ast, { filename: "inline", sourceFileName: "inline", sourceMaps: true @@ -191,7 +192,7 @@ describe("generation", function () { const code = "function hi (msg) { console.log(msg); }\n"; const ast = parse(code, { filename: "a.js" }).program; - const generated = generate.default(ast, { + const generated = generate(ast, { sourceFileName: "a.js", sourceMaps: true, }); @@ -209,7 +210,7 @@ describe("programmatic generation", function() { it("numeric member expression", function() { // Should not generate `0.foo` const mem = t.memberExpression(t.numericLiteral(60702), t.identifier("foo")); - new Function(generate.default(mem).code); + new Function(generate(mem).code); }); it("nested if statements needs block", function() { @@ -225,7 +226,7 @@ describe("programmatic generation", function() { t.expressionStatement(t.stringLiteral("alt")) ); - const ast = parse(generate.default(ifStatement).code); + const ast = parse(generate(ifStatement).code); assert.equal(ast.program.body[0].consequent.type, "BlockStatement"); }); @@ -235,7 +236,7 @@ describe("programmatic generation", function() { [t.directive(t.directiveLiteral("use strict"))] ); - const output = generate.default(blockStatement).code; + const output = generate(blockStatement).code; assert.equal(output, [ "{", " \"use strict\";", @@ -255,7 +256,7 @@ describe("programmatic generation", function() { null ); - const output = generate.default(objectStatement).code; + const output = generate(objectStatement).code; assert.equal(output, [ "{", " bar: string;", @@ -275,7 +276,7 @@ describe("programmatic generation", function() { ] ); - const output = generate.default(objectStatement).code; + const output = generate(objectStatement).code; assert.equal(output, [ "{", @@ -292,7 +293,7 @@ describe("whitespace", function () { }); }); -const suites = require("babel-helper-fixtures").default(__dirname + "/fixtures"); +const suites = fixtures(`${__dirname}/fixtures`); suites.forEach(function (testSuite) { describe("generation/" + testSuite.title, function () { @@ -309,7 +310,7 @@ suites.forEach(function (testSuite) { strictMode: false, sourceType: "module", }); - const result = generate.default(actualAst, task.options, actualCode); + const result = generate(actualAst, task.options, actualCode); if (!expect.code && result.code && fs.statSync(path.dirname(expect.loc)).isDirectory() && !process.env.CI) { console.log(`New test file created: ${expect.loc}`); diff --git a/packages/babel-plugin-check-es2015-constants/test/index.js b/packages/babel-plugin-check-es2015-constants/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-check-es2015-constants/test/index.js +++ b/packages/babel-plugin-check-es2015-constants/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-syntax-trailing-function-commas/test/index.js b/packages/babel-plugin-syntax-trailing-function-commas/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-syntax-trailing-function-commas/test/index.js +++ b/packages/babel-plugin-syntax-trailing-function-commas/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-async-generator-functions/test/index.js b/packages/babel-plugin-transform-async-generator-functions/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-async-generator-functions/test/index.js +++ b/packages/babel-plugin-transform-async-generator-functions/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-async-to-generator/test/index.js b/packages/babel-plugin-transform-async-to-generator/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/index.js +++ b/packages/babel-plugin-transform-async-to-generator/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-async-to-module-method/test/index.js b/packages/babel-plugin-transform-async-to-module-method/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-async-to-module-method/test/index.js +++ b/packages/babel-plugin-transform-async-to-module-method/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-class-constructor-call/test/index.js b/packages/babel-plugin-transform-class-constructor-call/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-class-constructor-call/test/index.js +++ b/packages/babel-plugin-transform-class-constructor-call/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-class-properties/test/index.js b/packages/babel-plugin-transform-class-properties/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-class-properties/test/index.js +++ b/packages/babel-plugin-transform-class-properties/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-decorators/test/index.js b/packages/babel-plugin-transform-decorators/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-decorators/test/index.js +++ b/packages/babel-plugin-transform-decorators/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-do-expressions/test/index.js b/packages/babel-plugin-transform-do-expressions/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-do-expressions/test/index.js +++ b/packages/babel-plugin-transform-do-expressions/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-arrow-functions/test/index.js b/packages/babel-plugin-transform-es2015-arrow-functions/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-arrow-functions/test/index.js +++ b/packages/babel-plugin-transform-es2015-arrow-functions/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-block-scoping/test/index.js b/packages/babel-plugin-transform-es2015-block-scoping/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-block-scoping/test/index.js +++ b/packages/babel-plugin-transform-es2015-block-scoping/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-classes/test/index.js b/packages/babel-plugin-transform-es2015-classes/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-classes/test/index.js +++ b/packages/babel-plugin-transform-es2015-classes/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-computed-properties/test/index.js b/packages/babel-plugin-transform-es2015-computed-properties/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-computed-properties/test/index.js +++ b/packages/babel-plugin-transform-es2015-computed-properties/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-destructuring/test/index.js b/packages/babel-plugin-transform-es2015-destructuring/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-destructuring/test/index.js +++ b/packages/babel-plugin-transform-es2015-destructuring/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-duplicate-keys/test/index.js b/packages/babel-plugin-transform-es2015-duplicate-keys/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-duplicate-keys/test/index.js +++ b/packages/babel-plugin-transform-es2015-duplicate-keys/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-for-of/test/index.js b/packages/babel-plugin-transform-es2015-for-of/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-for-of/test/index.js +++ b/packages/babel-plugin-transform-es2015-for-of/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-function-name/test/index.js b/packages/babel-plugin-transform-es2015-function-name/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-function-name/test/index.js +++ b/packages/babel-plugin-transform-es2015-function-name/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-instanceof/test/index.js b/packages/babel-plugin-transform-es2015-instanceof/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-instanceof/test/index.js +++ b/packages/babel-plugin-transform-es2015-instanceof/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-modules-amd/test/index.js b/packages/babel-plugin-transform-es2015-modules-amd/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-modules-amd/test/index.js +++ b/packages/babel-plugin-transform-es2015-modules-amd/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/test/index.js b/packages/babel-plugin-transform-es2015-modules-commonjs/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/test/index.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-modules-systemjs/test/index.js b/packages/babel-plugin-transform-es2015-modules-systemjs/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-modules-systemjs/test/index.js +++ b/packages/babel-plugin-transform-es2015-modules-systemjs/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-modules-umd/test/index.js b/packages/babel-plugin-transform-es2015-modules-umd/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-modules-umd/test/index.js +++ b/packages/babel-plugin-transform-es2015-modules-umd/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-object-super/test/index.js b/packages/babel-plugin-transform-es2015-object-super/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-object-super/test/index.js +++ b/packages/babel-plugin-transform-es2015-object-super/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-parameters/test/index.js b/packages/babel-plugin-transform-es2015-parameters/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-parameters/test/index.js +++ b/packages/babel-plugin-transform-es2015-parameters/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-shorthand-properties/test/index.js b/packages/babel-plugin-transform-es2015-shorthand-properties/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-shorthand-properties/test/index.js +++ b/packages/babel-plugin-transform-es2015-shorthand-properties/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-spread/test/index.js b/packages/babel-plugin-transform-es2015-spread/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-spread/test/index.js +++ b/packages/babel-plugin-transform-es2015-spread/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-sticky-regex/test/index.js b/packages/babel-plugin-transform-es2015-sticky-regex/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-sticky-regex/test/index.js +++ b/packages/babel-plugin-transform-es2015-sticky-regex/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-template-literals/test/index.js b/packages/babel-plugin-transform-es2015-template-literals/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-template-literals/test/index.js +++ b/packages/babel-plugin-transform-es2015-template-literals/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-typeof-symbol/test/index.js b/packages/babel-plugin-transform-es2015-typeof-symbol/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-typeof-symbol/test/index.js +++ b/packages/babel-plugin-transform-es2015-typeof-symbol/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es2015-unicode-regex/test/index.js b/packages/babel-plugin-transform-es2015-unicode-regex/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es2015-unicode-regex/test/index.js +++ b/packages/babel-plugin-transform-es2015-unicode-regex/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es3-member-expression-literals/test/index.js b/packages/babel-plugin-transform-es3-member-expression-literals/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es3-member-expression-literals/test/index.js +++ b/packages/babel-plugin-transform-es3-member-expression-literals/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es3-property-literals/test/index.js b/packages/babel-plugin-transform-es3-property-literals/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es3-property-literals/test/index.js +++ b/packages/babel-plugin-transform-es3-property-literals/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-es5-property-mutators/test/index.js b/packages/babel-plugin-transform-es5-property-mutators/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-es5-property-mutators/test/index.js +++ b/packages/babel-plugin-transform-es5-property-mutators/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-exponentiation-operator/test/index.js b/packages/babel-plugin-transform-exponentiation-operator/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-exponentiation-operator/test/index.js +++ b/packages/babel-plugin-transform-exponentiation-operator/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-export-extensions/test/index.js b/packages/babel-plugin-transform-export-extensions/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-export-extensions/test/index.js +++ b/packages/babel-plugin-transform-export-extensions/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-flow-comments/test/index.js b/packages/babel-plugin-transform-flow-comments/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-flow-comments/test/index.js +++ b/packages/babel-plugin-transform-flow-comments/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-flow-strip-types/test/index.js b/packages/babel-plugin-transform-flow-strip-types/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-flow-strip-types/test/index.js +++ b/packages/babel-plugin-transform-flow-strip-types/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-function-bind/test/index.js b/packages/babel-plugin-transform-function-bind/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-function-bind/test/index.js +++ b/packages/babel-plugin-transform-function-bind/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-jscript/test/index.js b/packages/babel-plugin-transform-jscript/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-jscript/test/index.js +++ b/packages/babel-plugin-transform-jscript/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-object-rest-spread/test/index.js b/packages/babel-plugin-transform-object-rest-spread/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-object-rest-spread/test/index.js +++ b/packages/babel-plugin-transform-object-rest-spread/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-proto-to-assign/test/index.js b/packages/babel-plugin-transform-proto-to-assign/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-proto-to-assign/test/index.js +++ b/packages/babel-plugin-transform-proto-to-assign/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-react-constant-elements/test/index.js b/packages/babel-plugin-transform-react-constant-elements/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-react-constant-elements/test/index.js +++ b/packages/babel-plugin-transform-react-constant-elements/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-react-display-name/test/index.js b/packages/babel-plugin-transform-react-display-name/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-react-display-name/test/index.js +++ b/packages/babel-plugin-transform-react-display-name/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-react-inline-elements/test/index.js b/packages/babel-plugin-transform-react-inline-elements/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-react-inline-elements/test/index.js +++ b/packages/babel-plugin-transform-react-inline-elements/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-react-jsx-compat/src/index.js b/packages/babel-plugin-transform-react-jsx-compat/src/index.js index edb9ee5a45a7..ba591ecaf593 100644 --- a/packages/babel-plugin-transform-react-jsx-compat/src/index.js +++ b/packages/babel-plugin-transform-react-jsx-compat/src/index.js @@ -1,10 +1,12 @@ +import helper from "babel-helper-builder-react-jsx"; + export default function ({ types: t }) { return { manipulateOptions(opts, parserOpts) { parserOpts.plugins.push("jsx"); }, - visitor: require("babel-helper-builder-react-jsx")({ + visitor: helper({ pre(state) { state.callee = state.tagExpr; }, diff --git a/packages/babel-plugin-transform-react-jsx-compat/test/index.js b/packages/babel-plugin-transform-react-jsx-compat/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-react-jsx-compat/test/index.js +++ b/packages/babel-plugin-transform-react-jsx-compat/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-react-jsx-self/test/index.js b/packages/babel-plugin-transform-react-jsx-self/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-react-jsx-self/test/index.js +++ b/packages/babel-plugin-transform-react-jsx-self/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-react-jsx-source/test/index.js b/packages/babel-plugin-transform-react-jsx-source/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-react-jsx-source/test/index.js +++ b/packages/babel-plugin-transform-react-jsx-source/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-react-jsx/src/index.js b/packages/babel-plugin-transform-react-jsx/src/index.js index 12e127c90929..65758283c0db 100644 --- a/packages/babel-plugin-transform-react-jsx/src/index.js +++ b/packages/babel-plugin-transform-react-jsx/src/index.js @@ -1,9 +1,12 @@ /* eslint max-len: 0 */ +import jsx from "babel-plugin-syntax-jsx"; +import helper from "babel-helper-builder-react-jsx"; + export default function ({ types: t }) { const JSX_ANNOTATION_REGEX = /\*?\s*@jsx\s+([^\s]+)/; - const visitor = require("babel-helper-builder-react-jsx")({ + const visitor = helper({ pre(state) { const tagName = state.tagName; const args = state.args; @@ -44,7 +47,7 @@ export default function ({ types: t }) { }; return { - inherits: require("babel-plugin-syntax-jsx"), + inherits: jsx, visitor }; } diff --git a/packages/babel-plugin-transform-react-jsx/test/index.js b/packages/babel-plugin-transform-react-jsx/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-react-jsx/test/index.js +++ b/packages/babel-plugin-transform-react-jsx/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-regenerator/test/index.js b/packages/babel-plugin-transform-regenerator/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-regenerator/test/index.js +++ b/packages/babel-plugin-transform-regenerator/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-runtime/test/index.js b/packages/babel-plugin-transform-runtime/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-runtime/test/index.js +++ b/packages/babel-plugin-transform-runtime/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-transform-strict-mode/test/index.js b/packages/babel-plugin-transform-strict-mode/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-transform-strict-mode/test/index.js +++ b/packages/babel-plugin-transform-strict-mode/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-plugin-undeclared-variables-check/test/index.js b/packages/babel-plugin-undeclared-variables-check/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-plugin-undeclared-variables-check/test/index.js +++ b/packages/babel-plugin-undeclared-variables-check/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-preset-es2015/test/esnext.js b/packages/babel-preset-es2015/test/esnext.js index 95896efa51c5..97f8aaad4736 100644 --- a/packages/babel-preset-es2015/test/esnext.js +++ b/packages/babel-preset-es2015/test/esnext.js @@ -1 +1,3 @@ -require("babel-helper-transform-fixture-test-runner")(__dirname + "/fixtures/esnext", "esnext"); +import runner from "babel-helper-transform-fixture-test-runner"; + +runner(`${__dirname}/fixtures/esnext`, "esnext"); diff --git a/packages/babel-preset-es2015/test/index.js b/packages/babel-preset-es2015/test/index.js index 8047319eb6b3..b04436210bb2 100644 --- a/packages/babel-preset-es2015/test/index.js +++ b/packages/babel-preset-es2015/test/index.js @@ -1,5 +1,5 @@ -const es2015 = require("../lib"); -const expect = require("chai").expect; +import es2015 from "../lib"; +import { expect } from "chai"; describe("es2015 preset", function () { it("exposes an object", function () { diff --git a/packages/babel-preset-es2015/test/preset-options.js b/packages/babel-preset-es2015/test/preset-options.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-preset-es2015/test/preset-options.js +++ b/packages/babel-preset-es2015/test/preset-options.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-preset-es2015/test/traceur.js b/packages/babel-preset-es2015/test/traceur.js index cce144becc23..bac5885f8695 100644 --- a/packages/babel-preset-es2015/test/traceur.js +++ b/packages/babel-preset-es2015/test/traceur.js @@ -1,6 +1,7 @@ -const includes = require("lodash/includes"); +import includes from "lodash/includes"; +import runner from "babel-helper-transform-fixture-test-runner"; -require("babel-helper-transform-fixture-test-runner")(__dirname + "/fixtures/traceur", "traceur", { +runner(`${__dirname}/fixtures/traceur`, "traceur", { ignoreSuites: [ // weird environmental issue make these hard to test "Modules", diff --git a/packages/babel-preset-latest/test/index.js b/packages/babel-preset-latest/test/index.js index 1f6634aabde0..09cfbc31f54e 100644 --- a/packages/babel-preset-latest/test/index.js +++ b/packages/babel-preset-latest/test/index.js @@ -1 +1,3 @@ -require("babel-helper-plugin-test-runner")(__dirname); +import runner from "babel-helper-plugin-test-runner"; + +runner(__dirname); diff --git a/packages/babel-template/test/index.js b/packages/babel-template/test/index.js index 6e4ae78544c0..bad7d69f8d23 100644 --- a/packages/babel-template/test/index.js +++ b/packages/babel-template/test/index.js @@ -1,6 +1,6 @@ -const generator = require("../../babel-generator").default; -const template = require("../lib"); -const chai = require("chai"); +import generator from "../../babel-generator"; +import template from "../lib"; +import chai from "chai"; const comments = "// Sum two numbers\nconst add = (a, b) => a + b;"; diff --git a/packages/babel-types/test/cloning.js b/packages/babel-types/test/cloning.js index 1280f94bd03f..9e3b41f4758f 100644 --- a/packages/babel-types/test/cloning.js +++ b/packages/babel-types/test/cloning.js @@ -1,6 +1,6 @@ -const t = require("../lib"); -const assert = require("assert"); -const parse = require("babylon").parse; +import * as t from "../lib"; +import assert from "assert"; +import { parse } from "babylon"; suite("cloning", function () { suite("clone", function () { diff --git a/packages/babel-types/test/validators.js b/packages/babel-types/test/validators.js index b6f6f3178211..2e7e55d08567 100644 --- a/packages/babel-types/test/validators.js +++ b/packages/babel-types/test/validators.js @@ -1,6 +1,6 @@ -const t = require("../lib"); -const assert = require("assert"); -const parse = require("babylon").parse; +import * as t from "../lib"; +import assert from "assert"; +import { parse } from "babylon"; suite("validators", function () { suite("isNodesEquivalent", function () {