diff --git a/examples/angular_view_engine/package.json b/examples/angular_view_engine/package.json index e8a0af71b1..dac3d91d71 100644 --- a/examples/angular_view_engine/package.json +++ b/examples/angular_view_engine/package.json @@ -25,7 +25,7 @@ "zone.js": "0.10.2" }, "devDependencies": { - "@angular/bazel": "9.0.0-rc.10", + "@angular/bazel": "10.1.0-next.0", "@angular/cli": "8.3.12", "@angular/compiler": "8.2.14", "@angular/compiler-cli": "8.2.14", diff --git a/examples/angular_view_engine/patches/@angular+bazel+9.0.0-rc.10.patch b/examples/angular_view_engine/patches/@angular+bazel+9.0.0-rc.10.patch deleted file mode 100644 index 81766c7757..0000000000 --- a/examples/angular_view_engine/patches/@angular+bazel+9.0.0-rc.10.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff --git a/node_modules/@angular/bazel/src/external.bzl b/node_modules/@angular/bazel/src/external.bzl -index 32b640a..84d37b3 100755 ---- a/node_modules/@angular/bazel/src/external.bzl -+++ b/node_modules/@angular/bazel/src/external.bzl -@@ -2,11 +2,11 @@ - """ - - load( -- "@npm_bazel_typescript//internal:build_defs.bzl", -+ "@npm//@bazel/typescript/internal:build_defs.bzl", - _tsc_wrapped_tsconfig = "tsc_wrapped_tsconfig", - ) - load( -- "@npm_bazel_typescript//internal:common/compilation.bzl", -+ "@npm//@bazel/typescript/internal:common/compilation.bzl", - _COMMON_ATTRIBUTES = "COMMON_ATTRIBUTES", - _COMMON_OUTPUTS = "COMMON_OUTPUTS", - _DEPS_ASPECTS = "DEPS_ASPECTS", -@@ -14,7 +14,7 @@ load( - _ts_providers_dict_to_struct = "ts_providers_dict_to_struct", - ) - load( -- "@npm_bazel_typescript//internal:ts_config.bzl", -+ "@npm//@bazel/typescript/internal:ts_config.bzl", - _TsConfigInfo = "TsConfigInfo", - ) - load( -@@ -19,12 +19,14 @@ load( - ) - load( - "@build_bazel_rules_nodejs//:providers.bzl", -+ _LinkablePackageInfo = "LinkablePackageInfo", - _NpmPackageInfo = "NpmPackageInfo", - _js_ecma_script_module_info = "js_ecma_script_module_info", - _js_named_module_info = "js_named_module_info", - _node_modules_aspect = "node_modules_aspect", - ) - -+LinkablePackageInfo = _LinkablePackageInfo - NpmPackageInfo = _NpmPackageInfo - node_modules_aspect = _node_modules_aspect - -diff --git a/node_modules/@angular/bazel/src/ng_module.bzl b/node_modules/@angular/bazel/src/ng_module.bzl -index 9480c4b..0f67f18 100755 ---- a/node_modules/@angular/bazel/src/ng_module.bzl -+++ b/node_modules/@angular/bazel/src/ng_module.bzl -@@ -13,6 +13,7 @@ load( - "DEFAULT_NG_COMPILER", - "DEFAULT_NG_XI18N", - "DEPS_ASPECTS", -+ "LinkablePackageInfo", - "NpmPackageInfo", - "TsConfigInfo", - "compile_ts", -@@ -631,6 +632,15 @@ def _ng_module_impl(ctx): - # once it is no longer needed. - ]) - -+ if ctx.attr.module_name: -+ path = "/".join([p for p in [ctx.bin_dir.path, ctx.label.workspace_root, ctx.label.package] if p]) -+ ts_providers["providers"].append(LinkablePackageInfo( -+ package_name = ctx.attr.module_name, -+ path = path, -+ files = ts_providers["typescript"]["es5_sources"], -+ _tslibrary = True, -+ )) -+ - return ts_providers_dict_to_struct(ts_providers) - - local_deps_aspects = [node_modules_aspect, _collect_summaries_aspect] diff --git a/examples/angular_view_engine/yarn.lock b/examples/angular_view_engine/yarn.lock index 50aacba1a7..c5e4d831c3 100644 --- a/examples/angular_view_engine/yarn.lock +++ b/examples/angular_view_engine/yarn.lock @@ -36,12 +36,12 @@ dependencies: tslib "^1.9.0" -"@angular/bazel@9.0.0-rc.10": - version "9.0.0-rc.10" - resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-9.0.0-rc.10.tgz#49b3b798ebf213cbac8e0371a3c4acfa00c617b6" - integrity sha512-pneDQbD/Yl0tGujqFuHNyGunvukUtBzAFRutIaJ5lS6fANXBwW02ufePLoHiF1HYeupGfW9H01oVBjtLH8HhyQ== +"@angular/bazel@10.1.0-next.0": + version "10.1.0-next.0" + resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-10.1.0-next.0.tgz#65693185bf09028670b0a4c3839ded0ae9e1bea5" + integrity sha512-+S38XGLC+GMZxw4HWKsWHM2lK3m9r/AZnPCsmAht+58z/jWOoqMqeqgg6DfqIOpJtoYrEKLgIeYTvzXYZbI0Xg== dependencies: - "@microsoft/api-extractor" "^7.3.9" + "@microsoft/api-extractor" "^7.7.13" shelljs "0.8.2" tsickle "^0.38.0" @@ -877,53 +877,34 @@ mkdirp "^0.5.1" pure-utilities "^1.1.4" -"@microsoft/api-extractor-model@7.5.1": - version "7.5.1" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.5.1.tgz#54732ab60cc0761784a54fc00eaaf96145724160" - integrity sha512-qzgmJeoqpJqYDS1yj9YTPdd/+9OWGFwfzGFyr6kVarexomdPSltcoQYIS5JnrB/RFNeUgTNUlwn5mYdyp2Xv6A== +"@microsoft/api-extractor-model@7.8.12": + version "7.8.12" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.8.12.tgz#d089193ef29275b8b20802498c6bdfab80dcef59" + integrity sha512-lE9xcNStS2hf5K+ZQy4L9DQ9Xd62bNsMqW+SyPQWXuQ5HJqUBSXJ2yxCWXP/+rcAkFCvZrikbql9M8Z88nKvwQ== dependencies: - "@microsoft/node-core-library" "3.15.1" - "@microsoft/tsdoc" "0.12.14" + "@microsoft/tsdoc" "0.12.19" + "@rushstack/node-core-library" "3.25.0" -"@microsoft/api-extractor@^7.3.9": - version "7.4.6" - resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.4.6.tgz#024f3944ae658e4cba7494e2fc001a67afb8cf2a" - integrity sha512-v/6v4tS/WzVGOhLyjgNsmJBnRN4gnW99FeCKTKgDeCZiRIdbemi+g/+ZZnS5YaNu6Yp6DfRR9558WV4RVS2vbA== +"@microsoft/api-extractor@^7.7.13": + version "7.9.2" + resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.9.2.tgz#3bb8c93f4280fcb94171e4214d714e1639f4fbd4" + integrity sha512-R4b3zXlYdicoS8bRLXEChTKLPyhUHrG1cb0GDtOX0zdoxlovU1p0JaPt97A/vC7N3Gm2E8gd2qsDWElKU3/wKQ== dependencies: - "@microsoft/api-extractor-model" "7.5.1" - "@microsoft/node-core-library" "3.15.1" - "@microsoft/ts-command-line" "4.3.2" - "@microsoft/tsdoc" "0.12.14" + "@microsoft/api-extractor-model" "7.8.12" + "@microsoft/tsdoc" "0.12.19" + "@rushstack/node-core-library" "3.25.0" + "@rushstack/ts-command-line" "4.4.6" colors "~1.2.1" lodash "~4.17.15" - resolve "1.8.1" + resolve "~1.17.0" + semver "~7.3.0" source-map "~0.6.1" - typescript "~3.5.3" + typescript "~3.9.5" -"@microsoft/node-core-library@3.15.1": - version "3.15.1" - resolved "https://registry.yarnpkg.com/@microsoft/node-core-library/-/node-core-library-3.15.1.tgz#78f6249493b09e9a5c39df9e55c5401d69f23f19" - integrity sha512-fUrcgu+w40k2GW8fiOUFby7jaKAAuDKaTrQuFQ3j+0Pg3ANnJ2uKtVf3bgFiNu+uVKpwVtLo4CPS8TwFduJRow== - dependencies: - "@types/node" "8.10.54" - colors "~1.2.1" - fs-extra "~7.0.1" - jju "~1.4.0" - z-schema "~3.18.3" - -"@microsoft/ts-command-line@4.3.2": - version "4.3.2" - resolved "https://registry.yarnpkg.com/@microsoft/ts-command-line/-/ts-command-line-4.3.2.tgz#87341de2e24f279259297ebd38530300a9f97bc3" - integrity sha512-2QeyilabCe6IpBylPXuY6dCA1S9ym3Ii0zakXVPpyfjSj1NesnyuUeuh6e8kyIqzqJ+3LYjfPG63XzUBtwGqqw== - dependencies: - "@types/argparse" "1.0.33" - argparse "~1.0.9" - colors "~1.2.1" - -"@microsoft/tsdoc@0.12.14": - version "0.12.14" - resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.14.tgz#0e0810a0a174e50e22dfe8edb30599840712f22d" - integrity sha512-518yewjSga1jLdiLrcmpMFlaba5P+50b0TWNFUpC+SL9Yzf0kMi57qw+bMl+rQ08cGqH1vLx4eg9YFUbZXgZ0Q== +"@microsoft/tsdoc@0.12.19": + version "0.12.19" + resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.12.19.tgz#2173ccb92469aaf62031fa9499d21b16d07f9b57" + integrity sha512-IpgPxHrNxZiMNUSXqR1l/gePKPkfAmIKoDRP9hp7OwjU29ZR8WCJsOJ8iBKgw0Qk+pFwR+8Y1cy8ImLY6e9m4A== "@ngrx/store@8.3.0": version "8.3.0" @@ -983,6 +964,28 @@ resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570" integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA= +"@rushstack/node-core-library@3.25.0": + version "3.25.0" + resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.25.0.tgz#ba40bc1b188ab5d31f5705999cd2b3b56b8a32cf" + integrity sha512-e2NCFtAu/eu14b8nlzRX6ZrE9Sb3J2wVt+pninQmTn/IgfnRLAtM0D4PzUO4+ktZwF9fCnpqrOGokLzw6RSVNw== + dependencies: + "@types/node" "10.17.13" + colors "~1.2.1" + fs-extra "~7.0.1" + jju "~1.4.0" + semver "~7.3.0" + timsort "~0.3.0" + z-schema "~3.18.3" + +"@rushstack/ts-command-line@4.4.6": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.4.6.tgz#7818f19e444274e68564a756ef62a2b4e0ced0f8" + integrity sha512-ue3p2m773Yea/s4Ef2Q3gEyLd9T0NDjXCl+PlodGTrJHgxoiRwbROSWHAdYJL/LceGWa6Biqizu9qxUDEWFweQ== + dependencies: + "@types/argparse" "1.0.38" + argparse "~1.0.9" + colors "~1.2.1" + "@schematics/angular@8.3.12": version "8.3.12" resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.3.12.tgz#3f31d668bc694773c8fd9a1b5efde0c81d86ae28" @@ -1005,10 +1008,10 @@ semver "6.3.0" semver-intersect "1.4.0" -"@types/argparse@1.0.33": - version "1.0.33" - resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.33.tgz#2728669427cdd74a99e53c9f457ca2866a37c52d" - integrity sha512-VQgHxyPMTj3hIlq9SY1mctqx+Jj8kpQfoLvDlVSDNOyuYs8JYfkuY3OW/4+dO657yPmNhHpePRx0/Tje5ImNVQ== +"@types/argparse@1.0.38": + version "1.0.38" + resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9" + integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA== "@types/estree@*", "@types/estree@0.0.39": version "0.0.39" @@ -1030,16 +1033,16 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.7.9.tgz#da0210f91096aa67138cf5afd04c4d629f8a406a" integrity sha512-P57oKTJ/vYivL2BCfxCC5tQjlS8qW31pbOL6qt99Yrjm95YdHgNZwjrTTjMBh+C2/y6PXIX4oz253+jUzxKKfQ== +"@types/node@10.17.13": + version "10.17.13" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c" + integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg== + "@types/node@6.14.6": version "6.14.6" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.14.6.tgz#31df045b4c7618ff74d84f542fc3d29445dd566b" integrity sha512-rFs9zCFtSHuseiNXxYxFlun8ibu+jtZPgRM+2ILCmeLiGeGLiIGxuOzD+cNyHegI1GD+da3R/cIbs9+xCLp13w== -"@types/node@8.10.54": - version "8.10.54" - resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.54.tgz#1c88eb253ac1210f1a5876953fb70f7cc4928402" - integrity sha512-kaYyLYf6ICn6/isAyD4K1MyWWd5Q3JgH6bnMN089LUx88+s4W8GvK9Q6JMBVu5vsFFp7pMdSxdKmlBXwH/VFRg== - "@types/node@^10.1.0": version "10.14.21" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.14.21.tgz#4a9db7ef1d1671c0015e632c5fa3d46c86c58c1e" @@ -5401,7 +5404,7 @@ path-key@^2.0.0, path-key@^2.0.1: resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= -path-parse@^1.0.5, path-parse@^1.0.6: +path-parse@^1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== @@ -5900,13 +5903,6 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@1.8.1: - version "1.8.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26" - integrity sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA== - dependencies: - path-parse "^1.0.5" - resolve@^1.1.6: version "1.10.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.1.tgz#664842ac960795bbe758221cdccda61fb64b5f18" @@ -5928,6 +5924,13 @@ resolve@^1.11.0, resolve@^1.11.1, resolve@^1.3.2: dependencies: path-parse "^1.0.6" +resolve@~1.17.0: + version "1.17.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" + integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== + dependencies: + path-parse "^1.0.6" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -6167,6 +6170,11 @@ semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.4.1, semver@^5.5.0, semve resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA== +semver@~7.3.0: + version "7.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938" + integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ== + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -6798,6 +6806,11 @@ timers-ext@^0.1.5: es5-ext "~0.10.46" next-tick "1" +timsort@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= + tmp@0.0.30: version "0.0.30" resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed" @@ -6949,10 +6962,10 @@ typescript@3.4.5: resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.4.5.tgz#2d2618d10bb566572b8d7aad5180d84257d70a99" integrity sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw== -typescript@~3.5.3: - version "3.5.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.5.3.tgz#c830f657f93f1ea846819e929092f5fe5983e977" - integrity sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g== +typescript@~3.9.5: + version "3.9.6" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.6.tgz#8f3e0198a34c3ae17091b35571d3afd31999365a" + integrity sha512-Pspx3oKAPJtjNwE92YS05HQoY7z2SFyOpHo9MqJor3BXAGNaPUs83CuVp9VISFkSjyRfiTpmKuAYGJB7S7hOxw== ultron@~1.1.0: version "1.1.1" diff --git a/packages/typescript/package.json b/packages/typescript/package.json index a5135266a5..5604a27d8c 100644 --- a/packages/typescript/package.json +++ b/packages/typescript/package.json @@ -31,6 +31,11 @@ "source-map-support": "0.5.9", "tsutils": "2.27.2" }, + "bazelWorkspaces": { + "npm_bazel_typescript": { + "rootPath": "." + } + }, "scripts": { "postinstall": "node npm_version_check.js" }