From cde005422701a69ff21044c138c29a5ad23b6d0a Mon Sep 17 00:00:00 2001 From: Henry Zhu Date: Mon, 16 Oct 2017 14:16:13 -0400 Subject: [PATCH] Scoped: change src imports to @babel/ [skip ci] --- .../babel-cli/src/babel-external-helpers.js | 2 +- packages/babel-cli/src/babel/index.js | 2 +- packages/babel-cli/src/babel/util.js | 2 +- .../babel-core/src/config/option-manager.js | 2 +- packages/babel-core/src/index.js | 6 +-- .../src/tools/build-external-helpers.js | 8 +-- packages/babel-core/src/transform-ast.js | 2 +- .../src/transformation/file/file.js | 10 ++-- .../src/transformation/file/generate.js | 2 +- .../babel-core/src/transformation/index.js | 2 +- .../src/transformation/normalize-file.js | 2 +- .../babel-generator/src/generators/classes.js | 2 +- .../src/generators/expressions.js | 2 +- .../babel-generator/src/generators/flow.js | 2 +- .../babel-generator/src/generators/methods.js | 2 +- .../babel-generator/src/generators/modules.js | 2 +- .../src/generators/statements.js | 2 +- .../babel-generator/src/generators/types.js | 2 +- packages/babel-generator/src/node/index.js | 2 +- .../babel-generator/src/node/parentheses.js | 2 +- .../babel-generator/src/node/whitespace.js | 2 +- packages/babel-generator/src/printer.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 4 +- .../src/index.js | 4 +- .../src/index.js | 2 +- .../babel-helper-call-delegate/src/index.js | 6 +-- packages/babel-helper-define-map/src/index.js | 4 +- .../src/index.js | 4 +- .../babel-helper-explode-class/src/index.js | 6 +-- .../babel-helper-function-name/src/index.js | 6 +-- .../src/index.js | 2 +- .../babel-helper-hoist-variables/src/index.js | 2 +- .../src/import-builder.js | 2 +- .../src/import-injector.js | 2 +- .../src/index.js | 6 +-- .../src/normalize-and-load-metadata.js | 2 +- .../src/rewrite-live-references.js | 6 +-- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/for-await.js | 4 +- .../src/index.js | 6 +-- .../babel-helper-replace-supers/src/index.js | 6 +-- .../babel-helper-simple-access/src/index.js | 2 +- .../src/index.js | 8 +-- .../babel-helper-wrap-function/src/index.js | 8 +-- packages/babel-helpers/src/helpers.js | 2 +- packages/babel-helpers/src/index.js | 4 +- packages/babel-node/src/_babel-node.js | 4 +- .../src/index.js | 2 +- .../src/index.js | 4 +- .../src/index.js | 4 +- .../src/index.js | 6 +-- .../src/index.js | 6 +-- .../src/index.js | 4 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 10 ++-- .../src/tdz.js | 2 +- .../src/index.js | 4 +- .../src/lib/memoise-decorators.js | 4 +- .../src/loose.js | 4 +- .../src/vanilla.js | 14 +++--- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 4 +- .../src/index.js | 4 +- .../src/index.js | 4 +- .../src/index.js | 4 +- .../src/index.js | 2 +- .../src/params.js | 6 +-- .../src/rest.js | 4 +- .../src/index.js | 2 +- .../src/index.js | 4 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 4 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 4 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 4 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- .../src/index.js | 2 +- packages/babel-preset-es2015/src/index.js | 50 +++++++++---------- packages/babel-preset-es2016/src/index.js | 2 +- packages/babel-preset-es2017/src/index.js | 4 +- packages/babel-preset-flow/src/index.js | 2 +- packages/babel-preset-react/src/index.js | 10 ++-- packages/babel-preset-stage-0/src/index.js | 6 +-- packages/babel-preset-stage-1/src/index.js | 10 ++-- packages/babel-preset-stage-2/src/index.js | 10 ++-- packages/babel-preset-stage-3/src/index.js | 12 ++--- packages/babel-preset-typescript/src/index.js | 2 +- packages/babel-register/src/cache.js | 2 +- packages/babel-register/src/node.js | 4 +- packages/babel-standalone/src/index.js | 2 +- packages/babel-template/src/index.js | 6 +-- packages/babel-traverse/src/context.js | 2 +- packages/babel-traverse/src/index.js | 2 +- packages/babel-traverse/src/path/ancestry.js | 2 +- packages/babel-traverse/src/path/comments.js | 2 +- .../babel-traverse/src/path/conversion.js | 4 +- packages/babel-traverse/src/path/family.js | 2 +- packages/babel-traverse/src/path/index.js | 2 +- .../src/path/inference/index.js | 2 +- .../src/path/inference/inferer-reference.js | 2 +- .../src/path/inference/inferers.js | 2 +- .../babel-traverse/src/path/introspection.js | 2 +- .../babel-traverse/src/path/lib/hoister.js | 4 +- .../src/path/lib/virtual-types.js | 4 +- .../babel-traverse/src/path/modification.js | 2 +- .../babel-traverse/src/path/replacement.js | 4 +- packages/babel-traverse/src/scope/index.js | 2 +- .../babel-traverse/src/scope/lib/renamer.js | 2 +- packages/babel-traverse/src/visitors.js | 2 +- packages/babel-types/src/converters.js | 2 +- 129 files changed, 247 insertions(+), 247 deletions(-) diff --git a/packages/babel-cli/src/babel-external-helpers.js b/packages/babel-cli/src/babel-external-helpers.js index 2180d10773..c2560dfa6f 100755 --- a/packages/babel-cli/src/babel-external-helpers.js +++ b/packages/babel-cli/src/babel-external-helpers.js @@ -1,5 +1,5 @@ import commander from "commander"; -import { buildExternalHelpers } from "babel-core"; +import { buildExternalHelpers } from "@babel/core"; function collect(value, previousValue): Array { // If the user passed the option with no value, like "babel-external-helpers --whitelist", do nothing. diff --git a/packages/babel-cli/src/babel/index.js b/packages/babel-cli/src/babel/index.js index c0cea9e6c4..d04db15816 100755 --- a/packages/babel-cli/src/babel/index.js +++ b/packages/babel-cli/src/babel/index.js @@ -2,7 +2,7 @@ import fs from "fs"; import commander from "commander"; -import { version } from "babel-core"; +import { version } from "@babel/core"; import uniq from "lodash/uniq"; import glob from "glob"; diff --git a/packages/babel-cli/src/babel/util.js b/packages/babel-cli/src/babel/util.js index 46a3f41947..edb9fd530a 100644 --- a/packages/babel-cli/src/babel/util.js +++ b/packages/babel-cli/src/babel/util.js @@ -1,6 +1,6 @@ import commander from "commander"; import readdirRecursive from "fs-readdir-recursive"; -import * as babel from "babel-core"; +import * as babel from "@babel/core"; import includes from "lodash/includes"; import path from "path"; import fs from "fs"; diff --git a/packages/babel-core/src/config/option-manager.js b/packages/babel-core/src/config/option-manager.js index dc82a7161c..96e0f7ee6f 100644 --- a/packages/babel-core/src/config/option-manager.js +++ b/packages/babel-core/src/config/option-manager.js @@ -7,7 +7,7 @@ import merge from "lodash/merge"; import removed from "./removed"; import buildConfigChain from "./build-config-chain"; import path from "path"; -import traverse from "babel-traverse"; +import traverse from "@babel/traverse"; import clone from "lodash/clone"; import { makeWeakCache } from "./caching"; import { getEnv } from "./helpers/environment"; diff --git a/packages/babel-core/src/index.js b/packages/babel-core/src/index.js index 4281a15976..1b50fefbc1 100644 --- a/packages/babel-core/src/index.js +++ b/packages/babel-core/src/index.js @@ -8,9 +8,9 @@ export { resolvePlugin, resolvePreset } from "./config/loading/files"; export { version } from "../package"; export { getEnv } from "./config/helpers/environment"; -export * as types from "babel-types"; -export { default as traverse } from "babel-traverse"; -export { default as template } from "babel-template"; +export * as types from "@babel/types"; +export { default as traverse } from "@babel/traverse"; +export { default as template } from "@babel/template"; import loadConfig from "./config"; diff --git a/packages/babel-core/src/tools/build-external-helpers.js b/packages/babel-core/src/tools/build-external-helpers.js index 7b9d94ac43..8649d1802d 100644 --- a/packages/babel-core/src/tools/build-external-helpers.js +++ b/packages/babel-core/src/tools/build-external-helpers.js @@ -1,7 +1,7 @@ -import * as helpers from "babel-helpers"; -import generator from "babel-generator"; -import template from "babel-template"; -import * as t from "babel-types"; +import * as helpers from "@babel/helpers"; +import generator from "@babel/generator"; +import template from "@babel/template"; +import * as t from "@babel/types"; const buildUmdWrapper = template(` (function (root, factory) { diff --git a/packages/babel-core/src/transform-ast.js b/packages/babel-core/src/transform-ast.js index 85b94063b8..4e0864f7ab 100644 --- a/packages/babel-core/src/transform-ast.js +++ b/packages/babel-core/src/transform-ast.js @@ -1,5 +1,5 @@ // @flow -import * as t from "babel-types"; +import * as t from "@babel/types"; import loadConfig from "./config"; import runTransform, { type FileResult } from "./transformation"; diff --git a/packages/babel-core/src/transformation/file/file.js b/packages/babel-core/src/transformation/file/file.js index aec4db3c04..cea59f380f 100644 --- a/packages/babel-core/src/transformation/file/file.js +++ b/packages/babel-core/src/transformation/file/file.js @@ -1,10 +1,10 @@ // @flow -import getHelper from "babel-helpers"; -import { NodePath, Hub, Scope } from "babel-traverse"; -import { codeFrameColumns } from "babel-code-frame"; -import traverse from "babel-traverse"; -import * as t from "babel-types"; +import getHelper from "@babel/helpers"; +import { NodePath, Hub, Scope } from "@babel/traverse"; +import { codeFrameColumns } from "@babel/code-frame"; +import traverse from "@babel/traverse"; +import * as t from "@babel/types"; import type { NormalizedFile } from "../normalize-file"; diff --git a/packages/babel-core/src/transformation/file/generate.js b/packages/babel-core/src/transformation/file/generate.js index 4601106561..bb42de3d19 100644 --- a/packages/babel-core/src/transformation/file/generate.js +++ b/packages/babel-core/src/transformation/file/generate.js @@ -2,7 +2,7 @@ import convertSourceMap, { type SourceMap } from "convert-source-map"; import sourceMap from "source-map"; -import generate from "babel-generator"; +import generate from "@babel/generator"; import type File from "./file"; diff --git a/packages/babel-core/src/transformation/index.js b/packages/babel-core/src/transformation/index.js index e6d00dace2..b4eec7ec54 100644 --- a/packages/babel-core/src/transformation/index.js +++ b/packages/babel-core/src/transformation/index.js @@ -1,5 +1,5 @@ // @flow -import traverse from "babel-traverse"; +import traverse from "@babel/traverse"; import type { SourceMap } from "convert-source-map"; import type { ResolvedConfig, PluginPasses } from "../config"; diff --git a/packages/babel-core/src/transformation/normalize-file.js b/packages/babel-core/src/transformation/normalize-file.js index 7c60c2aa27..72975a7951 100644 --- a/packages/babel-core/src/transformation/normalize-file.js +++ b/packages/babel-core/src/transformation/normalize-file.js @@ -2,7 +2,7 @@ import convertSourceMap, { typeof Converter } from "convert-source-map"; import { parse } from "babylon"; -import { codeFrameColumns } from "babel-code-frame"; +import { codeFrameColumns } from "@babel/code-frame"; const shebangRegex = /^#!.*/; diff --git a/packages/babel-generator/src/generators/classes.js b/packages/babel-generator/src/generators/classes.js index 18dddab1b7..fa83be944c 100644 --- a/packages/babel-generator/src/generators/classes.js +++ b/packages/babel-generator/src/generators/classes.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export function ClassDeclaration(node: Object, parent: Object) { if ( diff --git a/packages/babel-generator/src/generators/expressions.js b/packages/babel-generator/src/generators/expressions.js index cc95abd222..884d9acd07 100644 --- a/packages/babel-generator/src/generators/expressions.js +++ b/packages/babel-generator/src/generators/expressions.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; import * as n from "../node"; export function UnaryExpression(node: Object) { diff --git a/packages/babel-generator/src/generators/flow.js b/packages/babel-generator/src/generators/flow.js index 8ffb375370..be6ef45498 100644 --- a/packages/babel-generator/src/generators/flow.js +++ b/packages/babel-generator/src/generators/flow.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; import { ExportAllDeclaration } from "./modules"; export function AnyTypeAnnotation() { diff --git a/packages/babel-generator/src/generators/methods.js b/packages/babel-generator/src/generators/methods.js index 80e73800fc..54fa36c29f 100644 --- a/packages/babel-generator/src/generators/methods.js +++ b/packages/babel-generator/src/generators/methods.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export function _params(node: Object) { this.print(node.typeParameters, node); diff --git a/packages/babel-generator/src/generators/modules.js b/packages/babel-generator/src/generators/modules.js index 9525aa4490..dd7313ac7c 100644 --- a/packages/babel-generator/src/generators/modules.js +++ b/packages/babel-generator/src/generators/modules.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export function ImportSpecifier(node: Object) { if (node.importKind === "type" || node.importKind === "typeof") { diff --git a/packages/babel-generator/src/generators/statements.js b/packages/babel-generator/src/generators/statements.js index b6d5e23f4a..c3644a4c93 100644 --- a/packages/babel-generator/src/generators/statements.js +++ b/packages/babel-generator/src/generators/statements.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export function WithStatement(node: Object) { this.word("with"); diff --git a/packages/babel-generator/src/generators/types.js b/packages/babel-generator/src/generators/types.js index 7da850ee55..7cbfe3aa16 100644 --- a/packages/babel-generator/src/generators/types.js +++ b/packages/babel-generator/src/generators/types.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; import jsesc from "jsesc"; export function Identifier(node: Object) { diff --git a/packages/babel-generator/src/node/index.js b/packages/babel-generator/src/node/index.js index c7fb0026a1..7292f83a51 100644 --- a/packages/babel-generator/src/node/index.js +++ b/packages/babel-generator/src/node/index.js @@ -1,6 +1,6 @@ import * as whitespace from "./whitespace"; import * as parens from "./parentheses"; -import * as t from "babel-types"; +import * as t from "@babel/types"; function expandAliases(obj) { const newObj = {}; diff --git a/packages/babel-generator/src/node/parentheses.js b/packages/babel-generator/src/node/parentheses.js index 2e84c78ca1..e57efbf977 100644 --- a/packages/babel-generator/src/node/parentheses.js +++ b/packages/babel-generator/src/node/parentheses.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; const PRECEDENCE = { "||": 0, diff --git a/packages/babel-generator/src/node/whitespace.js b/packages/babel-generator/src/node/whitespace.js index 0a13f78935..63770fa36f 100644 --- a/packages/babel-generator/src/node/whitespace.js +++ b/packages/babel-generator/src/node/whitespace.js @@ -1,5 +1,5 @@ import map from "lodash/map"; -import * as t from "babel-types"; +import * as t from "@babel/types"; type WhitespaceObject = { before?: boolean, diff --git a/packages/babel-generator/src/printer.js b/packages/babel-generator/src/printer.js index 0be50e0f29..d550e6635c 100644 --- a/packages/babel-generator/src/printer.js +++ b/packages/babel-generator/src/printer.js @@ -2,7 +2,7 @@ import isInteger from "lodash/isInteger"; import repeat from "lodash/repeat"; import Buffer from "./buffer"; import * as n from "./node"; -import * as t from "babel-types"; +import * as t from "@babel/types"; import * as generatorFunctions from "./generators"; diff --git a/packages/babel-helper-annotate-as-pure/src/index.js b/packages/babel-helper-annotate-as-pure/src/index.js index 5c46e93f99..0148aa1cc0 100644 --- a/packages/babel-helper-annotate-as-pure/src/index.js +++ b/packages/babel-helper-annotate-as-pure/src/index.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; const PURE_ANNOTATION = "#__PURE__"; diff --git a/packages/babel-helper-bindify-decorators/src/index.js b/packages/babel-helper-bindify-decorators/src/index.js index 1d4379c3ab..74029e6375 100644 --- a/packages/babel-helper-bindify-decorators/src/index.js +++ b/packages/babel-helper-bindify-decorators/src/index.js @@ -1,5 +1,5 @@ -import type { NodePath } from "babel-traverse"; -import * as t from "babel-types"; +import type { NodePath } from "@babel/traverse"; +import * as t from "@babel/types"; export default function bindifyDecorators( decorators: Array, diff --git a/packages/babel-helper-builder-binary-assignment-operator-visitor/src/index.js b/packages/babel-helper-builder-binary-assignment-operator-visitor/src/index.js index d298590a94..554f71a1c5 100644 --- a/packages/babel-helper-builder-binary-assignment-operator-visitor/src/index.js +++ b/packages/babel-helper-builder-binary-assignment-operator-visitor/src/index.js @@ -1,5 +1,5 @@ -import explode from "babel-helper-explode-assignable-expression"; -import * as t from "babel-types"; +import explode from "@babel/helper-explode-assignable-expression"; +import * as t from "@babel/types"; export default function(opts: { build: Function, operator: string }): Object { const { build, operator } = opts; diff --git a/packages/babel-helper-builder-react-jsx/src/index.js b/packages/babel-helper-builder-react-jsx/src/index.js index c3dc851b06..fa220da478 100644 --- a/packages/babel-helper-builder-react-jsx/src/index.js +++ b/packages/babel-helper-builder-react-jsx/src/index.js @@ -1,5 +1,5 @@ import esutils from "esutils"; -import * as t from "babel-types"; +import * as t from "@babel/types"; type ElementState = { tagExpr: Object, // tag node diff --git a/packages/babel-helper-call-delegate/src/index.js b/packages/babel-helper-call-delegate/src/index.js index 8d9db20b75..8aee027613 100644 --- a/packages/babel-helper-call-delegate/src/index.js +++ b/packages/babel-helper-call-delegate/src/index.js @@ -1,6 +1,6 @@ -import hoistVariables from "babel-helper-hoist-variables"; -import type { NodePath } from "babel-traverse"; -import * as t from "babel-types"; +import hoistVariables from "@babel/helper-hoist-variables"; +import type { NodePath } from "@babel/traverse"; +import * as t from "@babel/types"; const visitor = { enter(path, state) { diff --git a/packages/babel-helper-define-map/src/index.js b/packages/babel-helper-define-map/src/index.js index be06822f67..850bd51adb 100644 --- a/packages/babel-helper-define-map/src/index.js +++ b/packages/babel-helper-define-map/src/index.js @@ -1,6 +1,6 @@ -import nameFunction from "babel-helper-function-name"; +import nameFunction from "@babel/helper-function-name"; import has from "lodash/has"; -import * as t from "babel-types"; +import * as t from "@babel/types"; function toKind(node: Object) { if (t.isClassMethod(node) || t.isObjectMethod(node)) { diff --git a/packages/babel-helper-explode-assignable-expression/src/index.js b/packages/babel-helper-explode-assignable-expression/src/index.js index 2e9985d6b0..cbe6f6fcae 100644 --- a/packages/babel-helper-explode-assignable-expression/src/index.js +++ b/packages/babel-helper-explode-assignable-expression/src/index.js @@ -1,5 +1,5 @@ -import type { Scope } from "babel-traverse"; -import * as t from "babel-types"; +import type { Scope } from "@babel/traverse"; +import * as t from "@babel/types"; function getObjRef(node, nodes, file, scope) { let ref; diff --git a/packages/babel-helper-explode-class/src/index.js b/packages/babel-helper-explode-class/src/index.js index 1fd2de8c92..1c5881b37e 100644 --- a/packages/babel-helper-explode-class/src/index.js +++ b/packages/babel-helper-explode-class/src/index.js @@ -1,6 +1,6 @@ -import bindifyDecorators from "babel-helper-bindify-decorators"; -import type { NodePath } from "babel-traverse"; -import * as t from "babel-types"; +import bindifyDecorators from "@babel/helper-bindify-decorators"; +import type { NodePath } from "@babel/traverse"; +import * as t from "@babel/types"; export default function(classPath) { classPath.assertClass(); diff --git a/packages/babel-helper-function-name/src/index.js b/packages/babel-helper-function-name/src/index.js index b849e42124..eae4f83f72 100644 --- a/packages/babel-helper-function-name/src/index.js +++ b/packages/babel-helper-function-name/src/index.js @@ -1,6 +1,6 @@ -import getFunctionArity from "babel-helper-get-function-arity"; -import template from "babel-template"; -import * as t from "babel-types"; +import getFunctionArity from "@babel/helper-get-function-arity"; +import template from "@babel/template"; +import * as t from "@babel/types"; const buildPropertyMethodAssignmentWrapper = template(` (function (FUNCTION_KEY) { diff --git a/packages/babel-helper-get-function-arity/src/index.js b/packages/babel-helper-get-function-arity/src/index.js index 0c3f5f1977..60b5f3ed17 100644 --- a/packages/babel-helper-get-function-arity/src/index.js +++ b/packages/babel-helper-get-function-arity/src/index.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export default function(node): number { const params: Array = node.params; diff --git a/packages/babel-helper-hoist-variables/src/index.js b/packages/babel-helper-hoist-variables/src/index.js index d09c864814..6027cc41fb 100644 --- a/packages/babel-helper-hoist-variables/src/index.js +++ b/packages/babel-helper-hoist-variables/src/index.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; const visitor = { Scope(path, state) { diff --git a/packages/babel-helper-module-imports/src/import-builder.js b/packages/babel-helper-module-imports/src/import-builder.js index 22d725513d..5f540f4372 100644 --- a/packages/babel-helper-module-imports/src/import-builder.js +++ b/packages/babel-helper-module-imports/src/import-builder.js @@ -1,5 +1,5 @@ import assert from "assert"; -import * as t from "babel-types"; +import * as t from "@babel/types"; /** * A class to track and accumulate mutations to the AST that will eventually diff --git a/packages/babel-helper-module-imports/src/import-injector.js b/packages/babel-helper-module-imports/src/import-injector.js index f8326c1abd..51040a827a 100644 --- a/packages/babel-helper-module-imports/src/import-injector.js +++ b/packages/babel-helper-module-imports/src/import-injector.js @@ -1,5 +1,5 @@ import assert from "assert"; -import * as t from "babel-types"; +import * as t from "@babel/types"; import ImportBuilder from "./import-builder"; import isModule from "./is-module"; diff --git a/packages/babel-helper-module-transforms/src/index.js b/packages/babel-helper-module-transforms/src/index.js index 0055273bc5..3b2fb229db 100644 --- a/packages/babel-helper-module-transforms/src/index.js +++ b/packages/babel-helper-module-transforms/src/index.js @@ -1,9 +1,9 @@ import assert from "assert"; -import * as t from "babel-types"; -import template from "babel-template"; +import * as t from "@babel/types"; +import template from "@babel/template"; import chunk from "lodash/chunk"; -import { isModule } from "babel-helper-module-imports"; +import { isModule } from "@babel/helper-module-imports"; import rewriteThis from "./rewrite-this"; import rewriteLiveReferences from "./rewrite-live-references"; diff --git a/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.js b/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.js index 44a0c636a3..87890a3a6c 100644 --- a/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.js +++ b/packages/babel-helper-module-transforms/src/normalize-and-load-metadata.js @@ -1,6 +1,6 @@ import { basename, extname } from "path"; -import * as t from "babel-types"; +import * as t from "@babel/types"; export type ModuleMetadata = { exportName: string, diff --git a/packages/babel-helper-module-transforms/src/rewrite-live-references.js b/packages/babel-helper-module-transforms/src/rewrite-live-references.js index c09e7a3cfe..bdb53e915e 100644 --- a/packages/babel-helper-module-transforms/src/rewrite-live-references.js +++ b/packages/babel-helper-module-transforms/src/rewrite-live-references.js @@ -1,7 +1,7 @@ import assert from "assert"; -import * as t from "babel-types"; -import template from "babel-template"; -import simplifyAccess from "babel-helper-simple-access"; +import * as t from "@babel/types"; +import template from "@babel/template"; +import simplifyAccess from "@babel/helper-simple-access"; import type { ModuleMetadata } from "./"; diff --git a/packages/babel-helper-optimise-call-expression/src/index.js b/packages/babel-helper-optimise-call-expression/src/index.js index b8613709e9..56f9b2991b 100644 --- a/packages/babel-helper-optimise-call-expression/src/index.js +++ b/packages/babel-helper-optimise-call-expression/src/index.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export default function(callee, thisNode, args) { if ( diff --git a/packages/babel-helper-plugin-test-runner/src/index.js b/packages/babel-helper-plugin-test-runner/src/index.js index 7877c5d7f5..cacf680a9a 100644 --- a/packages/babel-helper-plugin-test-runner/src/index.js +++ b/packages/babel-helper-plugin-test-runner/src/index.js @@ -1,4 +1,4 @@ -import testRunner from "babel-helper-transform-fixture-test-runner"; +import testRunner from "@babel/helper-transform-fixture-test-runner"; import path from "path"; export default function(loc) { diff --git a/packages/babel-helper-remap-async-to-generator/src/for-await.js b/packages/babel-helper-remap-async-to-generator/src/for-await.js index 8301045ebf..e9d1d867a8 100644 --- a/packages/babel-helper-remap-async-to-generator/src/for-await.js +++ b/packages/babel-helper-remap-async-to-generator/src/for-await.js @@ -1,5 +1,5 @@ -import * as t from "babel-types"; -import template from "babel-template"; +import * as t from "@babel/types"; +import template from "@babel/template"; const awaitTemplate = ` function* wrapper() { diff --git a/packages/babel-helper-remap-async-to-generator/src/index.js b/packages/babel-helper-remap-async-to-generator/src/index.js index a40f7c67b5..31c187e01f 100644 --- a/packages/babel-helper-remap-async-to-generator/src/index.js +++ b/packages/babel-helper-remap-async-to-generator/src/index.js @@ -1,8 +1,8 @@ /* @noflow */ -import type { NodePath } from "babel-traverse"; -import wrapFunction from "babel-helper-wrap-function"; -import * as t from "babel-types"; +import type { NodePath } from "@babel/traverse"; +import wrapFunction from "@babel/helper-wrap-function"; +import * as t from "@babel/types"; import rewriteForAwait from "./for-await"; const awaitVisitor = { diff --git a/packages/babel-helper-replace-supers/src/index.js b/packages/babel-helper-replace-supers/src/index.js index cb0fcecdee..da1437fa80 100644 --- a/packages/babel-helper-replace-supers/src/index.js +++ b/packages/babel-helper-replace-supers/src/index.js @@ -1,6 +1,6 @@ -import type { NodePath, Scope } from "babel-traverse"; -import optimiseCall from "babel-helper-optimise-call-expression"; -import * as t from "babel-types"; +import type { NodePath, Scope } from "@babel/traverse"; +import optimiseCall from "@babel/helper-optimise-call-expression"; +import * as t from "@babel/types"; // ✌️ const HARDCORE_THIS_REF = new WeakSet(); diff --git a/packages/babel-helper-simple-access/src/index.js b/packages/babel-helper-simple-access/src/index.js index 23fd22ffec..6fb382e66e 100644 --- a/packages/babel-helper-simple-access/src/index.js +++ b/packages/babel-helper-simple-access/src/index.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export default function simplifyAccess(path: NodePath, bindingNames) { path.traverse(simpleAssignmentVisitor, { diff --git a/packages/babel-helper-transform-fixture-test-runner/src/index.js b/packages/babel-helper-transform-fixture-test-runner/src/index.js index 0e4f6c3302..595c438f26 100644 --- a/packages/babel-helper-transform-fixture-test-runner/src/index.js +++ b/packages/babel-helper-transform-fixture-test-runner/src/index.js @@ -1,8 +1,8 @@ -import * as babel from "babel-core"; -import { buildExternalHelpers } from "babel-core"; -import getFixtures from "babel-helper-fixtures"; +import * as babel from "@babel/core"; +import { buildExternalHelpers } from "@babel/core"; +import getFixtures from "@babel/helper-fixtures"; import sourceMap from "source-map"; -import { codeFrameColumns } from "babel-code-frame"; +import { codeFrameColumns } from "@babel/code-frame"; import defaults from "lodash/defaults"; import includes from "lodash/includes"; import * as helpers from "./helpers"; diff --git a/packages/babel-helper-wrap-function/src/index.js b/packages/babel-helper-wrap-function/src/index.js index 9612faf3eb..5418f85f1d 100644 --- a/packages/babel-helper-wrap-function/src/index.js +++ b/packages/babel-helper-wrap-function/src/index.js @@ -1,7 +1,7 @@ -import type { NodePath } from "babel-traverse"; -import nameFunction from "babel-helper-function-name"; -import template from "babel-template"; -import * as t from "babel-types"; +import type { NodePath } from "@babel/traverse"; +import nameFunction from "@babel/helper-function-name"; +import template from "@babel/template"; +import * as t from "@babel/types"; const buildWrapper = template(` (() => { diff --git a/packages/babel-helpers/src/helpers.js b/packages/babel-helpers/src/helpers.js index fc563b91bb..0440e2a1f4 100644 --- a/packages/babel-helpers/src/helpers.js +++ b/packages/babel-helpers/src/helpers.js @@ -1,6 +1,6 @@ /* eslint max-len: "off" */ -import template from "babel-template"; +import template from "@babel/template"; const helpers = {}; export default helpers; diff --git a/packages/babel-helpers/src/index.js b/packages/babel-helpers/src/index.js index 014dfb5227..641d1bab9a 100644 --- a/packages/babel-helpers/src/index.js +++ b/packages/babel-helpers/src/index.js @@ -1,5 +1,5 @@ -import traverse from "babel-traverse"; -import * as t from "babel-types"; +import traverse from "@babel/traverse"; +import * as t from "@babel/types"; import helpers from "./helpers"; function makePath(path) { diff --git a/packages/babel-node/src/_babel-node.js b/packages/babel-node/src/_babel-node.js index 09093d63cd..51f7155135 100644 --- a/packages/babel-node/src/_babel-node.js +++ b/packages/babel-node/src/_babel-node.js @@ -3,10 +3,10 @@ import Module from "module"; import { inspect } from "util"; import path from "path"; import repl from "repl"; -import * as babel from "babel-core"; +import * as babel from "@babel/core"; import vm from "vm"; import "babel-polyfill"; -import register from "babel-register"; +import register from "@babel/register"; import pkg from "../package.json"; diff --git a/packages/babel-plugin-transform-async-functions/src/index.js b/packages/babel-plugin-transform-async-functions/src/index.js index a4a1b0e8d2..528b797773 100644 --- a/packages/babel-plugin-transform-async-functions/src/index.js +++ b/packages/babel-plugin-transform-async-functions/src/index.js @@ -1,4 +1,4 @@ -import asyncSyntaxPlugin from "babel-plugin-syntax-async-functions"; +import asyncSyntaxPlugin from "@babel/plugin-syntax-async-functions"; export default function() { return { diff --git a/packages/babel-plugin-transform-async-generator-functions/src/index.js b/packages/babel-plugin-transform-async-generator-functions/src/index.js index 36c5bff914..eece2e1d0b 100644 --- a/packages/babel-plugin-transform-async-generator-functions/src/index.js +++ b/packages/babel-plugin-transform-async-generator-functions/src/index.js @@ -1,5 +1,5 @@ -import remapAsyncToGenerator from "babel-helper-remap-async-to-generator"; -import syntaxAsyncGenerators from "babel-plugin-syntax-async-generators"; +import remapAsyncToGenerator from "@babel/helper-remap-async-to-generator"; +import syntaxAsyncGenerators from "@babel/plugin-syntax-async-generators"; export default function({ types: t }) { const yieldStarVisitor = { diff --git a/packages/babel-plugin-transform-async-to-generator/src/index.js b/packages/babel-plugin-transform-async-to-generator/src/index.js index 8c90c12efe..8243033af1 100644 --- a/packages/babel-plugin-transform-async-to-generator/src/index.js +++ b/packages/babel-plugin-transform-async-to-generator/src/index.js @@ -1,5 +1,5 @@ -import remapAsyncToGenerator from "babel-helper-remap-async-to-generator"; -import syntaxAsyncFunctions from "babel-plugin-syntax-async-functions"; +import remapAsyncToGenerator from "@babel/helper-remap-async-to-generator"; +import syntaxAsyncFunctions from "@babel/plugin-syntax-async-functions"; export default function() { return { diff --git a/packages/babel-plugin-transform-async-to-module-method/src/index.js b/packages/babel-plugin-transform-async-to-module-method/src/index.js index 515fd3b354..d3869b2134 100644 --- a/packages/babel-plugin-transform-async-to-module-method/src/index.js +++ b/packages/babel-plugin-transform-async-to-module-method/src/index.js @@ -1,7 +1,7 @@ -import remapAsyncToGenerator from "babel-helper-remap-async-to-generator"; -import syntaxAsyncFunctions from "babel-plugin-syntax-async-functions"; +import remapAsyncToGenerator from "@babel/helper-remap-async-to-generator"; +import syntaxAsyncFunctions from "@babel/plugin-syntax-async-functions"; -import { addNamed } from "babel-helper-module-imports"; +import { addNamed } from "@babel/helper-module-imports"; export default function({ types: t }, options) { const { method, module } = options; diff --git a/packages/babel-plugin-transform-class-properties/src/index.js b/packages/babel-plugin-transform-class-properties/src/index.js index cd2a7633cb..4f6f8e1b0f 100644 --- a/packages/babel-plugin-transform-class-properties/src/index.js +++ b/packages/babel-plugin-transform-class-properties/src/index.js @@ -1,6 +1,6 @@ -import nameFunction from "babel-helper-function-name"; -import template from "babel-template"; -import syntaxClassProperties from "babel-plugin-syntax-class-properties"; +import nameFunction from "@babel/helper-function-name"; +import template from "@babel/template"; +import syntaxClassProperties from "@babel/plugin-syntax-class-properties"; export default function({ types: t }, options) { const { loose } = options; diff --git a/packages/babel-plugin-transform-decorators/src/index.js b/packages/babel-plugin-transform-decorators/src/index.js index 718de12a3f..77033af36c 100644 --- a/packages/babel-plugin-transform-decorators/src/index.js +++ b/packages/babel-plugin-transform-decorators/src/index.js @@ -1,7 +1,7 @@ // Fork of https://github.com/loganfsmyth/babel-plugin-transform-decorators-legacy -import template from "babel-template"; -import syntaxDecorators from "babel-plugin-syntax-decorators"; +import template from "@babel/template"; +import syntaxDecorators from "@babel/plugin-syntax-decorators"; const buildClassDecorator = template(` DECORATOR(CLASS_REF = INNER) || CLASS_REF; diff --git a/packages/babel-plugin-transform-do-expressions/src/index.js b/packages/babel-plugin-transform-do-expressions/src/index.js index 9b164971e3..731ddbb22a 100644 --- a/packages/babel-plugin-transform-do-expressions/src/index.js +++ b/packages/babel-plugin-transform-do-expressions/src/index.js @@ -1,4 +1,4 @@ -import syntaxDoExpressions from "babel-plugin-syntax-do-expressions"; +import syntaxDoExpressions from "@babel/plugin-syntax-do-expressions"; export default function() { return { diff --git a/packages/babel-plugin-transform-es2015-arrow-functions/src/index.js b/packages/babel-plugin-transform-es2015-arrow-functions/src/index.js index 7152af69a4..c3cb3cfa5b 100644 --- a/packages/babel-plugin-transform-es2015-arrow-functions/src/index.js +++ b/packages/babel-plugin-transform-es2015-arrow-functions/src/index.js @@ -1,4 +1,4 @@ -import type NodePath from "babel-traverse"; +import type NodePath from "@babel/traverse"; export default function(babel, options) { const { spec } = options; diff --git a/packages/babel-plugin-transform-es2015-block-scoping/src/index.js b/packages/babel-plugin-transform-es2015-block-scoping/src/index.js index d9465c403c..2419c9d1d9 100644 --- a/packages/babel-plugin-transform-es2015-block-scoping/src/index.js +++ b/packages/babel-plugin-transform-es2015-block-scoping/src/index.js @@ -1,12 +1,12 @@ -import type NodePath from "babel-traverse"; -import type Scope from "babel-traverse"; +import type NodePath from "@babel/traverse"; +import type Scope from "@babel/traverse"; import type File from "../../../file"; -import traverse from "babel-traverse"; +import traverse from "@babel/traverse"; import { visitor as tdzVisitor } from "./tdz"; -import * as t from "babel-types"; +import * as t from "@babel/types"; import values from "lodash/values"; import extend from "lodash/extend"; -import template from "babel-template"; +import template from "@babel/template"; const DONE = new WeakSet(); diff --git a/packages/babel-plugin-transform-es2015-block-scoping/src/tdz.js b/packages/babel-plugin-transform-es2015-block-scoping/src/tdz.js index e9ec166e16..457efe58e9 100644 --- a/packages/babel-plugin-transform-es2015-block-scoping/src/tdz.js +++ b/packages/babel-plugin-transform-es2015-block-scoping/src/tdz.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; function getTDZStatus(refPath, bindingPath) { const executionStatus = bindingPath._guessExecutionStatusRelativeTo(refPath); diff --git a/packages/babel-plugin-transform-es2015-classes/src/index.js b/packages/babel-plugin-transform-es2015-classes/src/index.js index 001128daf3..4c01ff4a81 100644 --- a/packages/babel-plugin-transform-es2015-classes/src/index.js +++ b/packages/babel-plugin-transform-es2015-classes/src/index.js @@ -1,7 +1,7 @@ import LooseTransformer from "./loose"; import VanillaTransformer from "./vanilla"; -import annotateAsPure from "babel-helper-annotate-as-pure"; -import nameFunction from "babel-helper-function-name"; +import annotateAsPure from "@babel/helper-annotate-as-pure"; +import nameFunction from "@babel/helper-function-name"; export default function({ types: t }, options) { const { loose } = options; diff --git a/packages/babel-plugin-transform-es2015-classes/src/lib/memoise-decorators.js b/packages/babel-plugin-transform-es2015-classes/src/lib/memoise-decorators.js index 6c9693ff63..2c51272399 100644 --- a/packages/babel-plugin-transform-es2015-classes/src/lib/memoise-decorators.js +++ b/packages/babel-plugin-transform-es2015-classes/src/lib/memoise-decorators.js @@ -1,5 +1,5 @@ -import type { Scope } from "babel-traverse"; -import * as t from "babel-types"; +import type { Scope } from "@babel/traverse"; +import * as t from "@babel/types"; export default function( decorators: Array, diff --git a/packages/babel-plugin-transform-es2015-classes/src/loose.js b/packages/babel-plugin-transform-es2015-classes/src/loose.js index ea6fd114b8..1858e66cb9 100644 --- a/packages/babel-plugin-transform-es2015-classes/src/loose.js +++ b/packages/babel-plugin-transform-es2015-classes/src/loose.js @@ -1,6 +1,6 @@ -import nameFunction from "babel-helper-function-name"; +import nameFunction from "@babel/helper-function-name"; import VanillaTransformer from "./vanilla"; -import * as t from "babel-types"; +import * as t from "@babel/types"; export default class LooseClassTransformer extends VanillaTransformer { constructor() { diff --git a/packages/babel-plugin-transform-es2015-classes/src/vanilla.js b/packages/babel-plugin-transform-es2015-classes/src/vanilla.js index 0b94bd1131..7a705466b3 100644 --- a/packages/babel-plugin-transform-es2015-classes/src/vanilla.js +++ b/packages/babel-plugin-transform-es2015-classes/src/vanilla.js @@ -1,10 +1,10 @@ -import type { NodePath } from "babel-traverse"; -import { visitors } from "babel-traverse"; -import ReplaceSupers from "babel-helper-replace-supers"; -import optimiseCall from "babel-helper-optimise-call-expression"; -import * as defineMap from "babel-helper-define-map"; -import template from "babel-template"; -import * as t from "babel-types"; +import type { NodePath } from "@babel/traverse"; +import { visitors } from "@babel/traverse"; +import ReplaceSupers from "@babel/helper-replace-supers"; +import optimiseCall from "@babel/helper-optimise-call-expression"; +import * as defineMap from "@babel/helper-define-map"; +import template from "@babel/template"; +import * as t from "@babel/types"; const buildDerivedConstructor = template(` (function () { diff --git a/packages/babel-plugin-transform-es2015-duplicate-keys/src/index.js b/packages/babel-plugin-transform-es2015-duplicate-keys/src/index.js index bb81c312e6..0e7f532b89 100644 --- a/packages/babel-plugin-transform-es2015-duplicate-keys/src/index.js +++ b/packages/babel-plugin-transform-es2015-duplicate-keys/src/index.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; function getName(key) { if (t.isIdentifier(key)) { diff --git a/packages/babel-plugin-transform-es2015-function-name/src/index.js b/packages/babel-plugin-transform-es2015-function-name/src/index.js index 7288694c4c..27f626a49a 100644 --- a/packages/babel-plugin-transform-es2015-function-name/src/index.js +++ b/packages/babel-plugin-transform-es2015-function-name/src/index.js @@ -1,4 +1,4 @@ -import nameFunction from "babel-helper-function-name"; +import nameFunction from "@babel/helper-function-name"; export default function() { return { diff --git a/packages/babel-plugin-transform-es2015-modules-amd/src/index.js b/packages/babel-plugin-transform-es2015-modules-amd/src/index.js index 0d9d092543..ca53784ea2 100644 --- a/packages/babel-plugin-transform-es2015-modules-amd/src/index.js +++ b/packages/babel-plugin-transform-es2015-modules-amd/src/index.js @@ -1,4 +1,4 @@ -import template from "babel-template"; +import template from "@babel/template"; import { isModule, rewriteModuleStatementsAndPrepareHeader, @@ -7,7 +7,7 @@ import { buildNamespaceInitStatements, ensureStatementsHoisted, wrapInterop, -} from "babel-helper-module-transforms"; +} from "@babel/helper-module-transforms"; const buildWrapper = template(` define(MODULE_NAME, AMD_ARGUMENTS, function(IMPORT_NAMES) { diff --git a/packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js b/packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js index 3116f209b4..cc64b90bc0 100644 --- a/packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js +++ b/packages/babel-plugin-transform-es2015-modules-commonjs/src/index.js @@ -5,8 +5,8 @@ import { buildNamespaceInitStatements, ensureStatementsHoisted, wrapInterop, -} from "babel-helper-module-transforms"; -import simplifyAccess from "babel-helper-simple-access"; +} from "@babel/helper-module-transforms"; +import simplifyAccess from "@babel/helper-simple-access"; export default function({ types: t, template }, options) { const { diff --git a/packages/babel-plugin-transform-es2015-modules-systemjs/src/index.js b/packages/babel-plugin-transform-es2015-modules-systemjs/src/index.js index 4738cb9f06..2e3de1e3c5 100644 --- a/packages/babel-plugin-transform-es2015-modules-systemjs/src/index.js +++ b/packages/babel-plugin-transform-es2015-modules-systemjs/src/index.js @@ -1,5 +1,5 @@ -import hoistVariables from "babel-helper-hoist-variables"; -import template from "babel-template"; +import hoistVariables from "@babel/helper-hoist-variables"; +import template from "@babel/template"; const buildTemplate = template(` SYSTEM_REGISTER(MODULE_NAME, [SOURCES], function (EXPORT_IDENTIFIER, CONTEXT_IDENTIFIER) { diff --git a/packages/babel-plugin-transform-es2015-modules-umd/src/index.js b/packages/babel-plugin-transform-es2015-modules-umd/src/index.js index 4b79fd0385..7bbd0cd4cc 100644 --- a/packages/babel-plugin-transform-es2015-modules-umd/src/index.js +++ b/packages/babel-plugin-transform-es2015-modules-umd/src/index.js @@ -1,5 +1,5 @@ import { basename, extname } from "path"; -import template from "babel-template"; +import template from "@babel/template"; import { isModule, rewriteModuleStatementsAndPrepareHeader, @@ -8,7 +8,7 @@ import { buildNamespaceInitStatements, ensureStatementsHoisted, wrapInterop, -} from "babel-helper-module-transforms"; +} from "@babel/helper-module-transforms"; const buildPrerequisiteAssignment = template(` GLOBAL_REFERENCE = GLOBAL_REFERENCE || {} diff --git a/packages/babel-plugin-transform-es2015-object-super/src/index.js b/packages/babel-plugin-transform-es2015-object-super/src/index.js index 62f360382e..13411d7fc9 100644 --- a/packages/babel-plugin-transform-es2015-object-super/src/index.js +++ b/packages/babel-plugin-transform-es2015-object-super/src/index.js @@ -1,4 +1,4 @@ -import ReplaceSupers from "babel-helper-replace-supers"; +import ReplaceSupers from "@babel/helper-replace-supers"; function replacePropertySuper(path, node, scope, getObjectRef, file) { const replaceSupers = new ReplaceSupers({ diff --git a/packages/babel-plugin-transform-es2015-parameters/src/params.js b/packages/babel-plugin-transform-es2015-parameters/src/params.js index e5e4dc0105..f9e8d0cb20 100644 --- a/packages/babel-plugin-transform-es2015-parameters/src/params.js +++ b/packages/babel-plugin-transform-es2015-parameters/src/params.js @@ -1,6 +1,6 @@ -import callDelegate from "babel-helper-call-delegate"; -import template from "babel-template"; -import * as t from "babel-types"; +import callDelegate from "@babel/helper-call-delegate"; +import template from "@babel/template"; +import * as t from "@babel/types"; const buildDefaultParam = template(` let VARIABLE_NAME = diff --git a/packages/babel-plugin-transform-es2015-parameters/src/rest.js b/packages/babel-plugin-transform-es2015-parameters/src/rest.js index 1eca6be676..6bd61d5707 100644 --- a/packages/babel-plugin-transform-es2015-parameters/src/rest.js +++ b/packages/babel-plugin-transform-es2015-parameters/src/rest.js @@ -1,5 +1,5 @@ -import template from "babel-template"; -import * as t from "babel-types"; +import template from "@babel/template"; +import * as t from "@babel/types"; const buildRest = template(` for (var LEN = ARGUMENTS.length, diff --git a/packages/babel-plugin-transform-es2015-shorthand-properties/src/index.js b/packages/babel-plugin-transform-es2015-shorthand-properties/src/index.js index 220b93c4e7..3408d9b800 100644 --- a/packages/babel-plugin-transform-es2015-shorthand-properties/src/index.js +++ b/packages/babel-plugin-transform-es2015-shorthand-properties/src/index.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export default function() { return { diff --git a/packages/babel-plugin-transform-es2015-sticky-regex/src/index.js b/packages/babel-plugin-transform-es2015-sticky-regex/src/index.js index 25748ba7f4..32e284e9b0 100644 --- a/packages/babel-plugin-transform-es2015-sticky-regex/src/index.js +++ b/packages/babel-plugin-transform-es2015-sticky-regex/src/index.js @@ -1,5 +1,5 @@ -import * as regex from "babel-helper-regex"; -import * as t from "babel-types"; +import * as regex from "@babel/helper-regex"; +import * as t from "@babel/types"; export default function() { return { diff --git a/packages/babel-plugin-transform-es2015-template-literals/src/index.js b/packages/babel-plugin-transform-es2015-template-literals/src/index.js index 89bdd691e6..416d3938e7 100644 --- a/packages/babel-plugin-transform-es2015-template-literals/src/index.js +++ b/packages/babel-plugin-transform-es2015-template-literals/src/index.js @@ -1,4 +1,4 @@ -import annotateAsPure from "babel-helper-annotate-as-pure"; +import annotateAsPure from "@babel/helper-annotate-as-pure"; export default function({ types: t }, options) { const { loose } = options; diff --git a/packages/babel-plugin-transform-es2015-unicode-regex/src/index.js b/packages/babel-plugin-transform-es2015-unicode-regex/src/index.js index 6af40c3918..2236040919 100644 --- a/packages/babel-plugin-transform-es2015-unicode-regex/src/index.js +++ b/packages/babel-plugin-transform-es2015-unicode-regex/src/index.js @@ -1,5 +1,5 @@ import rewritePattern from "regexpu-core"; -import * as regex from "babel-helper-regex"; +import * as regex from "@babel/helper-regex"; export default function() { return { diff --git a/packages/babel-plugin-transform-es5-property-mutators/src/index.js b/packages/babel-plugin-transform-es5-property-mutators/src/index.js index 3d22f6d680..d3c4205110 100644 --- a/packages/babel-plugin-transform-es5-property-mutators/src/index.js +++ b/packages/babel-plugin-transform-es5-property-mutators/src/index.js @@ -1,4 +1,4 @@ -import * as defineMap from "babel-helper-define-map"; +import * as defineMap from "@babel/helper-define-map"; export default function({ types: t }) { return { diff --git a/packages/babel-plugin-transform-exponentiation-operator/src/index.js b/packages/babel-plugin-transform-exponentiation-operator/src/index.js index 9ac165068c..786c3f6561 100644 --- a/packages/babel-plugin-transform-exponentiation-operator/src/index.js +++ b/packages/babel-plugin-transform-exponentiation-operator/src/index.js @@ -1,5 +1,5 @@ -import build from "babel-helper-builder-binary-assignment-operator-visitor"; -import syntaxExponentiationOperator from "babel-plugin-syntax-exponentiation-operator"; +import build from "@babel/helper-builder-binary-assignment-operator-visitor"; +import syntaxExponentiationOperator from "@babel/plugin-syntax-exponentiation-operator"; export default function({ types: t }) { return { diff --git a/packages/babel-plugin-transform-export-default/src/index.js b/packages/babel-plugin-transform-export-default/src/index.js index 3d32e5a8be..b91a438ed5 100644 --- a/packages/babel-plugin-transform-export-default/src/index.js +++ b/packages/babel-plugin-transform-export-default/src/index.js @@ -1,4 +1,4 @@ -import syntaxExportExtensions from "babel-plugin-syntax-export-extensions"; +import syntaxExportExtensions from "@babel/plugin-syntax-export-extensions"; export default function({ types: t }) { return { diff --git a/packages/babel-plugin-transform-export-namespace/src/index.js b/packages/babel-plugin-transform-export-namespace/src/index.js index d3f61966d6..da9717c04a 100644 --- a/packages/babel-plugin-transform-export-namespace/src/index.js +++ b/packages/babel-plugin-transform-export-namespace/src/index.js @@ -1,4 +1,4 @@ -import syntaxExportExtensions from "babel-plugin-syntax-export-extensions"; +import syntaxExportExtensions from "@babel/plugin-syntax-export-extensions"; export default function({ types: t }) { return { diff --git a/packages/babel-plugin-transform-flow-comments/src/index.js b/packages/babel-plugin-transform-flow-comments/src/index.js index 3528072f3b..13dce7a0e6 100644 --- a/packages/babel-plugin-transform-flow-comments/src/index.js +++ b/packages/babel-plugin-transform-flow-comments/src/index.js @@ -1,4 +1,4 @@ -import syntaxFlow from "babel-plugin-syntax-flow"; +import syntaxFlow from "@babel/plugin-syntax-flow"; export default function({ types: t }) { function wrapInFlowComment(path, parent) { diff --git a/packages/babel-plugin-transform-flow-strip-types/src/index.js b/packages/babel-plugin-transform-flow-strip-types/src/index.js index bfd6e778fa..923554183d 100644 --- a/packages/babel-plugin-transform-flow-strip-types/src/index.js +++ b/packages/babel-plugin-transform-flow-strip-types/src/index.js @@ -1,4 +1,4 @@ -import syntaxFlow from "babel-plugin-syntax-flow"; +import syntaxFlow from "@babel/plugin-syntax-flow"; export default function({ types: t }) { const FLOW_DIRECTIVE = "@flow"; diff --git a/packages/babel-plugin-transform-function-bind/src/index.js b/packages/babel-plugin-transform-function-bind/src/index.js index bec542299f..818351e7de 100644 --- a/packages/babel-plugin-transform-function-bind/src/index.js +++ b/packages/babel-plugin-transform-function-bind/src/index.js @@ -1,4 +1,4 @@ -import syntaxFunctionBind from "babel-plugin-syntax-function-bind"; +import syntaxFunctionBind from "@babel/plugin-syntax-function-bind"; export default function({ types: t }) { function getTempId(scope) { diff --git a/packages/babel-plugin-transform-function-sent/src/index.js b/packages/babel-plugin-transform-function-sent/src/index.js index bc5f8d9261..b546089585 100644 --- a/packages/babel-plugin-transform-function-sent/src/index.js +++ b/packages/babel-plugin-transform-function-sent/src/index.js @@ -1,5 +1,5 @@ -import syntaxFunctionSent from "babel-plugin-syntax-function-sent"; -import wrapFunction from "babel-helper-wrap-function"; +import syntaxFunctionSent from "@babel/plugin-syntax-function-sent"; +import wrapFunction from "@babel/helper-wrap-function"; export default function({ types: t }) { const isFunctionSent = node => diff --git a/packages/babel-plugin-transform-numeric-separator/src/index.js b/packages/babel-plugin-transform-numeric-separator/src/index.js index 07f2f91fc1..d3f5cb860c 100644 --- a/packages/babel-plugin-transform-numeric-separator/src/index.js +++ b/packages/babel-plugin-transform-numeric-separator/src/index.js @@ -1,4 +1,4 @@ -import syntaxNumericSeparator from "babel-plugin-syntax-numeric-separator"; +import syntaxNumericSeparator from "@babel/plugin-syntax-numeric-separator"; export default function({ types: t }) { function replaceNumberArg({ node }) { diff --git a/packages/babel-plugin-transform-object-rest-spread/src/index.js b/packages/babel-plugin-transform-object-rest-spread/src/index.js index a33cff0217..d9277e5197 100644 --- a/packages/babel-plugin-transform-object-rest-spread/src/index.js +++ b/packages/babel-plugin-transform-object-rest-spread/src/index.js @@ -1,4 +1,4 @@ -import syntaxObjectRestSpread from "babel-plugin-syntax-object-rest-spread"; +import syntaxObjectRestSpread from "@babel/plugin-syntax-object-rest-spread"; export default function({ types: t }) { function hasRestElement(path) { diff --git a/packages/babel-plugin-transform-optional-catch-binding/src/index.js b/packages/babel-plugin-transform-optional-catch-binding/src/index.js index 9430e4e732..8c2758fec2 100644 --- a/packages/babel-plugin-transform-optional-catch-binding/src/index.js +++ b/packages/babel-plugin-transform-optional-catch-binding/src/index.js @@ -1,4 +1,4 @@ -import syntaxOptionalCatchBinding from "babel-plugin-syntax-optional-catch-binding"; +import syntaxOptionalCatchBinding from "@babel/plugin-syntax-optional-catch-binding"; export default function() { return { diff --git a/packages/babel-plugin-transform-optional-chaining/src/index.js b/packages/babel-plugin-transform-optional-chaining/src/index.js index ca50914f83..4ec80011ca 100644 --- a/packages/babel-plugin-transform-optional-chaining/src/index.js +++ b/packages/babel-plugin-transform-optional-chaining/src/index.js @@ -1,4 +1,4 @@ -import syntaxOptionalChaining from "babel-plugin-syntax-optional-chaining"; +import syntaxOptionalChaining from "@babel/plugin-syntax-optional-chaining"; export default function({ types: t }, options) { const { loose = false } = options; diff --git a/packages/babel-plugin-transform-pipeline-operator/src/index.js b/packages/babel-plugin-transform-pipeline-operator/src/index.js index ba0f422f4c..93085d7d9d 100644 --- a/packages/babel-plugin-transform-pipeline-operator/src/index.js +++ b/packages/babel-plugin-transform-pipeline-operator/src/index.js @@ -1,4 +1,4 @@ -import syntaxPipelineOperator from "babel-plugin-syntax-pipeline-operator"; +import syntaxPipelineOperator from "@babel/plugin-syntax-pipeline-operator"; export default function({ types: t }) { return { diff --git a/packages/babel-plugin-transform-react-inline-elements/src/index.js b/packages/babel-plugin-transform-react-inline-elements/src/index.js index ee706c0b85..56297bbaf5 100644 --- a/packages/babel-plugin-transform-react-inline-elements/src/index.js +++ b/packages/babel-plugin-transform-react-inline-elements/src/index.js @@ -1,4 +1,4 @@ -import helper from "babel-helper-builder-react-jsx"; +import helper from "@babel/helper-builder-react-jsx"; export default function({ types: t }) { function hasRefOrSpread(attrs) { 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 090063762e..51ca87ae48 100644 --- a/packages/babel-plugin-transform-react-jsx-compat/src/index.js +++ b/packages/babel-plugin-transform-react-jsx-compat/src/index.js @@ -1,4 +1,4 @@ -import helper from "babel-helper-builder-react-jsx"; +import helper from "@babel/helper-builder-react-jsx"; export default function({ types: t }) { return { diff --git a/packages/babel-plugin-transform-react-jsx/src/index.js b/packages/babel-plugin-transform-react-jsx/src/index.js index 750ab3eed7..c9f3214e22 100644 --- a/packages/babel-plugin-transform-react-jsx/src/index.js +++ b/packages/babel-plugin-transform-react-jsx/src/index.js @@ -1,5 +1,5 @@ -import jsx from "babel-plugin-syntax-jsx"; -import helper from "babel-helper-builder-react-jsx"; +import jsx from "@babel/plugin-syntax-jsx"; +import helper from "@babel/helper-builder-react-jsx"; export default function({ types: t }, options) { const { pragma } = options; diff --git a/packages/babel-plugin-transform-runtime/src/index.js b/packages/babel-plugin-transform-runtime/src/index.js index f52b190abe..eb2a43ce52 100644 --- a/packages/babel-plugin-transform-runtime/src/index.js +++ b/packages/babel-plugin-transform-runtime/src/index.js @@ -1,4 +1,4 @@ -import { addDefault, isModule } from "babel-helper-module-imports"; +import { addDefault, isModule } from "@babel/helper-module-imports"; import definitions from "./definitions"; diff --git a/packages/babel-plugin-transform-strict-mode/src/index.js b/packages/babel-plugin-transform-strict-mode/src/index.js index ac94b5d92f..5f3902320b 100644 --- a/packages/babel-plugin-transform-strict-mode/src/index.js +++ b/packages/babel-plugin-transform-strict-mode/src/index.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export default function() { return { diff --git a/packages/babel-plugin-transform-throw-expressions/src/index.js b/packages/babel-plugin-transform-throw-expressions/src/index.js index 81aac0c73c..a9a50df176 100644 --- a/packages/babel-plugin-transform-throw-expressions/src/index.js +++ b/packages/babel-plugin-transform-throw-expressions/src/index.js @@ -1,4 +1,4 @@ -import syntaxThrowExpressions from "babel-plugin-syntax-throw-expressions"; +import syntaxThrowExpressions from "@babel/plugin-syntax-throw-expressions"; export default function({ types: t }) { return { diff --git a/packages/babel-plugin-transform-typescript/src/index.js b/packages/babel-plugin-transform-typescript/src/index.js index b5d4f8faad..9b2d384c0d 100644 --- a/packages/babel-plugin-transform-typescript/src/index.js +++ b/packages/babel-plugin-transform-typescript/src/index.js @@ -1,4 +1,4 @@ -import syntaxTypeScript from "babel-plugin-syntax-typescript"; +import syntaxTypeScript from "@babel/plugin-syntax-typescript"; import transpileEnum from "./enum"; diff --git a/packages/babel-preset-es2015/src/index.js b/packages/babel-preset-es2015/src/index.js index 2d50c24d2c..8276026bc9 100644 --- a/packages/babel-preset-es2015/src/index.js +++ b/packages/babel-preset-es2015/src/index.js @@ -1,28 +1,28 @@ -import transformES2015TemplateLiterals from "babel-plugin-transform-es2015-template-literals"; -import transformES2015Literals from "babel-plugin-transform-es2015-literals"; -import transformES2015FunctionName from "babel-plugin-transform-es2015-function-name"; -import transformES2015ArrowFunctions from "babel-plugin-transform-es2015-arrow-functions"; -import transformES2015BlockScopedFunctions from "babel-plugin-transform-es2015-block-scoped-functions"; -import transformES2015Classes from "babel-plugin-transform-es2015-classes"; -import transformES2015ObjectSuper from "babel-plugin-transform-es2015-object-super"; -import transformES2015ShorthandProperties from "babel-plugin-transform-es2015-shorthand-properties"; -import transformES2015DuplicateKeys from "babel-plugin-transform-es2015-duplicate-keys"; -import transformES2015ComputedProperties from "babel-plugin-transform-es2015-computed-properties"; -import transformES2015ForOf from "babel-plugin-transform-es2015-for-of"; -import transformES2015StickyRegex from "babel-plugin-transform-es2015-sticky-regex"; -import transformES2015UnicodeRegex from "babel-plugin-transform-es2015-unicode-regex"; -import checkES2015Constants from "babel-plugin-check-es2015-constants"; -import transformES2015Spread from "babel-plugin-transform-es2015-spread"; -import transformES2015Parameters from "babel-plugin-transform-es2015-parameters"; -import transformES2015Destructuring from "babel-plugin-transform-es2015-destructuring"; -import transformES2015BlockScoping from "babel-plugin-transform-es2015-block-scoping"; -import transformES2015TypeofSymbol from "babel-plugin-transform-es2015-typeof-symbol"; -import transformES2015ModulesCommonJS from "babel-plugin-transform-es2015-modules-commonjs"; -import transformES2015ModulesSystemJS from "babel-plugin-transform-es2015-modules-systemjs"; -import transformES2015ModulesAMD from "babel-plugin-transform-es2015-modules-amd"; -import transformES2015ModulesUMD from "babel-plugin-transform-es2015-modules-umd"; -import transformES2015Instanceof from "babel-plugin-transform-es2015-instanceof"; -import transformRegenerator from "babel-plugin-transform-regenerator"; +import transformES2015TemplateLiterals from "@babel/plugin-transform-es2015-template-literals"; +import transformES2015Literals from "@babel/plugin-transform-es2015-literals"; +import transformES2015FunctionName from "@babel/plugin-transform-es2015-function-name"; +import transformES2015ArrowFunctions from "@babel/plugin-transform-es2015-arrow-functions"; +import transformES2015BlockScopedFunctions from "@babel/plugin-transform-es2015-block-scoped-functions"; +import transformES2015Classes from "@babel/plugin-transform-es2015-classes"; +import transformES2015ObjectSuper from "@babel/plugin-transform-es2015-object-super"; +import transformES2015ShorthandProperties from "@babel/plugin-transform-es2015-shorthand-properties"; +import transformES2015DuplicateKeys from "@babel/plugin-transform-es2015-duplicate-keys"; +import transformES2015ComputedProperties from "@babel/plugin-transform-es2015-computed-properties"; +import transformES2015ForOf from "@babel/plugin-transform-es2015-for-of"; +import transformES2015StickyRegex from "@babel/plugin-transform-es2015-sticky-regex"; +import transformES2015UnicodeRegex from "@babel/plugin-transform-es2015-unicode-regex"; +import checkES2015Constants from "@babel/plugin-check-es2015-constants"; +import transformES2015Spread from "@babel/plugin-transform-es2015-spread"; +import transformES2015Parameters from "@babel/plugin-transform-es2015-parameters"; +import transformES2015Destructuring from "@babel/plugin-transform-es2015-destructuring"; +import transformES2015BlockScoping from "@babel/plugin-transform-es2015-block-scoping"; +import transformES2015TypeofSymbol from "@babel/plugin-transform-es2015-typeof-symbol"; +import transformES2015ModulesCommonJS from "@babel/plugin-transform-es2015-modules-commonjs"; +import transformES2015ModulesSystemJS from "@babel/plugin-transform-es2015-modules-systemjs"; +import transformES2015ModulesAMD from "@babel/plugin-transform-es2015-modules-amd"; +import transformES2015ModulesUMD from "@babel/plugin-transform-es2015-modules-umd"; +import transformES2015Instanceof from "@babel/plugin-transform-es2015-instanceof"; +import transformRegenerator from "@babel/plugin-transform-regenerator"; export default function(context, opts = {}) { const moduleTypes = ["commonjs", "amd", "umd", "systemjs"]; diff --git a/packages/babel-preset-es2016/src/index.js b/packages/babel-preset-es2016/src/index.js index a9fdd007da..c246cc3692 100644 --- a/packages/babel-preset-es2016/src/index.js +++ b/packages/babel-preset-es2016/src/index.js @@ -1,4 +1,4 @@ -import transformExponentiationOperator from "babel-plugin-transform-exponentiation-operator"; +import transformExponentiationOperator from "@babel/plugin-transform-exponentiation-operator"; export default function() { return { diff --git a/packages/babel-preset-es2017/src/index.js b/packages/babel-preset-es2017/src/index.js index 84503ce7e3..4e75713777 100644 --- a/packages/babel-preset-es2017/src/index.js +++ b/packages/babel-preset-es2017/src/index.js @@ -1,5 +1,5 @@ -import syntaxTrailingFunctionCommas from "babel-plugin-syntax-trailing-function-commas"; -import transformAsyncToGenerator from "babel-plugin-transform-async-to-generator"; +import syntaxTrailingFunctionCommas from "@babel/plugin-syntax-trailing-function-commas"; +import transformAsyncToGenerator from "@babel/plugin-transform-async-to-generator"; export default function() { return { diff --git a/packages/babel-preset-flow/src/index.js b/packages/babel-preset-flow/src/index.js index f4829387e0..844f46a817 100644 --- a/packages/babel-preset-flow/src/index.js +++ b/packages/babel-preset-flow/src/index.js @@ -1,4 +1,4 @@ -import transformFlowStripTypes from "babel-plugin-transform-flow-strip-types"; +import transformFlowStripTypes from "@babel/plugin-transform-flow-strip-types"; export default function() { return { diff --git a/packages/babel-preset-react/src/index.js b/packages/babel-preset-react/src/index.js index b7aed2441b..6a854c2b8d 100644 --- a/packages/babel-preset-react/src/index.js +++ b/packages/babel-preset-react/src/index.js @@ -1,8 +1,8 @@ -import transformReactJSX from "babel-plugin-transform-react-jsx"; -import transformSyntaxJSX from "babel-plugin-syntax-jsx"; -import transformReactDisplayName from "babel-plugin-transform-react-display-name"; -import transformReactJSXSource from "babel-plugin-transform-react-jsx-source"; -import transformReactJSXSelf from "babel-plugin-transform-react-jsx-self"; +import transformReactJSX from "@babel/plugin-transform-react-jsx"; +import transformSyntaxJSX from "@babel/plugin-syntax-jsx"; +import transformReactDisplayName from "@babel/plugin-transform-react-display-name"; +import transformReactJSXSource from "@babel/plugin-transform-react-jsx-source"; +import transformReactJSXSelf from "@babel/plugin-transform-react-jsx-self"; export default function(context, opts = {}) { const development = opts.development || false; diff --git a/packages/babel-preset-stage-0/src/index.js b/packages/babel-preset-stage-0/src/index.js index 52b941f87c..2a6ec1f8e5 100644 --- a/packages/babel-preset-stage-0/src/index.js +++ b/packages/babel-preset-stage-0/src/index.js @@ -1,7 +1,7 @@ -import presetStage1 from "babel-preset-stage-1"; +import presetStage1 from "@babel/preset-stage-1"; -import transformDoExpressions from "babel-plugin-transform-do-expressions"; -import transformFunctionBind from "babel-plugin-transform-function-bind"; +import transformDoExpressions from "@babel/plugin-transform-do-expressions"; +import transformFunctionBind from "@babel/plugin-transform-function-bind"; export default function() { return { diff --git a/packages/babel-preset-stage-1/src/index.js b/packages/babel-preset-stage-1/src/index.js index 7b204690da..a26c5818b2 100644 --- a/packages/babel-preset-stage-1/src/index.js +++ b/packages/babel-preset-stage-1/src/index.js @@ -1,9 +1,9 @@ -import presetStage2 from "babel-preset-stage-2"; +import presetStage2 from "@babel/preset-stage-2"; -import transformDecorators from "babel-plugin-transform-decorators"; -import transformExportDefault from "babel-plugin-transform-export-default"; -import transformOptionalChaining from "babel-plugin-transform-optional-chaining"; -import transformPipelineOperator from "babel-plugin-transform-pipeline-operator"; +import transformDecorators from "@babel/plugin-transform-decorators"; +import transformExportDefault from "@babel/plugin-transform-export-default"; +import transformOptionalChaining from "@babel/plugin-transform-optional-chaining"; +import transformPipelineOperator from "@babel/plugin-transform-pipeline-operator"; export default function() { return { diff --git a/packages/babel-preset-stage-2/src/index.js b/packages/babel-preset-stage-2/src/index.js index fa0f566efb..b937a09070 100644 --- a/packages/babel-preset-stage-2/src/index.js +++ b/packages/babel-preset-stage-2/src/index.js @@ -1,9 +1,9 @@ -import presetStage3 from "babel-preset-stage-3"; +import presetStage3 from "@babel/preset-stage-3"; -import transformFunctionSent from "babel-plugin-transform-function-sent"; -import transformExportNamespace from "babel-plugin-transform-export-namespace"; -import transformNumericSeparator from "babel-plugin-transform-numeric-separator"; -import transformThrowExpressions from "babel-plugin-transform-throw-expressions"; +import transformFunctionSent from "@babel/plugin-transform-function-sent"; +import transformExportNamespace from "@babel/plugin-transform-export-namespace"; +import transformNumericSeparator from "@babel/plugin-transform-numeric-separator"; +import transformThrowExpressions from "@babel/plugin-transform-throw-expressions"; export default function() { return { diff --git a/packages/babel-preset-stage-3/src/index.js b/packages/babel-preset-stage-3/src/index.js index 90ae34bb42..4c1a21cc5b 100644 --- a/packages/babel-preset-stage-3/src/index.js +++ b/packages/babel-preset-stage-3/src/index.js @@ -1,9 +1,9 @@ -import syntaxDynamicImport from "babel-plugin-syntax-dynamic-import"; -import transformAsyncGeneratorFunctions from "babel-plugin-transform-async-generator-functions"; -import transformClassProperties from "babel-plugin-transform-class-properties"; -import transformObjectRestSpread from "babel-plugin-transform-object-rest-spread"; -import transformOptionalCatchBinding from "babel-plugin-transform-optional-catch-binding"; -import transformUnicodePropertyRegex from "babel-plugin-transform-unicode-property-regex"; +import syntaxDynamicImport from "@babel/plugin-syntax-dynamic-import"; +import transformAsyncGeneratorFunctions from "@babel/plugin-transform-async-generator-functions"; +import transformClassProperties from "@babel/plugin-transform-class-properties"; +import transformObjectRestSpread from "@babel/plugin-transform-object-rest-spread"; +import transformOptionalCatchBinding from "@babel/plugin-transform-optional-catch-binding"; +import transformUnicodePropertyRegex from "@babel/plugin-transform-unicode-property-regex"; export default function() { return { diff --git a/packages/babel-preset-typescript/src/index.js b/packages/babel-preset-typescript/src/index.js index 5abf7438d3..9348fa0622 100644 --- a/packages/babel-preset-typescript/src/index.js +++ b/packages/babel-preset-typescript/src/index.js @@ -1,4 +1,4 @@ -import transformTypeScript from "babel-plugin-transform-typescript"; +import transformTypeScript from "@babel/plugin-transform-typescript"; export default function() { return { diff --git a/packages/babel-register/src/cache.js b/packages/babel-register/src/cache.js index 56575820c6..23bbda8f28 100644 --- a/packages/babel-register/src/cache.js +++ b/packages/babel-register/src/cache.js @@ -2,7 +2,7 @@ import path from "path"; import fs from "fs"; import { sync as mkdirpSync } from "mkdirp"; import homeOrTmp from "home-or-tmp"; -import * as babel from "babel-core"; +import * as babel from "@babel/core"; import findCacheDir from "find-cache-dir"; const DEFAULT_CACHE_DIR = findCacheDir({ name: "babel-register" }) || homeOrTmp; diff --git a/packages/babel-register/src/node.js b/packages/babel-register/src/node.js index c54208afdd..e58a662673 100644 --- a/packages/babel-register/src/node.js +++ b/packages/babel-register/src/node.js @@ -2,8 +2,8 @@ import deepClone from "lodash/cloneDeep"; import sourceMapSupport from "source-map-support"; import * as registerCache from "./cache"; import escapeRegExp from "lodash/escapeRegExp"; -import * as babel from "babel-core"; -import { OptionManager, DEFAULT_EXTENSIONS } from "babel-core"; +import * as babel from "@babel/core"; +import { OptionManager, DEFAULT_EXTENSIONS } from "@babel/core"; import { addHook } from "pirates"; import fs from "fs"; import path from "path"; diff --git a/packages/babel-standalone/src/index.js b/packages/babel-standalone/src/index.js index 932175a0ae..5078b6cbbc 100644 --- a/packages/babel-standalone/src/index.js +++ b/packages/babel-standalone/src/index.js @@ -9,7 +9,7 @@ /* global VERSION */ /* eslint-disable max-len */ -import * as Babel from "babel-core"; +import * as Babel from "@babel/core"; import { runScripts } from "./transformScriptTags"; diff --git a/packages/babel-template/src/index.js b/packages/babel-template/src/index.js index c4f29583b3..11e7dd1a3b 100644 --- a/packages/babel-template/src/index.js +++ b/packages/babel-template/src/index.js @@ -1,9 +1,9 @@ import cloneDeep from "lodash/cloneDeep"; import has from "lodash/has"; -import traverse from "babel-traverse"; +import traverse from "@babel/traverse"; import * as babylon from "babylon"; -import { codeFrameColumns } from "babel-code-frame"; -import * as t from "babel-types"; +import { codeFrameColumns } from "@babel/code-frame"; +import * as t from "@babel/types"; const FROM_TEMPLATE = new Set(); diff --git a/packages/babel-traverse/src/context.js b/packages/babel-traverse/src/context.js index a19df4b0c9..a2ac253eba 100644 --- a/packages/babel-traverse/src/context.js +++ b/packages/babel-traverse/src/context.js @@ -1,5 +1,5 @@ import NodePath from "./path"; -import * as t from "babel-types"; +import * as t from "@babel/types"; const testing = process.env.NODE_ENV === "test"; diff --git a/packages/babel-traverse/src/index.js b/packages/babel-traverse/src/index.js index 9feb4f0999..2fe2c950fe 100644 --- a/packages/babel-traverse/src/index.js +++ b/packages/babel-traverse/src/index.js @@ -1,7 +1,7 @@ import TraversalContext from "./context"; import * as visitors from "./visitors"; import includes from "lodash/includes"; -import * as t from "babel-types"; +import * as t from "@babel/types"; import * as cache from "./cache"; export { default as NodePath } from "./path"; diff --git a/packages/babel-traverse/src/path/ancestry.js b/packages/babel-traverse/src/path/ancestry.js index 360a4d1f4b..7cc3410322 100644 --- a/packages/babel-traverse/src/path/ancestry.js +++ b/packages/babel-traverse/src/path/ancestry.js @@ -1,6 +1,6 @@ // This file contains that retrieve or validate anything related to the current paths ancestry. -import * as t from "babel-types"; +import * as t from "@babel/types"; import NodePath from "./index"; /** diff --git a/packages/babel-traverse/src/path/comments.js b/packages/babel-traverse/src/path/comments.js index 38aeaa66f5..79e4abd909 100644 --- a/packages/babel-traverse/src/path/comments.js +++ b/packages/babel-traverse/src/path/comments.js @@ -1,5 +1,5 @@ // This file contains methods responsible for dealing with comments. -import * as t from "babel-types"; +import * as t from "@babel/types"; /** * Share comments amongst siblings. diff --git a/packages/babel-traverse/src/path/conversion.js b/packages/babel-traverse/src/path/conversion.js index 76dd012b11..fe5b8ae9ee 100644 --- a/packages/babel-traverse/src/path/conversion.js +++ b/packages/babel-traverse/src/path/conversion.js @@ -1,7 +1,7 @@ // This file contains methods that convert the path node into another node or some other type of data. -import * as t from "babel-types"; -import nameFunction from "babel-helper-function-name"; +import * as t from "@babel/types"; +import nameFunction from "@babel/helper-function-name"; export function toComputedKey(): Object { const node = this.node; diff --git a/packages/babel-traverse/src/path/family.js b/packages/babel-traverse/src/path/family.js index 7e02719978..6ef3f4535c 100644 --- a/packages/babel-traverse/src/path/family.js +++ b/packages/babel-traverse/src/path/family.js @@ -2,7 +2,7 @@ import type TraversalContext from "../index"; import NodePath from "./index"; -import * as t from "babel-types"; +import * as t from "@babel/types"; export function getOpposite(): ?NodePath { if (this.key === "left") { diff --git a/packages/babel-traverse/src/path/index.js b/packages/babel-traverse/src/path/index.js index 9ca20585bf..ba6381e7a9 100644 --- a/packages/babel-traverse/src/path/index.js +++ b/packages/babel-traverse/src/path/index.js @@ -5,7 +5,7 @@ import buildDebug from "debug"; import invariant from "invariant"; import traverse from "../index"; import Scope from "../scope"; -import * as t from "babel-types"; +import * as t from "@babel/types"; import { path as pathCache } from "../cache"; // NodePath is split across many files. diff --git a/packages/babel-traverse/src/path/inference/index.js b/packages/babel-traverse/src/path/inference/index.js index 1f515a100c..263e44c597 100644 --- a/packages/babel-traverse/src/path/inference/index.js +++ b/packages/babel-traverse/src/path/inference/index.js @@ -1,6 +1,6 @@ import type NodePath from "./index"; import * as inferers from "./inferers"; -import * as t from "babel-types"; +import * as t from "@babel/types"; /** * Infer the type of the current `NodePath`. diff --git a/packages/babel-traverse/src/path/inference/inferer-reference.js b/packages/babel-traverse/src/path/inference/inferer-reference.js index 2c4dc1c09d..1cac5e1064 100644 --- a/packages/babel-traverse/src/path/inference/inferer-reference.js +++ b/packages/babel-traverse/src/path/inference/inferer-reference.js @@ -1,5 +1,5 @@ import type NodePath from "../index"; -import * as t from "babel-types"; +import * as t from "@babel/types"; export default function(node: Object) { if (!this.isReferenced()) return; diff --git a/packages/babel-traverse/src/path/inference/inferers.js b/packages/babel-traverse/src/path/inference/inferers.js index 1f69f8572e..2f8ab65838 100644 --- a/packages/babel-traverse/src/path/inference/inferers.js +++ b/packages/babel-traverse/src/path/inference/inferers.js @@ -1,4 +1,4 @@ -import * as t from "babel-types"; +import * as t from "@babel/types"; export { default as Identifier } from "./inferer-reference"; diff --git a/packages/babel-traverse/src/path/introspection.js b/packages/babel-traverse/src/path/introspection.js index a72eca0078..45ee1b5243 100644 --- a/packages/babel-traverse/src/path/introspection.js +++ b/packages/babel-traverse/src/path/introspection.js @@ -2,7 +2,7 @@ import type NodePath from "./index"; import includes from "lodash/includes"; -import * as t from "babel-types"; +import * as t from "@babel/types"; /** * Match the current node if it matches the provided `pattern`. diff --git a/packages/babel-traverse/src/path/lib/hoister.js b/packages/babel-traverse/src/path/lib/hoister.js index ab0d4a35d2..043e650de9 100644 --- a/packages/babel-traverse/src/path/lib/hoister.js +++ b/packages/babel-traverse/src/path/lib/hoister.js @@ -1,5 +1,5 @@ -import { react } from "babel-types"; -import * as t from "babel-types"; +import { react } from "@babel/types"; +import * as t from "@babel/types"; const referenceVisitor = { // This visitor looks for bindings to establish a topmost scope for hoisting. diff --git a/packages/babel-traverse/src/path/lib/virtual-types.js b/packages/babel-traverse/src/path/lib/virtual-types.js index 7bc4e1e2cb..35319f6ee8 100644 --- a/packages/babel-traverse/src/path/lib/virtual-types.js +++ b/packages/babel-traverse/src/path/lib/virtual-types.js @@ -1,6 +1,6 @@ import type NodePath from "../index"; -import { react } from "babel-types"; -import * as t from "babel-types"; +import { react } from "@babel/types"; +import * as t from "@babel/types"; export const ReferencedIdentifier = { types: ["Identifier", "JSXIdentifier"], diff --git a/packages/babel-traverse/src/path/modification.js b/packages/babel-traverse/src/path/modification.js index 4a7ecfb0ab..6230a17980 100644 --- a/packages/babel-traverse/src/path/modification.js +++ b/packages/babel-traverse/src/path/modification.js @@ -3,7 +3,7 @@ import { path as pathCache } from "../cache"; import PathHoister from "./lib/hoister"; import NodePath from "./index"; -import * as t from "babel-types"; +import * as t from "@babel/types"; /** * Insert the provided nodes before the current one. diff --git a/packages/babel-traverse/src/path/replacement.js b/packages/babel-traverse/src/path/replacement.js index f918887629..e3f99aefde 100644 --- a/packages/babel-traverse/src/path/replacement.js +++ b/packages/babel-traverse/src/path/replacement.js @@ -1,10 +1,10 @@ // This file contains methods responsible for replacing a node with another. -import { codeFrameColumns } from "babel-code-frame"; +import { codeFrameColumns } from "@babel/code-frame"; import traverse from "../index"; import NodePath from "./index"; import { parse } from "babylon"; -import * as t from "babel-types"; +import * as t from "@babel/types"; const hoistVariablesVisitor = { Function(path) { diff --git a/packages/babel-traverse/src/scope/index.js b/packages/babel-traverse/src/scope/index.js index 1ad96fdb9f..4b4b2c74ae 100644 --- a/packages/babel-traverse/src/scope/index.js +++ b/packages/babel-traverse/src/scope/index.js @@ -6,7 +6,7 @@ import traverse from "../index"; import defaults from "lodash/defaults"; import Binding from "./binding"; import globals from "globals"; -import * as t from "babel-types"; +import * as t from "@babel/types"; import { scope as scopeCache } from "../cache"; // Number of calls to the crawl method to figure out whether we're diff --git a/packages/babel-traverse/src/scope/lib/renamer.js b/packages/babel-traverse/src/scope/lib/renamer.js index bdb773b9f3..c18c20b1a1 100644 --- a/packages/babel-traverse/src/scope/lib/renamer.js +++ b/packages/babel-traverse/src/scope/lib/renamer.js @@ -1,5 +1,5 @@ import Binding from "../binding"; -import * as t from "babel-types"; +import * as t from "@babel/types"; const renameVisitor = { ReferencedIdentifier({ node }, state) { diff --git a/packages/babel-traverse/src/visitors.js b/packages/babel-traverse/src/visitors.js index 84d57c3bfb..c95de368fa 100644 --- a/packages/babel-traverse/src/visitors.js +++ b/packages/babel-traverse/src/visitors.js @@ -1,5 +1,5 @@ import * as virtualTypes from "./path/lib/virtual-types"; -import * as t from "babel-types"; +import * as t from "@babel/types"; import clone from "lodash/clone"; /** diff --git a/packages/babel-types/src/converters.js b/packages/babel-types/src/converters.js index 454588e7ec..b895a748d2 100644 --- a/packages/babel-types/src/converters.js +++ b/packages/babel-types/src/converters.js @@ -1,6 +1,6 @@ import isPlainObject from "lodash/isPlainObject"; import isRegExp from "lodash/isRegExp"; -import type { Scope } from "babel-traverse"; +import type { Scope } from "@babel/traverse"; import * as t from "./index"; export function toComputedKey(