chore: remove ts_setup_workspace

This has been a no-op since 1.0 when we vendored requirejs for ts_devserver in https://github.com/bazelbuild/rules_nodejs/pull/1159/files#diff-fe375cd73fb89504b9b9a9a751518849 We should never add WORKSPACE dependencies so I don't see a value in users carrying this weight. BREAKING CHANGE: ts_setup_workspace was a no-op and has been removed. Simply remove it from your WORKSPACE file. Fixes #2033
bazel-contrib · Jul 13, 2020 · 07d9bb8 · 07d9bb8
1 parent 3e2567f
commit 07d9bb8
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 93 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -130,10 +130,6 @@ load("@build_bazel_rules_typescript//internal:ts_repositories.bzl", "ts_setup_de
 
 ts_setup_dev_workspace()
 
-load("//packages/typescript/internal:ts_repositories.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 #
 # Install @bazel/cypress dependencies
 #

diff --git a/e2e/ts_devserver/WORKSPACE b/e2e/ts_devserver/WORKSPACE
@@ -33,10 +33,6 @@ yarn_install(
     yarn_lock = "//:yarn.lock",
 )
 
-load("@npm//@bazel/typescript:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
 
 npm_bazel_protractor_dependencies()

diff --git a/e2e/typescript/WORKSPACE b/e2e/typescript/WORKSPACE
@@ -32,7 +32,3 @@ yarn_install(
     package_json = "//:package.json",
     yarn_lock = "//:yarn.lock",
 )
-
-load("@npm//@bazel/typescript:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
diff --git a/examples/angular/WORKSPACE b/examples/angular/WORKSPACE
@@ -63,11 +63,6 @@ browser_repositories(
     firefox = True,
 )
 
-# Setup the rules_typescript tooolchain
-load("@npm//@bazel/typescript:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 # Setup the rules_sass toolchain
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 

diff --git a/examples/angular_view_engine/WORKSPACE b/examples/angular_view_engine/WORKSPACE
@@ -70,11 +70,6 @@ browser_repositories(
     firefox = True,
 )
 
-# Setup the rules_typescript tooolchain
-load("@npm//@bazel/typescript:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 # Setup the rules_sass toolchain
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
 

diff --git a/examples/app/WORKSPACE b/examples/app/WORKSPACE
@@ -33,10 +33,6 @@ yarn_install(
     yarn_lock = "//:yarn.lock",
 )
 
-load("@npm//@bazel/typescript:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 load("@npm//@bazel/protractor:package.bzl", "npm_bazel_protractor_dependencies")
 
 npm_bazel_protractor_dependencies()

diff --git a/examples/protocol_buffers/WORKSPACE b/examples/protocol_buffers/WORKSPACE
@@ -78,10 +78,6 @@ browser_repositories(
     firefox = True,
 )
 
-load("@npm//@bazel/typescript:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
diff --git a/examples/user_managed_deps/WORKSPACE b/examples/user_managed_deps/WORKSPACE
@@ -63,7 +63,3 @@ go_register_toolchains()
 load("@build_bazel_rules_typescript//internal:ts_repositories.bzl", "ts_setup_dev_workspace")
 
 ts_setup_dev_workspace()
-
-load("@build_bazel_rules_nodejs//packages/typescript/internal:ts_repositories.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
diff --git a/examples/web_testing/WORKSPACE b/examples/web_testing/WORKSPACE
@@ -47,7 +47,3 @@ browser_repositories(
     chromium = True,
     firefox = True,
 )
-
-load("@npm//@bazel/typescript:index.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
diff --git a/packages/create/index.js b/packages/create/index.js
@@ -162,13 +162,7 @@ http_archive(
 )
 
 ${pkgMgr === 'yarn' ? yarnInstallCmd : npmInstallCmd}`;
-  if (args['typescript']) {
-    workspaceContent += `
 
-# Setup TypeScript toolchain
-load("//packages/typescript:index.bzl", "ts_setup_workspace")
-ts_setup_workspace()`;
-  }
   write('WORKSPACE.bazel', workspaceContent);
   write('.bazelignore', `node_modules
 dist

diff --git a/packages/create/test.js b/packages/create/test.js
@@ -77,7 +77,3 @@ let pkgContent = read('with_ts/package.json');
 if (pkgContent.indexOf('"@bazel/typescript": "latest"') < 0) {
   fail('should install @bazel/typescript dependency', pkgContent);
 }
-wkspContent = read('with_ts/WORKSPACE.bazel');
-if (wkspContent.indexOf('ts_setup_workspace(') < 0) {
-  fail('should install extra TS repositories');
-}
diff --git a/packages/typescript/index.bzl b/packages/typescript/index.bzl
@@ -20,10 +20,8 @@ Users should not load files under "/internal"
 load("//packages/typescript/internal:build_defs.bzl", _ts_library = "ts_library_macro")
 load("//packages/typescript/internal:ts_config.bzl", _ts_config = "ts_config")
 load("//packages/typescript/internal:ts_project.bzl", _ts_project = "ts_project_macro")
-load("//packages/typescript/internal:ts_repositories.bzl", _ts_setup_workspace = "ts_setup_workspace")
 load("//packages/typescript/internal/devserver:ts_devserver.bzl", _ts_devserver = "ts_devserver_macro")
 
-ts_setup_workspace = _ts_setup_workspace
 ts_library = _ts_library
 ts_config = _ts_config
 ts_devserver = _ts_devserver

diff --git a/packages/typescript/index.docs.bzl b/packages/typescript/index.docs.bzl
@@ -21,10 +21,8 @@ So this is a copy of index.bzl with macro indirection removed.
 load("//packages/typescript/internal:build_defs.bzl", _ts_library = "ts_library")
 load("//packages/typescript/internal:ts_config.bzl", _ts_config = "ts_config")
 load("//packages/typescript/internal:ts_project.bzl", _ts_project = "ts_project_macro")
-load("//packages/typescript/internal:ts_repositories.bzl", _ts_setup_workspace = "ts_setup_workspace")
 load("//packages/typescript/internal/devserver:ts_devserver.bzl", _ts_devserver = "ts_devserver")
 
-ts_setup_workspace = _ts_setup_workspace
 ts_library = _ts_library
 ts_config = _ts_config
 ts_project = _ts_project

diff --git a/packages/typescript/install.md b/packages/typescript/install.md
@@ -42,14 +42,6 @@ $ npm install --save-dev @bazel/typescript
 
 Watch for any peerDependency warnings - we assume you have already installed the `typescript` package from npm.
 
-Some rules require you to add this to your `WORKSPACE` file:
-
-```python
-# Set up TypeScript toolchain
-load("@npm//@bazel/typescript:index.bzl", "ts_setup_workspace")
-ts_setup_workspace()
-```
-
 Create a `BUILD.bazel` file in your workspace root. If your `tsconfig.json` file is in the root, use
 
 ```python

diff --git a/packages/typescript/internal/BUILD.bazel b/packages/typescript/internal/BUILD.bazel
@@ -63,7 +63,6 @@ filegroup(
         "build_defs.bzl",
         "ts_config.bzl",
         "ts_project.bzl",
-        "ts_repositories.bzl",
         "//packages/typescript/internal/devserver:package_contents",
     ],
     visibility = ["//packages/typescript:__subpackages__"],

diff --git a/packages/typescript/internal/internal_ts_repositories.bzl b/packages/typescript/internal/internal_ts_repositories.bzl
@@ -20,13 +20,8 @@ load("@bazel_gazelle//:deps.bzl", "go_repository")
 def ts_setup_dev_workspace():
     """
     Setup the toolchain needed for local development, but not needed by users.
-
-    These needs to be in a separate file from ts_setup_workspace() so as not
-    to leak load statements.
     """
 
-    ts_setup_workspace()
-
     go_repository(
         name = "com_github_kylelemons_godebug",
         commit = "9ff306d4fbead574800b66369df5b6144732d58e",  # v1.1.0

diff --git a/packages/typescript/internal/ts_repositories.bzl b/packages/typescript/internal/ts_repositories.bzl