From bede73122d72e052e683f58372c2a7c4bd2c2d64 Mon Sep 17 00:00:00 2001
From: Henry Zhu <hi@henryzoo.com>
Date: Mon, 30 Oct 2017 16:47:13 -0400
Subject: [PATCH] fixup places that aren not scoped [skip ci] (#6646)

---
 lib/types.js                                                | 2 +-
 .../src/index.js                                            | 2 +-
 packages/babel-template/README.md                           | 6 +++---
 packages/babel-template/test/index.js                       | 2 +-
 scripts/generate-interfaces.js                              | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/types.js b/lib/types.js
index 929c37d111..986b0de792 100644
--- a/lib/types.js
+++ b/lib/types.js
@@ -1288,7 +1288,7 @@ type BabelNodeJSX = BabelNodeJSXAttribute | BabelNodeJSXClosingElement | BabelNo
 type BabelNodeTSTypeElement = BabelNodeTSCallSignatureDeclaration | BabelNodeTSConstructSignatureDeclaration | BabelNodeTSPropertySignature | BabelNodeTSMethodSignature | BabelNodeTSIndexSignature;
 type BabelNodeTSType = BabelNodeTSAnyKeyword | BabelNodeTSNumberKeyword | BabelNodeTSObjectKeyword | BabelNodeTSBooleanKeyword | BabelNodeTSStringKeyword | BabelNodeTSSymbolKeyword | BabelNodeTSVoidKeyword | BabelNodeTSUndefinedKeyword | BabelNodeTSNullKeyword | BabelNodeTSNeverKeyword | BabelNodeTSThisType | BabelNodeTSFunctionType | BabelNodeTSConstructorType | BabelNodeTSTypeReference | BabelNodeTSTypePredicate | BabelNodeTSTypeQuery | BabelNodeTSTypeLiteral | BabelNodeTSArrayType | BabelNodeTSTupleType | BabelNodeTSUnionType | BabelNodeTSIntersectionType | BabelNodeTSParenthesizedType | BabelNodeTSTypeOperator | BabelNodeTSIndexedAccessType | BabelNodeTSMappedType | BabelNodeTSLiteralType | BabelNodeTSExpressionWithTypeArguments;
 
-declare module "babel-types" {
+declare module "@babel/types" {
   declare function arrayExpression(elements?: any): BabelNodeArrayExpression;
   declare function assignmentExpression(operator: string, left: BabelNodeLVal, right: BabelNodeExpression): BabelNodeAssignmentExpression;
   declare function binaryExpression(operator: "+" | "-" | "/" | "%" | "*" | "**" | "&" | "|" | ">>" | ">>>" | "<<" | "^" | "==" | "===" | "!=" | "!==" | "in" | "instanceof" | ">" | "<" | ">=" | "<=", left: BabelNodeExpression, right: BabelNodeExpression): BabelNodeBinaryExpression;
diff --git a/packages/babel-plugin-proposal-unicode-property-regex/src/index.js b/packages/babel-plugin-proposal-unicode-property-regex/src/index.js
index 0e67b36127..b4d8f8d398 100644
--- a/packages/babel-plugin-proposal-unicode-property-regex/src/index.js
+++ b/packages/babel-plugin-proposal-unicode-property-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-template/README.md b/packages/babel-template/README.md
index 1cf29eaf17..25eb64cabf 100644
--- a/packages/babel-template/README.md
+++ b/packages/babel-template/README.md
@@ -49,9 +49,9 @@ which will parse and return the AST directly.
 ## Template Literal Usage
 
 ```js
-import template from "babel-template";
-import generate from "babel-generator";
-import * as t from "babel-types";
+import template from "@babel/template";
+import generate from "@babel/generator";
+import * as t from "@babel/types";
 
 const fn = template`
   var IMPORT_NAME = require('${"my-module"}');
diff --git a/packages/babel-template/test/index.js b/packages/babel-template/test/index.js
index f98f1509cd..4c09bc28d6 100644
--- a/packages/babel-template/test/index.js
+++ b/packages/babel-template/test/index.js
@@ -1,7 +1,7 @@
 import generator from "../../babel-generator";
 import template from "../lib";
 import { expect } from "chai";
-import * as t from "babel-types";
+import * as t from "@babel/types";
 
 const comments = "// Sum two numbers\nconst add = (a, b) => a + b;";
 
diff --git a/scripts/generate-interfaces.js b/scripts/generate-interfaces.js
index 88552d5611..1e8864754d 100644
--- a/scripts/generate-interfaces.js
+++ b/scripts/generate-interfaces.js
@@ -162,7 +162,7 @@ for (const type in t.FLIPPED_ALIAS_KEYS) {
     .join(" | ")};\n`;
 }
 
-code += `\ndeclare module "babel-types" {
+code += `\ndeclare module "@babel/types" {
   ${lines
     .join("\n")
     .replace(/\n/g, "\n  ")