feat(typescript): support typescript 4.3

bazel-contrib · Jun 21, 2021 · e576acd · e576acd
1 parent 8e7bc1c
commit e576acd
Show file tree

Hide file tree

Showing 31 changed files with 451 additions and 249 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -24,6 +24,13 @@ workspace(
     },
 )
 
+load("//:index.bzl", "BAZEL_VERSION", "SUPPORTED_BAZEL_VERSIONS", "node_repositories")
+
+# Node version used in the repository.
+node_repositories(
+    node_version = "12.14.1",
+)
+
 #
 # Install rules_nodejs dev dependencies
 #
@@ -157,7 +164,6 @@ bazel_skylib_workspace()
 #
 
 load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
-load("//:index.bzl", "BAZEL_VERSION", "SUPPORTED_BAZEL_VERSIONS")
 
 # Creates toolchain configuration for remote execution with BuildKite CI
 # for rbe_ubuntu1604

diff --git a/e2e/BUILD.bazel b/e2e/BUILD.bazel
@@ -161,4 +161,6 @@ e2e_integration_test(
     "3.9.x",
     "4.0.x",
     "4.1.x",
+    "4.2.x",
+    "4.3.x",
 ]]
diff --git a/e2e/concatjs_devserver/package.json b/e2e/concatjs_devserver/package.json
@@ -12,7 +12,7 @@
     "rxjs": "^6.5.2",
     "tslib": "^1.9.0",
     "typeorm": "0.2.17",
-    "typescript": "2.7.x"
+    "typescript": "4.3.2"
   },
   "scripts": {
     "test": "bazel test ..."

diff --git a/e2e/concatjs_devserver/yarn.lock b/e2e/concatjs_devserver/yarn.lock
@@ -1477,10 +1477,10 @@ typeorm@0.2.17:
     yargonaut "^1.1.2"
     yargs "^13.2.1"
 
-typescript@2.7.x:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.7.2.tgz#2d615a1ef4aee4f574425cdff7026edf81919836"
-  integrity sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==
+typescript@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805"
+  integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==
 
 uri-js@^4.2.2:
   version "4.2.2"

diff --git a/e2e/concatjs_devserver_directory_artifacts/package.json b/e2e/concatjs_devserver_directory_artifacts/package.json
@@ -12,7 +12,7 @@
     "rxjs": "7.1.0",
     "tslib": "2.2.0",
     "typeorm": "0.2.17",
-    "typescript": "3.9.9"
+    "typescript": "4.3.2"
   },
   "scripts": {
     "test": "bazel test ..."

diff --git a/e2e/concatjs_devserver_directory_artifacts/yarn.lock b/e2e/concatjs_devserver_directory_artifacts/yarn.lock
@@ -1404,10 +1404,10 @@ typeorm@0.2.17:
     yargonaut "^1.1.2"
     yargs "^13.2.1"
 
-typescript@3.9.9:
-  version "3.9.9"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.9.tgz#e69905c54bc0681d0518bd4d587cc6f2d0b1a674"
-  integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==
+typescript@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805"
+  integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==
 
 uri-js@^4.2.2:
   version "4.4.1"

diff --git a/e2e/coverage/package.json b/e2e/coverage/package.json
@@ -4,7 +4,7 @@
     "@bazel/jasmine": "^3.6.0",
     "@bazel/typescript": "^3.6.0",
     "jasmine": "3.6.1",
-    "typescript": "3.9.7"
+    "typescript": "4.3.2"
   },
   "scripts": {
     "test": "bazel coverage ..."

diff --git a/e2e/coverage/yarn.lock b/e2e/coverage/yarn.lock
@@ -1204,10 +1204,10 @@ tsutils@2.27.2:
   dependencies:
     tslib "^1.8.1"
 
-typescript@3.9.7:
-  version "3.9.7"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz#98d600a5ebdc38f40cb277522f12dc800e9e25fa"
-  integrity sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==
+typescript@4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805"
+  integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==
 
 union-value@^1.0.0:
   version "1.0.1"

diff --git a/e2e/typescript/main.spec.ts b/e2e/typescript/main.spec.ts
@@ -17,7 +17,7 @@ describe('main', () => {
   });
 
   it('runtime version of typescript should be correct', () => {
-    expect(ts.version).toEqual('3.1.6');
+    expect(ts.version).toEqual('4.3.2');
   });
 
   it('should successfully require built-in node module \'os\'', () => {

diff --git a/e2e/typescript/package.json b/e2e/typescript/package.json
@@ -7,7 +7,7 @@
     "date-fns": "^1.30.1",
     "jasmine": "^3.5.0",
     "source-map-support": "^0.5.10",
-    "typescript": "3.1.x"
+    "typescript": "~4.3.2"
   },
   "scripts": {
     "test": "bazel test ..."

diff --git a/e2e/typescript/yarn.lock b/e2e/typescript/yarn.lock
@@ -571,10 +571,10 @@ tsutils@2.27.2:
   dependencies:
     tslib "^1.8.1"
 
-typescript@3.1.x:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
-  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
+typescript@~4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.2.tgz#399ab18aac45802d6f2498de5054fcbbe716a805"
+  integrity sha512-zZ4hShnmnoVnAHpVHWpTcxdv7dWP60S2FsydQLV8V5PbS3FifjWFFRiHSWpDJahly88PRyV5teTSLoq4eG7mKw==
 
 v8-to-istanbul@^7.1.0:
   version "7.1.0"

diff --git a/examples/angular/package.json b/examples/angular/package.json
@@ -66,7 +66,7 @@
         "requirejs": "2.3.6",
         "rollup": "^2.3.4",
         "terser": "4.3.1",
-        "typescript": "~4.1.5"
+        "typescript": "4.1.5"
     },
     "scripts": {
         "build": "bazel build //src:prodapp",

diff --git a/examples/angular/yarn.lock b/examples/angular/yarn.lock
@@ -7057,7 +7057,7 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@~4.1.5:
+typescript@4.1.5:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
   integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==

diff --git a/examples/angular_view_engine/package.json b/examples/angular_view_engine/package.json
@@ -4,7 +4,7 @@
     "description": "Demo of building Angular apps with Bazel",
     "license": "Apache-2.0",
     "engines": {
-        "node": ">=10.9.0 <13.0.0",
+        "node": ">=12 <=14",
         "yarn": ">=1.9.2 <2.0.0"
     },
     "dependencies": {