From dcdc98b093edf2a3ccd6962d8b4f15aa28ba6fa8 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 2 Dec 2019 19:23:31 +0000 Subject: [PATCH] chore: update build_bazel_rules_typescript commit hash to 09f0469 --- WORKSPACE | 2 +- e2e/BUILD.bazel | 12 -- e2e/ts_auto_deps/.bazelignore | 1 - e2e/ts_auto_deps/.bazelrc | 1 - e2e/ts_auto_deps/BUILD.bazel | 15 -- e2e/ts_auto_deps/WORKSPACE | 48 ------ e2e/ts_auto_deps/package.json | 11 -- e2e/ts_auto_deps/simple/file.ts | 2 - e2e/ts_auto_deps/tsconfig.json | 0 e2e/ts_auto_deps/yarn.lock | 140 ------------------ packages/typescript/src/BUILD.bazel | 1 - .../typescript/src/ts_auto_deps/BUILD.bazel | 7 - .../src/ts_auto_deps/ts_auto_deps.js | 34 ----- 13 files changed, 1 insertion(+), 273 deletions(-) delete mode 100644 e2e/ts_auto_deps/.bazelignore delete mode 100644 e2e/ts_auto_deps/.bazelrc delete mode 100644 e2e/ts_auto_deps/BUILD.bazel delete mode 100644 e2e/ts_auto_deps/WORKSPACE delete mode 100644 e2e/ts_auto_deps/package.json delete mode 100644 e2e/ts_auto_deps/simple/file.ts delete mode 100644 e2e/ts_auto_deps/tsconfig.json delete mode 100644 e2e/ts_auto_deps/yarn.lock delete mode 100644 packages/typescript/src/ts_auto_deps/BUILD.bazel delete mode 100644 packages/typescript/src/ts_auto_deps/ts_auto_deps.js diff --git a/WORKSPACE b/WORKSPACE index bdb9524e64..18969dc7c6 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -113,7 +113,7 @@ install_bazel_dependencies() # With http_archive it only sees releases/download/*.tar.gz urls git_repository( name = "build_bazel_rules_typescript", - commit = "62bbdc8b3b4f9a8222b135648e8e425e23cad056", + commit = "09f0469fe9b90b0f031994019e7e104f1ca1ce43", remote = "http://github.com/bazelbuild/rules_typescript.git", ) diff --git a/e2e/BUILD.bazel b/e2e/BUILD.bazel index f5e228ed25..8df260c1c2 100644 --- a/e2e/BUILD.bazel +++ b/e2e/BUILD.bazel @@ -116,15 +116,3 @@ e2e_integration_test( "3.5.x", "3.6.x", ]] - -e2e_integration_test( - name = "e2e_ts_auto_deps", - bazel_commands = [ - "run @nodejs//:yarn_node_repositories", - "run @nodejs//:yarn -- generate_build_file", - "build //simple:simple", - ], - npm_packages = { - "//packages/typescript:npm_package": "@bazel/typescript", - }, -) diff --git a/e2e/ts_auto_deps/.bazelignore b/e2e/ts_auto_deps/.bazelignore deleted file mode 100644 index b512c09d47..0000000000 --- a/e2e/ts_auto_deps/.bazelignore +++ /dev/null @@ -1 +0,0 @@ -node_modules \ No newline at end of file diff --git a/e2e/ts_auto_deps/.bazelrc b/e2e/ts_auto_deps/.bazelrc deleted file mode 100644 index 3431057af6..0000000000 --- a/e2e/ts_auto_deps/.bazelrc +++ /dev/null @@ -1 +0,0 @@ -import %workspace%/../../common.bazelrc diff --git a/e2e/ts_auto_deps/BUILD.bazel b/e2e/ts_auto_deps/BUILD.bazel deleted file mode 100644 index abd01150d9..0000000000 --- a/e2e/ts_auto_deps/BUILD.bazel +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2017 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -exports_files(["tsconfig.json"]) diff --git a/e2e/ts_auto_deps/WORKSPACE b/e2e/ts_auto_deps/WORKSPACE deleted file mode 100644 index 9eb734c837..0000000000 --- a/e2e/ts_auto_deps/WORKSPACE +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2017 The Bazel Authors. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -workspace( - name = "e2e_ts_auto_deps", - managed_directories = {"@npm": ["node_modules"]}, -) - -# There are some assertions that can only by made by running tests from within -# this nested repository folder. These assertions are run in CI so we use -# a local_repository here so we are testing against the root repository code. -local_repository( - name = "build_bazel_rules_nodejs", - path = "../..", -) - -# rules_nodejs_dev_dependencies() required since we're using local_repository for -# build_bazel_rules_nodejs above. -load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dev_dependencies") - -rules_nodejs_dev_dependencies() - -load("@build_bazel_rules_nodejs//:index.bzl", "yarn_install") - -yarn_install( - name = "npm", - package_json = "//:package.json", - yarn_lock = "//:yarn.lock", -) - -load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies") - -install_bazel_dependencies() - -load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace") - -ts_setup_workspace() diff --git a/e2e/ts_auto_deps/package.json b/e2e/ts_auto_deps/package.json deleted file mode 100644 index 39d57bfa11..0000000000 --- a/e2e/ts_auto_deps/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "@bazel/typescript": "^0.42.1", - "typescript": "2.9.2" - }, - "scripts": { - "pretest": "bazel run @nodejs//:yarn_node_repositories", - "generate_build_file": "cd simple && ts_auto_deps", - "test": "yarn generate_build_file && bazel build simple" - } -} diff --git a/e2e/ts_auto_deps/simple/file.ts b/e2e/ts_auto_deps/simple/file.ts deleted file mode 100644 index bb2056c5f2..0000000000 --- a/e2e/ts_auto_deps/simple/file.ts +++ /dev/null @@ -1,2 +0,0 @@ -// Test that a BUILD file is generated in this directory -export const a = 1; \ No newline at end of file diff --git a/e2e/ts_auto_deps/tsconfig.json b/e2e/ts_auto_deps/tsconfig.json deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/e2e/ts_auto_deps/yarn.lock b/e2e/ts_auto_deps/yarn.lock deleted file mode 100644 index 4eda494b69..0000000000 --- a/e2e/ts_auto_deps/yarn.lock +++ /dev/null @@ -1,140 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@bazel/typescript@^0.42.1": - version "0.42.1" - resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.42.1.tgz#afa4c2e3de7ef60777fd7cd1828d1af57d09afb0" - integrity sha512-fObLUXlI3E9ZdGjCIGzXX6VkEo3x417PZvpIUBrVI3YONhbMoqAERB2yD4Mp8waoFKKu7ePnKCmoCWEa7PSTtA== - dependencies: - protobufjs "6.8.8" - semver "5.6.0" - source-map-support "0.5.9" - tsutils "2.27.2" - -"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf" - integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78= - -"@protobufjs/base64@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735" - integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg== - -"@protobufjs/codegen@^2.0.4": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb" - integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg== - -"@protobufjs/eventemitter@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70" - integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A= - -"@protobufjs/fetch@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45" - integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU= - dependencies: - "@protobufjs/aspromise" "^1.1.1" - "@protobufjs/inquire" "^1.1.0" - -"@protobufjs/float@^1.0.2": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1" - integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E= - -"@protobufjs/inquire@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089" - integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik= - -"@protobufjs/path@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d" - integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0= - -"@protobufjs/pool@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54" - integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q= - -"@protobufjs/utf8@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" - integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= - -"@types/long@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.0.tgz#719551d2352d301ac8b81db732acb6bdc28dbdef" - integrity sha512-1w52Nyx4Gq47uuu0EVcsHBxZFJgurQ+rTKS3qMHxR1GY2T8c2AJYd6vZoZ9q1rupaDjU0yT+Jc2XTyXkjeMA+Q== - -"@types/node@^10.1.0": - version "10.14.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.21.tgz#4a9db7ef1d1671c0015e632c5fa3d46c86c58c1e" - integrity sha512-nuFlRdBiqbF+PJIEVxm2jLFcQWN7q7iWEJGsBV4n7v1dbI9qXB8im2pMMKMCUZe092sQb5SQft2DHfuQGK5hqQ== - -buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== - -long@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28" - integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA== - -protobufjs@6.8.8: - version "6.8.8" - resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz#c8b4f1282fd7a90e6f5b109ed11c84af82908e7c" - integrity sha512-AAmHtD5pXgZfi7GMpllpO3q1Xw1OYldr+dMUlAnffGTAhqkg72WdmSY71uKBF/JuyiKs8psYbtKrhi0ASCD8qw== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.0" - "@types/node" "^10.1.0" - long "^4.0.0" - -semver@5.6.0: - version "5.6.0" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004" - integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg== - -source-map-support@0.5.9: - version "0.5.9" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f" - integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA== - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map@^0.6.0: - version "0.6.1" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== - -tslib@^1.8.1: - version "1.10.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== - -tsutils@2.27.2: - version "2.27.2" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.27.2.tgz#60ba88a23d6f785ec4b89c6e8179cac9b431f1c7" - integrity sha512-qf6rmT84TFMuxAKez2pIfR8UCai49iQsfB7YWVjV1bKpy/d0PWT5rEOSM6La9PiHZ0k1RRZQiwVdVJfQ3BPHgg== - dependencies: - tslib "^1.8.1" - -typescript@2.9.2: - version "2.9.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c" - integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w== diff --git a/packages/typescript/src/BUILD.bazel b/packages/typescript/src/BUILD.bazel index 9d9941b158..e79590b3e7 100644 --- a/packages/typescript/src/BUILD.bazel +++ b/packages/typescript/src/BUILD.bazel @@ -36,6 +36,5 @@ filegroup( "//devserver:package_contents", "//internal:package_contents", "//third_party/npm/requirejs:package_contents", - "//ts_auto_deps:package_contents", ], ) diff --git a/packages/typescript/src/ts_auto_deps/BUILD.bazel b/packages/typescript/src/ts_auto_deps/BUILD.bazel deleted file mode 100644 index 2e5e06b9eb..0000000000 --- a/packages/typescript/src/ts_auto_deps/BUILD.bazel +++ /dev/null @@ -1,7 +0,0 @@ -filegroup( - name = "package_contents", - srcs = [ - "ts_auto_deps.js", - ], - visibility = ["//:__pkg__"], -) diff --git a/packages/typescript/src/ts_auto_deps/ts_auto_deps.js b/packages/typescript/src/ts_auto_deps/ts_auto_deps.js deleted file mode 100644 index 68f4f7e875..0000000000 --- a/packages/typescript/src/ts_auto_deps/ts_auto_deps.js +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env node - -// This file is a shim to execute the ts_auto_deps binary from the right platform-specific package. -const os = require('os'); -const fs = require('fs'); -const path = require('path'); -const spawnSync = require('child_process').spawnSync; - -/** - * @return '.exe' for Windows and '' for all other platforms - */ -function getNativeBinaryExt() { - return os.platform() === 'win32' ? '.exe' : ''; -} - -/** - * @return the native `ts_auto_deps` binary for the current platform - * @throws when the `ts_auto_deps` executable can not be found - */ -function getNativeBinary() { - try { - return require.resolve(`./ts_auto_deps-${os.platform()}_${os.arch()}${getNativeBinaryExt()}`); - } catch (e) { - const message = 'ts_auto_deps executable not found for your platform: ' + - `(${os.platform()}_${os.arch()})\n`; - throw new Error(message); - } -} - -/** Starts a new synchronous child process that runs with the specified arguments. */ -const spawnedProcess = spawnSync(getNativeBinary(), process.argv.slice(2), {stdio: 'inherit'}); - -// Ensure that this wrapper script exits with the same exit code as the child process. -process.exit(spawnedProcess.status);