diff --git a/modules/aspnetcore-engine/package.json b/modules/aspnetcore-engine/package.json index f0d12d338..21e7ac204 100644 --- a/modules/aspnetcore-engine/package.json +++ b/modules/aspnetcore-engine/package.json @@ -19,7 +19,8 @@ "peerDependencies": { "@angular/common": "NG_VERSION", "@angular/core": "NG_VERSION", - "rxjs": "RXJS_VERSION" + "rxjs": "RXJS_VERSION", + "tslib": "TSLIB_VERSION" }, "ng-update": { "packageGroup": "NG_UPDATE_PACKAGE_GROUP" diff --git a/modules/builders/BUILD.bazel b/modules/builders/BUILD.bazel index 3fccd38e0..5d9699901 100644 --- a/modules/builders/BUILD.bazel +++ b/modules/builders/BUILD.bazel @@ -1,5 +1,12 @@ +load("@npm_bazel_typescript//:defs.bzl", "ts_config") load("//tools:defaults.bzl", "npm_package", "ts_library") +ts_config( + name = "bazel-tsconfig-build", + src = "bazel-tsconfig-build.json", + deps = ["//modules:bazel-tsconfig-build.json"], +) + filegroup( name = "builders_assets", srcs = glob([ @@ -20,6 +27,7 @@ ts_library( ], ), module_name = "@nguniversal/builders", + tsconfig = ":bazel-tsconfig-build", deps = [ "@npm//@angular-devkit/architect", "@npm//@angular-devkit/core", diff --git a/modules/builders/bazel-tsconfig-build.json b/modules/builders/bazel-tsconfig-build.json new file mode 100644 index 000000000..f07c7b36c --- /dev/null +++ b/modules/builders/bazel-tsconfig-build.json @@ -0,0 +1,6 @@ +{ + "extends": "../bazel-tsconfig-build.json", + "compilerOptions": { + "importHelpers": false + } +} \ No newline at end of file diff --git a/modules/common/package.json b/modules/common/package.json index cea06eaa8..78e383ec9 100644 --- a/modules/common/package.json +++ b/modules/common/package.json @@ -9,7 +9,8 @@ ], "peerDependencies": { "@angular/common": "NG_VERSION", - "@angular/core": "NG_VERSION" + "@angular/core": "NG_VERSION", + "tslib": "TSLIB_VERSION" }, "ng-update": { "packageGroup": "NG_UPDATE_PACKAGE_GROUP" diff --git a/modules/express-engine/package.json b/modules/express-engine/package.json index 478220c43..eb8d768ba 100644 --- a/modules/express-engine/package.json +++ b/modules/express-engine/package.json @@ -12,7 +12,8 @@ "@angular/common": "NG_VERSION", "@angular/core": "NG_VERSION", "@angular/platform-server": "NG_VERSION", - "express": "EXPRESS_VERSION" + "express": "EXPRESS_VERSION", + "tslib": "TSLIB_VERSION" }, "dependencies": { "@nguniversal/common": "0.0.0-PLACEHOLDER" diff --git a/modules/hapi-engine/package.json b/modules/hapi-engine/package.json index 97112608e..508294b93 100644 --- a/modules/hapi-engine/package.json +++ b/modules/hapi-engine/package.json @@ -12,7 +12,8 @@ "@angular/common": "NG_VERSION", "@angular/core": "NG_VERSION", "@angular/platform-server": "NG_VERSION", - "hapi": "HAPI_VERSION" + "hapi": "HAPI_VERSION", + "tslib": "TSLIB_VERSION" }, "dependencies": { "@nguniversal/common": "0.0.0-PLACEHOLDER" diff --git a/modules/module-map-ngfactory-loader/package.json b/modules/module-map-ngfactory-loader/package.json index 530dafd91..cdb04991b 100644 --- a/modules/module-map-ngfactory-loader/package.json +++ b/modules/module-map-ngfactory-loader/package.json @@ -12,7 +12,8 @@ "peerDependencies": { "@angular/common": "NG_VERSION", "@angular/core": "NG_VERSION", - "@angular/platform-server": "NG_VERSION" + "@angular/platform-server": "NG_VERSION", + "tslib": "TSLIB_VERSION" }, "ng-update": { "packageGroup": "NG_UPDATE_PACKAGE_GROUP" diff --git a/modules/socket-engine/package.json b/modules/socket-engine/package.json index ef3fbd22b..0df35acc5 100644 --- a/modules/socket-engine/package.json +++ b/modules/socket-engine/package.json @@ -10,7 +10,8 @@ ], "peerDependencies": { "@nguniversal/common": "0.0.0-PLACEHOLDER", - "@angular/core": "NG_VERSION" + "@angular/core": "NG_VERSION", + "tslib": "TSLIB_VERSION" }, "ng-update": { "packageGroup": "NG_UPDATE_PACKAGE_GROUP" diff --git a/tools/defaults.bzl b/tools/defaults.bzl index dbbab4a73..573bec16b 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -39,6 +39,7 @@ EXPRESS_VERSION = "^4.15.2" EXPRESS_TYPES_VERSION = "^4.17.0" DEVKIT_CORE_VERSION = "^9.0.0-next.8" DEVKIT_ARCHITECT_VERSION = "^0.900.0-next.8" +TSLIB_VERSION = "^1.9.0" NGUNIVERSAL_SCOPED_PACKAGES = ["@nguniversal/%s" % p for p in [ "aspnetcore-engine", @@ -59,6 +60,7 @@ PKG_GROUP_REPLACEMENTS = { "RXJS_VERSION": RXJS_VERSION, "DEVKIT_CORE_VERSION": DEVKIT_CORE_VERSION, "DEVKIT_ARCHITECT_VERSION": DEVKIT_ARCHITECT_VERSION, + "TSLIB_VERSION": TSLIB_VERSION, } GLOBALS = {