Refactor test packages to use ES modules instead of CJS (#5138)

This commit is contained in:
Sergey Rubanov 2017-01-16 19:25:04 +03:00 committed by Henry Zhu
parent b315fc6135
commit 292c3ca206
75 changed files with 247 additions and 126 deletions

View File

@ -1,6 +1,6 @@
const assert = require("assert"); import assert from "assert";
const chalk = require("chalk"); import chalk from "chalk";
const codeFrame = require(".."); import codeFrame from "..";
describe("babel-code-frame", function () { describe("babel-code-frame", function () {
it("basic usage", function () { it("basic usage", function () {

View File

@ -1,9 +1,9 @@
const babel = require("../lib/api/node"); import * as babel from "../lib/api/node";
const buildExternalHelpers = require("../lib/tools/build-external-helpers"); import buildExternalHelpers from "../lib/tools/build-external-helpers";
const sourceMap = require("source-map"); import sourceMap from "source-map";
const assert = require("assert"); import assert from "assert";
const Plugin = require("../lib/transformation/plugin"); import Plugin from "../lib/transformation/plugin";
const generator = require("babel-generator").default; import generator from "babel-generator";
function assertIgnored(result) { function assertIgnored(result) {
assert.ok(result.ignored); assert.ok(result.ignored);

View File

@ -1,7 +1,7 @@
const browserify = require("browserify"); import browserify from "browserify";
const assert = require("assert"); import assert from "assert";
const path = require("path"); import path from "path";
const vm = require("vm"); import vm from "vm";
describe("browserify", function() { describe("browserify", function() {
it("babel/register may be used without breaking browserify", function(done) { it("babel/register may be used without breaking browserify", function(done) {

View File

@ -1,6 +1,6 @@
const assert = require("assert"); import assert from "assert";
const path = require("path"); import path from "path";
const buildConfigChain = require("../lib/transformation/file/options/build-config-chain"); import buildConfigChain from "../lib/transformation/file/options/build-config-chain";
function fixture() { function fixture() {
const args = [__dirname, "fixtures", "config"]; const args = [__dirname, "fixtures", "config"];

View File

@ -1,6 +1,6 @@
const traverse = require("babel-traverse").default; import traverse from "babel-traverse";
const assert = require("assert"); import assert from "assert";
const parse = require("babylon").parse; import { parse } from "babylon";
describe("evaluation", function () { describe("evaluation", function () {
function addTest(code, type, value, notConfident) { function addTest(code, type, value, notConfident) {

View File

@ -1,5 +1,5 @@
const assert = require("assert"); import assert from "assert";
const getPossiblePluginNames = require("../lib/helpers/get-possible-plugin-names"); import getPossiblePluginNames from "../lib/helpers/get-possible-plugin-names";
describe("getPossiblePluginNames", function () { describe("getPossiblePluginNames", function () {
it("adds the babel-plugin prefix", function() { it("adds the babel-plugin prefix", function() {

View File

@ -1,5 +1,5 @@
const assert = require("assert"); import assert from "assert";
const getPossiblePresetNames = require("../lib/helpers/get-possible-preset-names"); import getPossiblePresetNames from "../lib/helpers/get-possible-preset-names";
describe("getPossiblePresetNames", function () { describe("getPossiblePresetNames", function () {
it("adds the babel-preset prefix", function() { it("adds the babel-preset prefix", function() {

View File

@ -1,6 +1,6 @@
const transform = require("../lib/api/node").transform; import { transform } from "../lib/api/node";
const Plugin = require("../lib/transformation/plugin"); import Plugin from "../lib/transformation/plugin";
const chai = require("chai"); import chai from "chai";
describe("traversal path", function () { describe("traversal path", function () {
it("replaceWithSourceString", function () { it("replaceWithSourceString", function () {

View File

@ -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");

View File

@ -1,8 +1,8 @@
const assert = require("assert"); import assert from "assert";
const async = require("async"); import async from "async";
const babel = require("../lib/api/node"); import * as babel from "../lib/api/node";
const fs = require("fs"); import fs from "fs";
const path = require("path"); import path from "path";
// Test that plugins & presets are resolved relative to `filename`. // Test that plugins & presets are resolved relative to `filename`.
describe("addon resolution", function () { describe("addon resolution", function () {

View File

@ -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");

View File

@ -1,6 +1,6 @@
const assert = require("assert"); import assert from "assert";
const util = require("../lib/util"); import * as util from "../lib/util";
const t = require("babel-types"); import * as t from "babel-types";
describe("util", function () { describe("util", function () {
it("canCompile", function () { it("canCompile", function () {

View File

@ -1,12 +1,13 @@
const Whitespace = require("../lib/whitespace"); import Whitespace from "../lib/whitespace";
const Printer = require("../lib/printer"); import Printer from "../lib/printer";
const generate = require("../lib"); import generate from "../lib";
const assert = require("assert"); import assert from "assert";
const parse = require("babylon").parse; import { parse } from "babylon";
const chai = require("chai"); import chai from "chai";
const t = require("babel-types"); import * as t from "babel-types";
const fs = require("fs"); import fs from "fs";
const path = require("path"); import path from "path";
import fixtures from "babel-helper-fixtures";
describe("generation", function () { describe("generation", function () {
it("completeness", 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({ chai.expect(generated.map).to.deep.equal({
version: 3, version: 3,
@ -140,7 +141,7 @@ describe("generation", function () {
id2.name += "2"; id2.name += "2";
id2.loc.identiferName = "bar"; id2.loc.identiferName = "bar";
const generated = generate.default(ast, { const generated = generate(ast, {
filename: "inline", filename: "inline",
sourceFileName: "inline", sourceFileName: "inline",
sourceMaps: true sourceMaps: true
@ -191,7 +192,7 @@ describe("generation", function () {
const code = "function hi (msg) { console.log(msg); }\n"; const code = "function hi (msg) { console.log(msg); }\n";
const ast = parse(code, { filename: "a.js" }).program; const ast = parse(code, { filename: "a.js" }).program;
const generated = generate.default(ast, { const generated = generate(ast, {
sourceFileName: "a.js", sourceFileName: "a.js",
sourceMaps: true, sourceMaps: true,
}); });
@ -209,7 +210,7 @@ describe("programmatic generation", function() {
it("numeric member expression", function() { it("numeric member expression", function() {
// Should not generate `0.foo` // Should not generate `0.foo`
const mem = t.memberExpression(t.numericLiteral(60702), t.identifier("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() { it("nested if statements needs block", function() {
@ -225,7 +226,7 @@ describe("programmatic generation", function() {
t.expressionStatement(t.stringLiteral("alt")) 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"); assert.equal(ast.program.body[0].consequent.type, "BlockStatement");
}); });
@ -235,7 +236,7 @@ describe("programmatic generation", function() {
[t.directive(t.directiveLiteral("use strict"))] [t.directive(t.directiveLiteral("use strict"))]
); );
const output = generate.default(blockStatement).code; const output = generate(blockStatement).code;
assert.equal(output, [ assert.equal(output, [
"{", "{",
" \"use strict\";", " \"use strict\";",
@ -255,7 +256,7 @@ describe("programmatic generation", function() {
null null
); );
const output = generate.default(objectStatement).code; const output = generate(objectStatement).code;
assert.equal(output, [ assert.equal(output, [
"{", "{",
" bar: string;", " bar: string;",
@ -275,7 +276,7 @@ describe("programmatic generation", function() {
] ]
); );
const output = generate.default(objectStatement).code; const output = generate(objectStatement).code;
assert.equal(output, [ 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) { suites.forEach(function (testSuite) {
describe("generation/" + testSuite.title, function () { describe("generation/" + testSuite.title, function () {
@ -309,7 +310,7 @@ suites.forEach(function (testSuite) {
strictMode: false, strictMode: false,
sourceType: "module", 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) { if (!expect.code && result.code && fs.statSync(path.dirname(expect.loc)).isDirectory() && !process.env.CI) {
console.log(`New test file created: ${expect.loc}`); console.log(`New test file created: ${expect.loc}`);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1,10 +1,12 @@
import helper from "babel-helper-builder-react-jsx";
export default function ({ types: t }) { export default function ({ types: t }) {
return { return {
manipulateOptions(opts, parserOpts) { manipulateOptions(opts, parserOpts) {
parserOpts.plugins.push("jsx"); parserOpts.plugins.push("jsx");
}, },
visitor: require("babel-helper-builder-react-jsx")({ visitor: helper({
pre(state) { pre(state) {
state.callee = state.tagExpr; state.callee = state.tagExpr;
}, },

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1,9 +1,12 @@
/* eslint max-len: 0 */ /* eslint max-len: 0 */
import jsx from "babel-plugin-syntax-jsx";
import helper from "babel-helper-builder-react-jsx";
export default function ({ types: t }) { export default function ({ types: t }) {
const JSX_ANNOTATION_REGEX = /\*?\s*@jsx\s+([^\s]+)/; const JSX_ANNOTATION_REGEX = /\*?\s*@jsx\s+([^\s]+)/;
const visitor = require("babel-helper-builder-react-jsx")({ const visitor = helper({
pre(state) { pre(state) {
const tagName = state.tagName; const tagName = state.tagName;
const args = state.args; const args = state.args;
@ -44,7 +47,7 @@ export default function ({ types: t }) {
}; };
return { return {
inherits: require("babel-plugin-syntax-jsx"), inherits: jsx,
visitor visitor
}; };
} }

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -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");

View File

@ -1,5 +1,5 @@
const es2015 = require("../lib"); import es2015 from "../lib";
const expect = require("chai").expect; import { expect } from "chai";
describe("es2015 preset", function () { describe("es2015 preset", function () {
it("exposes an object", function () { it("exposes an object", function () {

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -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: [ ignoreSuites: [
// weird environmental issue make these hard to test // weird environmental issue make these hard to test
"Modules", "Modules",

View File

@ -1 +1,3 @@
require("babel-helper-plugin-test-runner")(__dirname); import runner from "babel-helper-plugin-test-runner";
runner(__dirname);

View File

@ -1,6 +1,6 @@
const generator = require("../../babel-generator").default; import generator from "../../babel-generator";
const template = require("../lib"); import template from "../lib";
const chai = require("chai"); import chai from "chai";
const comments = "// Sum two numbers\nconst add = (a, b) => a + b;"; const comments = "// Sum two numbers\nconst add = (a, b) => a + b;";

View File

@ -1,6 +1,6 @@
const t = require("../lib"); import * as t from "../lib";
const assert = require("assert"); import assert from "assert";
const parse = require("babylon").parse; import { parse } from "babylon";
suite("cloning", function () { suite("cloning", function () {
suite("clone", function () { suite("clone", function () {

View File

@ -1,6 +1,6 @@
const t = require("../lib"); import * as t from "../lib";
const assert = require("assert"); import assert from "assert";
const parse = require("babylon").parse; import { parse } from "babylon";
suite("validators", function () { suite("validators", function () {
suite("isNodesEquivalent", function () { suite("isNodesEquivalent", function () {