revert: build: remove vendored Babel typings (angular#33176) (angular#33215)

This reverts commit 4c63e6b.

PR Close angular#33215

Author: matsko

integration/language_service_plugin/tsconfig.json

@@ -40,7 +40,7 @@
     // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    "typeRoots": ["node_modules/@types"],                       /* List of folders to include type definitions from. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
     // "types": [],                           /* Type declaration files to be included in compilation. */
     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */

integration/language_service_plugin/yarn.lock

@@ -3,10 +3,12 @@
 
 
 "@angular/core@file:../../dist/packages-dist/core":
-  version "9.0.0-next.10"
+  version "8.0.0-beta.13"
+  dependencies:
+    tslib "^1.9.0"
 
 "@angular/language-service@file:../../dist/packages-dist/language-service":
-  version "9.0.0-next.10"
+  version "8.0.0-beta.13"
 
 "@types/node@file:../../node_modules/@types/node":
   version "10.9.4"
@@ -89,8 +91,13 @@ path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+
 "typescript@file:../../node_modules/typescript":
-  version "3.5.3"
+  version "3.4.2"
 
 wrappy@1:
   version "1.0.2"

package.json

@@ -39,15 +39,14 @@
     "@angular-devkit/core": "^8.0.0-beta.15",
     "@angular-devkit/schematics": "^8.0.0-beta.15",
     "@angular/bazel": "file:./tools/npm/@angular_bazel",
-    "@babel/core": "^7.6.4",
+    "@babel/core": "^7.5.5",
     "@bazel/jasmine": "0.38.3",
     "@bazel/karma": "0.38.3",
     "@bazel/protractor": "0.38.3",
     "@bazel/typescript": "0.38.3",
     "@microsoft/api-extractor": "^7.3.9",
     "@schematics/angular": "^8.0.0-beta.15",
     "@types/angular": "^1.6.47",
-    "@types/babel__core": "^7.1.3",
     "@types/base64-js": "1.2.5",
     "@types/bluebird": "^3.5.27",
     "@types/chai": "^4.1.2",

packages/localize/src/tools/BUILD.bazel

@@ -22,8 +22,6 @@ ts_library(
         "//packages/localize",
         "@npm//@babel/core",
         "@npm//@babel/types",
-        "@npm//@types/babel__core",
-        "@npm//@types/babel__traverse",
         "@npm//@types/glob",
         "@npm//@types/node",
         "@npm//@types/yargs",

packages/localize/src/tools/src/translate/source_files/source_file_utils.ts

@@ -15,7 +15,7 @@ import {Diagnostics} from '../../diagnostics';
  * @param expression The expression to check.
  */
 export function isNamedIdentifier(
-    expression: NodePath, name: string): expression is NodePath<t.Identifier> {
+    expression: NodePath<t.Expression>, name: string): expression is NodePath<t.Identifier> {
   return expression.isIdentifier() && expression.node.name === name;
 }
 
@@ -309,7 +309,7 @@ export function translate(
 
 export class BabelParseError extends Error {
   private readonly type = 'BabelParseError';
-  constructor(public node: t.Node, message: string) { super(message); }
+  constructor(public node: t.BaseNode, message: string) { super(message); }
 }
 
 export function isBabelParseError(e: any): e is BabelParseError {

packages/localize/src/tools/test/BUILD.bazel

@@ -12,9 +12,6 @@ ts_library(
         "//packages/localize",
         "//packages/localize/src/tools",
         "@npm//@babel/types",
-        "@npm//@types/babel__core",
-        "@npm//@types/babel__generator",
-        "@npm//@types/babel__template",
         "@npm//@types/glob",
     ],
 )

packages/localize/src/tools/types/babel/LICENSE

@@ -0,0 +1,21 @@
+    MIT License
+
+    Copyright (c) Microsoft Corporation. All rights reserved.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE

packages/localize/src/tools/types/babel/README.md

@@ -0,0 +1,11 @@
+# @babel/... external types
+
+The Bazel `ts_library` rule does not understand how to map imports of the form `@babel/core` to
+external typings of the form `@types/babel__core`. Note the double underscore to account for the
+namespaced package.
+
+See https://github.com/bazelbuild/rules_nodejs/issues/1033.
+
+This folder is a workaround to this by copying the typings directly into the project. Once the
+issue with `ts_library` is resolved we can remove this folder and add appropriate npm dependencies
+for the typings