From 5f26cd43fed8df98055b955ccd69f474276d6aa5 Mon Sep 17 00:00:00 2001 From: Fabian Wiles Date: Sat, 31 Mar 2018 19:35:27 +1300 Subject: [PATCH 1/5] chore: upgrade to v6 --- yarn.lock | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/yarn.lock b/yarn.lock index 949b09bcf..1456c37ca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,10 @@ # yarn lockfile v1 +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> chore: upgrade to v6 "@angular/animations@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.0-rc.1.tgz#fefd83733d4ffcf93eff137e5460412ed88dcd0e" @@ -11,6 +15,20 @@ "@angular/bazel@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-6.0.0-rc.1.tgz#8adcd16be933e368d2012eb741f28cf7c7476df7" +<<<<<<< HEAD +======= +======= +"@angular/animations@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.0-rc.0.tgz#8e22f0075d4e78d9e7714b526cb50fa695f5859f" + dependencies: + tslib "^1.9.0" + +"@angular/bazel@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-6.0.0-rc.0.tgz#a729be982b42b2d189de143f6ad23d186dfaeb83" +>>>>>>> 5973e7b... build: add secondary entrypoints for tokens +>>>>>>> chore: upgrade to v6 dependencies: "@bazel/typescript" "^0.11.1" "@types/node" "6.0.84" @@ -18,6 +36,10 @@ protobufjs "5.0.0" shelljs "0.7.8" +<<<<<<< HEAD +======= +<<<<<<< HEAD +>>>>>>> chore: upgrade to v6 "@angular/common@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0-rc.1.tgz#dc45ad017fe0eb2d3c4325580f5428b51dbc71f8" @@ -27,12 +49,27 @@ "@angular/compiler-cli@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0-rc.1.tgz#3803501e19f70ba9337293ea756e87087c2aded7" +<<<<<<< HEAD +======= +======= +"@angular/common@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0-rc.0.tgz#7ff0ba47c0548b8cdfacde9288b4ba8fb26308ce" + dependencies: + tslib "^1.9.0" + +"@angular/compiler-cli@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0-rc.0.tgz#92efa9a5bf5d2876c95f8078a4fb7821aabdf3ca" +>>>>>>> 5973e7b... build: add secondary entrypoints for tokens +>>>>>>> chore: upgrade to v6 dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" tsickle "^0.27.2" +<<<<<<< HEAD "@angular/compiler@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0-rc.1.tgz#cb3451b25e4c77ad3b4a55bff29d65833ac1dbab" @@ -66,6 +103,77 @@ "@angular/platform-server@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0-rc.1.tgz#a626e455d35c3218c3930494b160eefbc20d6f1a" +======= +<<<<<<< HEAD +"@angular/compiler@6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0-rc.1.tgz#cb3451b25e4c77ad3b4a55bff29d65833ac1dbab" + dependencies: + tslib "^1.9.0" + +"@angular/core@6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0-rc.1.tgz#1c57db9aa46991a8f75dcef38dc4ca63bd1b7fec" + dependencies: + tslib "^1.9.0" + +"@angular/http@6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.0-rc.1.tgz#4294be3edaa28a26655d7c298ffd36b0796b9455" + dependencies: + tslib "^1.9.0" + +"@angular/platform-browser-dynamic@6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0-rc.1.tgz#94de105d372edeca8345b2f1987cde526536ec70" + dependencies: + tslib "^1.9.0" + +"@angular/platform-browser@6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0-rc.1.tgz#d67f14f3bc4236b3a5a763cf447834f03ed2d5e9" + dependencies: + tslib "^1.9.0" + +"@angular/platform-server@6.0.0-rc.1": + version "6.0.0-rc.1" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0-rc.1.tgz#a626e455d35c3218c3930494b160eefbc20d6f1a" +======= +"@angular/compiler@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0-rc.0.tgz#9c6a8b3d60f53f4a00426a3ea18a8edbf9d13ef1" + dependencies: + tslib "^1.9.0" + +"@angular/core@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0-rc.0.tgz#8cf9eb1f1fa43d58ee42ea0f399187deea0c0047" + dependencies: + tslib "^1.9.0" + +"@angular/http@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.0-rc.0.tgz#7dab369539cc9936326b10411b72fa7ce2a62c30" + dependencies: + tslib "^1.9.0" + +"@angular/platform-browser-dynamic@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0-rc.0.tgz#4d030bddf76f138a138f879550338adb31eedbc1" + dependencies: + tslib "^1.9.0" + +"@angular/platform-browser@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0-rc.0.tgz#9d7e434e4c50d63f35b75175841d1a566a7df052" + dependencies: + tslib "^1.9.0" + +"@angular/platform-server@6.0.0-rc.0": + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0-rc.0.tgz#8519c66a13dcf88279d98a0f04b55eaa3339ace8" +>>>>>>> 5973e7b... build: add secondary entrypoints for tokens +>>>>>>> chore: upgrade to v6 dependencies: domino "^2.0.1" tslib "^1.9.0" @@ -4393,9 +4501,21 @@ rollup@^0.56.5: version "0.56.5" resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.56.5.tgz#40fe3cf0cd1659d469baad11f4d5b6336c14ce84" +<<<<<<< HEAD +rxjs@^6.0.0-rc.0: + version "6.0.0-rc.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-rc.0.tgz#3fed5454dfaf5a01005c973de857f860826d3eac" +======= +<<<<<<< HEAD rxjs@^6.0.0-rc.0: version "6.0.0-rc.0" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-rc.0.tgz#3fed5454dfaf5a01005c973de857f860826d3eac" +======= +rxjs@^6.0.0-beta.0: + version "6.0.0-beta.1" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-beta.1.tgz#ac6b181251ece21051435c3da2538444b43a37c1" +>>>>>>> 5973e7b... build: add secondary entrypoints for tokens +>>>>>>> chore: upgrade to v6 dependencies: tslib "^1.9.0" From 8d7beef89d0ce3c3ac8cb62b09262634662d6b07 Mon Sep 17 00:00:00 2001 From: Fabian Wiles Date: Mon, 2 Apr 2018 16:11:18 +1200 Subject: [PATCH 2/5] build: use bazel for secondary entry point for tokens --- BUILD.bazel | 33 +- modules/aspnetcore-engine/BUILD.bazel | 26 +- modules/aspnetcore-engine/index.ts | 2 +- modules/aspnetcore-engine/package.json | 13 +- .../{public-api.ts => public_api.ts} | 0 modules/aspnetcore-engine/tokens/BUILD.bazel | 13 + modules/aspnetcore-engine/tokens/index.ts | 2 +- .../aspnetcore-engine/tokens/public_api.ts | 9 + modules/common/BUILD.bazel | 22 +- modules/common/index.ts | 2 +- modules/common/package.json | 11 +- .../common/{public-api.ts => public_api.ts} | 0 modules/express-engine/BUILD.bazel | 25 +- modules/express-engine/index.ts | 2 +- modules/express-engine/package.json | 13 +- .../{public-api.ts => public_api.ts} | 0 modules/express-engine/tokens/BUILD.bazel | 13 + modules/express-engine/tokens/index.ts | 2 +- modules/express-engine/tokens/public_api.ts | 9 + modules/hapi-engine/BUILD.bazel | 25 +- modules/hapi-engine/index.ts | 2 +- modules/hapi-engine/package.json | 13 +- .../{public-api.ts => public_api.ts} | 0 modules/hapi-engine/tokens/BUILD.bazel | 13 + modules/hapi-engine/tokens/index.ts | 2 +- modules/hapi-engine/tokens/public_api.ts | 9 + .../module-map-ngfactory-loader/BUILD.bazel | 14 +- modules/module-map-ngfactory-loader/index.ts | 2 +- .../module-map-ngfactory-loader/package.json | 13 +- .../{public-api.ts => public_api.ts} | 0 tools/bazel.rc | 6 + tools/bazel_stamp_vars.sh | 41 ++ tools/defaults.bzl | 59 ++- tsconfig.json | 1 + yarn.lock | 495 +++++++----------- 35 files changed, 486 insertions(+), 406 deletions(-) rename modules/aspnetcore-engine/{public-api.ts => public_api.ts} (100%) create mode 100644 modules/aspnetcore-engine/tokens/BUILD.bazel create mode 100644 modules/aspnetcore-engine/tokens/public_api.ts rename modules/common/{public-api.ts => public_api.ts} (100%) rename modules/express-engine/{public-api.ts => public_api.ts} (100%) create mode 100644 modules/express-engine/tokens/BUILD.bazel create mode 100644 modules/express-engine/tokens/public_api.ts rename modules/hapi-engine/{public-api.ts => public_api.ts} (100%) create mode 100644 modules/hapi-engine/tokens/BUILD.bazel create mode 100644 modules/hapi-engine/tokens/public_api.ts rename modules/module-map-ngfactory-loader/{public-api.ts => public_api.ts} (100%) create mode 100755 tools/bazel_stamp_vars.sh diff --git a/BUILD.bazel b/BUILD.bazel index c0023b3f1..b8a1a0ec1 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -4,22 +4,21 @@ package(default_visibility = ["//visibility:public"]) exports_files(["tsconfig.json"]) -# Provides the npm-installed dependencies to Bazel actions. -filegroup( +load("@build_bazel_rules_nodejs//:defs.bzl", "node_modules_filegroup") + +node_modules_filegroup( name = "node_modules", - srcs = glob( - ["node_modules/**/*"], - # Exclude directories that commonly contain filenames which are - # illegal bazel labels - exclude = [ - # e.g. node_modules/adm-zip/test/assets/attributes_test/New folder/hidden.txt - "node_modules/**/test/**", - # e.g. node_modules/xpath/docs/function resolvers.md - "node_modules/**/docs/**", - ], - ), - # Allow this targets to be referenced by anyone. - # Other repositories running nodejs binaries will need to - # reference our installed node_modules directory. - visibility = ["//visibility:public"], + packages = [ + "express", + "hapi", + "jasmine", + "rxjs", + "tsickle", + "tslib", + "tsutils", + "typescript", + "zone.js", + "@angular", + "@types", + ], ) diff --git a/modules/aspnetcore-engine/BUILD.bazel b/modules/aspnetcore-engine/BUILD.bazel index 95e3e2c63..64c48b7e2 100644 --- a/modules/aspnetcore-engine/BUILD.bazel +++ b/modules/aspnetcore-engine/BUILD.bazel @@ -1,20 +1,32 @@ load("//tools:defaults.bzl", "ts_library", "ng_module", "ng_package") + +package(default_visibility = ["//visibility:public"]) + load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test") ng_module( - name = "aspnetcore-engine_module", + name = "aspnetcore-engine", srcs = glob([ "*.ts", "src/**/*.ts", ]), - deps = ["@rxjs"], + module_name = "@nguniversal/aspnetcore-engine", + deps = [ + "//modules/aspnetcore-engine/tokens", + "@rxjs", + ], ) ng_package( - name = "@nguniversal/aspnetcore-engine", - srcs = [":package.json"], - entry_point = "index.js", - deps = [":aspnetcore-engine_module"], + name = "npm_package", + srcs = [ + ":package.json", + ], + entry_point = "modules/aspnetcore-engine/index.js", + deps = [ + ":aspnetcore-engine", + "//modules/aspnetcore-engine/tokens", + ], ) ts_library( @@ -24,7 +36,7 @@ ts_library( "spec/**/*.spec.ts", ]), deps = [ - ":aspnetcore-engine_module", + ":aspnetcore-engine", ], ) diff --git a/modules/aspnetcore-engine/index.ts b/modules/aspnetcore-engine/index.ts index ca845d822..45965af3d 100644 --- a/modules/aspnetcore-engine/index.ts +++ b/modules/aspnetcore-engine/index.ts @@ -5,4 +5,4 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -export * from './public-api'; +export * from './public_api'; diff --git a/modules/aspnetcore-engine/package.json b/modules/aspnetcore-engine/package.json index af9f30673..f0d12d338 100644 --- a/modules/aspnetcore-engine/package.json +++ b/modules/aspnetcore-engine/package.json @@ -2,10 +2,6 @@ "name": "@nguniversal/aspnetcore-engine", "version": "0.0.0-PLACEHOLDER", "description": "ASP.NET Core Engine for running Server Angular Apps", - "main": "./bundles/aspnetcore-engine.umd.js", - "module": "./esm5/aspnetcore-engine.es5.js", - "es2015": "./esm2015/aspnetcore-engine.js", - "typings": "./aspnetcore-engine.d.ts", "author": { "name": "MarkPieszak", "email": "mpieszak84@gmail.com", @@ -21,9 +17,12 @@ "universal" ], "peerDependencies": { - "@angular/common": "0.0.0-NG", - "@angular/core": "0.0.0-NG", - "rxjs": "^6.0.0-beta.1" + "@angular/common": "NG_VERSION", + "@angular/core": "NG_VERSION", + "rxjs": "RXJS_VERSION" + }, + "ng-update": { + "packageGroup": "NG_UPDATE_PACKAGE_GROUP" }, "repository": { "type": "git", diff --git a/modules/aspnetcore-engine/public-api.ts b/modules/aspnetcore-engine/public_api.ts similarity index 100% rename from modules/aspnetcore-engine/public-api.ts rename to modules/aspnetcore-engine/public_api.ts diff --git a/modules/aspnetcore-engine/tokens/BUILD.bazel b/modules/aspnetcore-engine/tokens/BUILD.bazel new file mode 100644 index 000000000..8b45cab5f --- /dev/null +++ b/modules/aspnetcore-engine/tokens/BUILD.bazel @@ -0,0 +1,13 @@ +package(default_visibility = ["//visibility:public"]) + +load("//tools:defaults.bzl", "ts_library", "ng_module", "ng_package") + +exports_files(["package.json"]) + +ng_module( + name = "tokens", + srcs = glob([ + "*.ts", + ]), + module_name = "@nguniversal/aspnetcore-engine/tokens", +) diff --git a/modules/aspnetcore-engine/tokens/index.ts b/modules/aspnetcore-engine/tokens/index.ts index ca845d822..45965af3d 100644 --- a/modules/aspnetcore-engine/tokens/index.ts +++ b/modules/aspnetcore-engine/tokens/index.ts @@ -5,4 +5,4 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -export * from './public-api'; +export * from './public_api'; diff --git a/modules/aspnetcore-engine/tokens/public_api.ts b/modules/aspnetcore-engine/tokens/public_api.ts new file mode 100644 index 000000000..0627aa44e --- /dev/null +++ b/modules/aspnetcore-engine/tokens/public_api.ts @@ -0,0 +1,9 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +export * from './tokens'; diff --git a/modules/common/BUILD.bazel b/modules/common/BUILD.bazel index fc4b57fdb..4868cc28b 100644 --- a/modules/common/BUILD.bazel +++ b/modules/common/BUILD.bazel @@ -1,20 +1,24 @@ load("//tools:defaults.bzl", "ts_library", "ng_module", "ng_package") + +package(default_visibility = ["//visibility:public"]) + load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test") ng_module( - name = "common_module", + name = "common", srcs = glob([ "*.ts", "src/**/*.ts", ]), + module_name = "@nguniversal/common", deps = [], ) ng_package( - name = "@nguniversal/common", + name = "npm_package", srcs = [":package.json"], - entry_point = "index.js", - deps = [":common_module"], + entry_point = "modules/common/index.js", + deps = [":common"], ) ts_library( @@ -24,11 +28,11 @@ ts_library( "spec/**/*.spec.ts", ]), deps = [ - ":common_module", + ":common", ], ) -jasmine_node_test( - name = "unit_test", - srcs = [":unit_test_lib"], -) +# jasmine_node_test( +# name = "unit_test", +# srcs = [":unit_test_lib"], +# ) diff --git a/modules/common/index.ts b/modules/common/index.ts index ca845d822..45965af3d 100644 --- a/modules/common/index.ts +++ b/modules/common/index.ts @@ -5,4 +5,4 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -export * from './public-api'; +export * from './public_api'; diff --git a/modules/common/package.json b/modules/common/package.json index 5efda8060..cea06eaa8 100644 --- a/modules/common/package.json +++ b/modules/common/package.json @@ -2,18 +2,17 @@ "name": "@nguniversal/common", "version": "0.0.0-PLACEHOLDER", "description": "Angular Universal common utilities", - "main": "./bundles/common.umd.js", - "module": "./esm5/common.es5.js", - "es2015": "./esm2015/common.js", - "typings": "./common.d.ts", "license": "MIT", "keywords": [ "ssr", "universal" ], "peerDependencies": { - "@angular/common": "0.0.0-NG", - "@angular/core": "0.0.0-NG" + "@angular/common": "NG_VERSION", + "@angular/core": "NG_VERSION" + }, + "ng-update": { + "packageGroup": "NG_UPDATE_PACKAGE_GROUP" }, "repository": { "type": "git", diff --git a/modules/common/public-api.ts b/modules/common/public_api.ts similarity index 100% rename from modules/common/public-api.ts rename to modules/common/public_api.ts diff --git a/modules/express-engine/BUILD.bazel b/modules/express-engine/BUILD.bazel index 5e681744f..cf2aa93f2 100644 --- a/modules/express-engine/BUILD.bazel +++ b/modules/express-engine/BUILD.bazel @@ -1,20 +1,31 @@ load("//tools:defaults.bzl", "ts_library", "ng_module", "ng_package") + +package(default_visibility = ["//visibility:public"]) + load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test") ng_module( - name = "express-engine_module", + name = "express-engine", srcs = glob([ "*.ts", "src/**/*.ts", ]), - deps = ["@rxjs"], + module_name = "@nguniversal/express-engine", + deps = [ + "//modules/express-engine/tokens", + ], ) ng_package( - name = "@nguniversal/express-engine", - srcs = [":package.json"], - entry_point = "index.js", - deps = [":express-engine_module"], + name = "npm_package", + srcs = [ + ":package.json", + ], + entry_point = "modules/express-engine/index.js", + deps = [ + ":express-engine", + "//modules/express-engine/tokens", + ], ) ts_library( @@ -24,7 +35,7 @@ ts_library( "spec/**/*.spec.ts", ]), deps = [ - ":express-engine_module", + ":express-engine", ], ) diff --git a/modules/express-engine/index.ts b/modules/express-engine/index.ts index ca845d822..45965af3d 100644 --- a/modules/express-engine/index.ts +++ b/modules/express-engine/index.ts @@ -5,4 +5,4 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -export * from './public-api'; +export * from './public_api'; diff --git a/modules/express-engine/package.json b/modules/express-engine/package.json index 6792c7ac6..379d3d603 100644 --- a/modules/express-engine/package.json +++ b/modules/express-engine/package.json @@ -2,10 +2,6 @@ "name": "@nguniversal/express-engine", "version": "0.0.0-PLACEHOLDER", "description": "Express Engine for running Server Angular Apps", - "main": "./bundles/express-engine.umd.js", - "module": "./esm5/express-engine.es5.js", - "es2015": "./esm2015/express-engine.js", - "typings": "./express-engine.d.ts", "license": "MIT", "keywords": [ "express", @@ -13,11 +9,14 @@ "universal" ], "peerDependencies": { - "@angular/common": "0.0.0-NG", - "@angular/core": "0.0.0-NG", - "@angular/platform-server": "0.0.0-NG", + "@angular/common": "NG_VERSION", + "@angular/core": "NG_VERSION", + "@angular/platform-server": "NG_VERSION", "express": "^4.15.2" }, + "ng-update": { + "packageGroup": "NG_UPDATE_PACKAGE_GROUP" + }, "repository": { "type": "git", "url": "https://github.com/angular/universal" diff --git a/modules/express-engine/public-api.ts b/modules/express-engine/public_api.ts similarity index 100% rename from modules/express-engine/public-api.ts rename to modules/express-engine/public_api.ts diff --git a/modules/express-engine/tokens/BUILD.bazel b/modules/express-engine/tokens/BUILD.bazel new file mode 100644 index 000000000..579637cab --- /dev/null +++ b/modules/express-engine/tokens/BUILD.bazel @@ -0,0 +1,13 @@ +package(default_visibility = ["//visibility:public"]) + +load("//tools:defaults.bzl", "ts_library", "ng_module", "ng_package") + +exports_files(["package.json"]) + +ng_module( + name = "tokens", + srcs = glob([ + "*.ts", + ]), + module_name = "@nguniversal/express-engine/tokens", +) diff --git a/modules/express-engine/tokens/index.ts b/modules/express-engine/tokens/index.ts index ca845d822..45965af3d 100644 --- a/modules/express-engine/tokens/index.ts +++ b/modules/express-engine/tokens/index.ts @@ -5,4 +5,4 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -export * from './public-api'; +export * from './public_api'; diff --git a/modules/express-engine/tokens/public_api.ts b/modules/express-engine/tokens/public_api.ts new file mode 100644 index 000000000..0627aa44e --- /dev/null +++ b/modules/express-engine/tokens/public_api.ts @@ -0,0 +1,9 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +export * from './tokens'; diff --git a/modules/hapi-engine/BUILD.bazel b/modules/hapi-engine/BUILD.bazel index 7ecc14857..0476dd222 100644 --- a/modules/hapi-engine/BUILD.bazel +++ b/modules/hapi-engine/BUILD.bazel @@ -1,20 +1,31 @@ load("//tools:defaults.bzl", "ts_library", "ng_module", "ng_package") + +package(default_visibility = ["//visibility:public"]) + load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test") ng_module( - name = "hapi-engine_module", + name = "hapi-engine", srcs = glob([ "*.ts", "src/**/*.ts", ]), - deps = ["@rxjs"], + module_name = "@nguniversal/hapi-engine", + deps = [ + "//modules/hapi-engine/tokens", + ], ) ng_package( - name = "@nguniversal/hapi-engine", - srcs = [":package.json"], - entry_point = "index.js", - deps = [":hapi-engine_module"], + name = "npm_package", + srcs = [ + ":package.json", + ], + entry_point = "modules/hapi-engine/index.js", + deps = [ + ":hapi-engine", + "//modules/hapi-engine/tokens", + ], ) ts_library( @@ -24,7 +35,7 @@ ts_library( "spec/**/*.spec.ts", ]), deps = [ - ":hapi-engine_module", + ":hapi-engine", ], ) diff --git a/modules/hapi-engine/index.ts b/modules/hapi-engine/index.ts index ca845d822..45965af3d 100644 --- a/modules/hapi-engine/index.ts +++ b/modules/hapi-engine/index.ts @@ -5,4 +5,4 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -export * from './public-api'; +export * from './public_api'; diff --git a/modules/hapi-engine/package.json b/modules/hapi-engine/package.json index f72197719..831fe652f 100644 --- a/modules/hapi-engine/package.json +++ b/modules/hapi-engine/package.json @@ -2,10 +2,6 @@ "name": "@nguniversal/hapi-engine", "version": "0.0.0-PLACEHOLDER", "description": "Hapi Engine for running Server Angular Apps", - "main": "./bundles/hapi-engine.umd.js", - "module": "./esm5/hapi-engine.es5.js", - "es2015": "./esm2015/hapi-engine.js", - "typings": "./hapi-engine.d.ts", "license": "MIT", "keywords": [ "hapi", @@ -13,11 +9,14 @@ "universal" ], "peerDependencies": { - "@angular/common": "0.0.0-NG", - "@angular/core": "0.0.0-NG", - "@angular/platform-server": "0.0.0-NG", + "@angular/common": "NG_VERSION", + "@angular/core": "NG_VERSION", + "@angular/platform-server": "NG_VERSION", "hapi": "^16.1.1" }, + "ng-update": { + "packageGroup": "NG_UPDATE_PACKAGE_GROUP" + }, "repository": { "type": "git", "url": "https://github.com/angular/universal" diff --git a/modules/hapi-engine/public-api.ts b/modules/hapi-engine/public_api.ts similarity index 100% rename from modules/hapi-engine/public-api.ts rename to modules/hapi-engine/public_api.ts diff --git a/modules/hapi-engine/tokens/BUILD.bazel b/modules/hapi-engine/tokens/BUILD.bazel new file mode 100644 index 000000000..5ce38f147 --- /dev/null +++ b/modules/hapi-engine/tokens/BUILD.bazel @@ -0,0 +1,13 @@ +package(default_visibility = ["//visibility:public"]) + +load("//tools:defaults.bzl", "ts_library", "ng_module", "ng_package") + +exports_files(["package.json"]) + +ng_module( + name = "tokens", + srcs = glob([ + "*.ts", + ]), + module_name = "@nguniversal/hapi-engine/tokens", +) diff --git a/modules/hapi-engine/tokens/index.ts b/modules/hapi-engine/tokens/index.ts index ca845d822..45965af3d 100644 --- a/modules/hapi-engine/tokens/index.ts +++ b/modules/hapi-engine/tokens/index.ts @@ -5,4 +5,4 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -export * from './public-api'; +export * from './public_api'; diff --git a/modules/hapi-engine/tokens/public_api.ts b/modules/hapi-engine/tokens/public_api.ts new file mode 100644 index 000000000..0627aa44e --- /dev/null +++ b/modules/hapi-engine/tokens/public_api.ts @@ -0,0 +1,9 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * Use of this source code is governed by an MIT-style license that can be + * found in the LICENSE file at https://angular.io/license + */ + +export * from './tokens'; diff --git a/modules/module-map-ngfactory-loader/BUILD.bazel b/modules/module-map-ngfactory-loader/BUILD.bazel index edbd2b47f..ed598ea74 100644 --- a/modules/module-map-ngfactory-loader/BUILD.bazel +++ b/modules/module-map-ngfactory-loader/BUILD.bazel @@ -1,20 +1,24 @@ load("//tools:defaults.bzl", "ts_library", "ng_module", "ng_package") + +package(default_visibility = ["//visibility:public"]) + load("@build_bazel_rules_nodejs//:defs.bzl", "jasmine_node_test") ng_module( - name = "module-map-ngfactory-loader_module", + name = "module-map-ngfactory-loader", srcs = glob([ "*.ts", "src/**/*.ts", ]), + module_name = "@nguniversal/module-map-ngfactory-loader", deps = [], ) ng_package( - name = "@nguniversal/module-map-ngfactory-loader", + name = "npm_package", srcs = [":package.json"], - entry_point = "index.js", - deps = [":module-map-ngfactory-loader_module"], + entry_point = "modules/module-map-ngfactory-loader/index.js", + deps = [":module-map-ngfactory-loader"], ) ts_library( @@ -24,7 +28,7 @@ ts_library( "spec/**/*.spec.ts", ]), deps = [ - ":module-map-ngfactory-loader_module", + ":module-map-ngfactory-loader", ], ) diff --git a/modules/module-map-ngfactory-loader/index.ts b/modules/module-map-ngfactory-loader/index.ts index ca845d822..45965af3d 100644 --- a/modules/module-map-ngfactory-loader/index.ts +++ b/modules/module-map-ngfactory-loader/index.ts @@ -5,4 +5,4 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -export * from './public-api'; +export * from './public_api'; diff --git a/modules/module-map-ngfactory-loader/package.json b/modules/module-map-ngfactory-loader/package.json index fa95e4d93..530dafd91 100644 --- a/modules/module-map-ngfactory-loader/package.json +++ b/modules/module-map-ngfactory-loader/package.json @@ -2,10 +2,6 @@ "name": "@nguniversal/module-map-ngfactory-loader", "version": "0.0.0-PLACEHOLDER", "description": "NgFactoryLoader which uses a Map to load ngfactories without lazy loading", - "main": "./bundles/module-map-ngfactory-loader.umd.js", - "module": "./esm5/module-map-ngfactory-loader.es5.js", - "es2015": "./esm2015/module-map-ngfactory-loader.js", - "typings": "./module-map-ngfactory-loader.d.ts", "license": "MIT", "keywords": [ "ngfactory", @@ -14,9 +10,12 @@ "universal" ], "peerDependencies": { - "@angular/common": "0.0.0-NG", - "@angular/core": "0.0.0-NG", - "@angular/platform-server": "0.0.0-NG" + "@angular/common": "NG_VERSION", + "@angular/core": "NG_VERSION", + "@angular/platform-server": "NG_VERSION" + }, + "ng-update": { + "packageGroup": "NG_UPDATE_PACKAGE_GROUP" }, "repository": { "type": "git", diff --git a/modules/module-map-ngfactory-loader/public-api.ts b/modules/module-map-ngfactory-loader/public_api.ts similarity index 100% rename from modules/module-map-ngfactory-loader/public-api.ts rename to modules/module-map-ngfactory-loader/public_api.ts diff --git a/tools/bazel.rc b/tools/bazel.rc index 3a959ebe6..d74b7bcfc 100644 --- a/tools/bazel.rc +++ b/tools/bazel.rc @@ -21,6 +21,12 @@ build --symlink_prefix=dist/ # Performance: avoid stat'ing input files build --watchfs +############################### +# Release support # +############################### + +build --workspace_status_command=./tools/bazel_stamp_vars.sh + ############################### # Output # ############################### diff --git a/tools/bazel_stamp_vars.sh b/tools/bazel_stamp_vars.sh new file mode 100755 index 000000000..2e70a4c1f --- /dev/null +++ b/tools/bazel_stamp_vars.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash +# Generates the data used by the stamping feature in bazel. +# See the section on stamping in docs/BAZEL.md + +set -u -e -E -o pipefail + +echo "Running: $0" >&2 + +function onError { + echo "Failed to execute: $0" + echo "" +} + +# Setup crash trap +trap 'onError' ERR + + +echo BUILD_SCM_HASH $(git rev-parse HEAD) + +if [[ "$(git tag)" == "" ]]; then + echo "No git tags found, can't stamp the build." + echo "Either fetch the tags:" + echo " git fetch git@github.com:angular/angular.git --tags" + echo "or build without stamping by giving an empty workspace_status_command:" + echo " bazel build --workspace_status_command= ..." + echo "" +fi + +BUILD_SCM_VERSION_RAW=$(git describe --abbrev=7 --tags HEAD) + +# Find out if there are any uncommitted local changes +# TODO(i): is it ok to use "--untracked-files=no" to ignore untracked files since they should not affect anything? +if [[ $(git status --untracked-files=no --porcelain) ]]; then LOCAL_CHANGES="true"; else LOCAL_CHANGES="false"; fi +echo BUILD_SCM_LOCAL_CHANGES ${LOCAL_CHANGES} + +# Reformat `git describe` version string into a more semver-ish string +# From: 5.2.0-rc.0-57-g757f886 +# To: 5.2.0-rc.0+57.sha-757f886 +# Or: 5.2.0-rc.0+57.sha-757f886.with-local-changes +BUILD_SCM_VERSION="$(echo ${BUILD_SCM_VERSION_RAW} | sed -E 's/-([0-9]+)-g/+\1.sha-/g')""$( if [[ $LOCAL_CHANGES == "true" ]]; then echo ".with-local-changes"; fi)" +echo BUILD_SCM_VERSION ${BUILD_SCM_VERSION} diff --git a/tools/defaults.bzl b/tools/defaults.bzl index e6f2569e1..383da0060 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -3,21 +3,29 @@ load("@build_bazel_rules_typescript//:defs.bzl", _ts_library = "ts_library") load("@angular//:index.bzl", _ng_module = "ng_module") load("@angular//:index.bzl", _ng_package = "ng_package") -def ts_library(tsconfig = None, node_modules = None, **kwargs): - if not tsconfig: - tsconfig = "//:tsconfig.json" - if not node_modules: - node_modules = "//:node_modules" - _ts_library(tsconfig = tsconfig, **kwargs) +DEFAULT_TS_CONFIG = "//:tsconfig.json" +DEFAULT_NODE_MODULES = "//:node_modules" -def ng_module(tsconfig = None, node_modules = None, **kwargs): - if not tsconfig: - tsconfig = "//:tsconfig.json" - _ts_library(tsconfig = tsconfig, **kwargs) +NG_VERSION = "^6.0.0-rc.0" +RXJS_VERSION = "^6.0.0-beta.0" + +NGUNIVERSAL_SCOPED_PACKAGES = ["@nguniversal/%s" % p for p in [ + "aspnetcore-engine", + "common", + "express-engine", + "hapi-engine", + "module-map-ngfactory-loader", +]] + +PKG_GROUP_REPLACEMENTS = { + "NG_VERSION": NG_VERSION, + "RXJS_VERSION": RXJS_VERSION, + "\"NG_UPDATE_PACKAGE_GROUP\"": """[ + %s + ]""" % ",\n ".join(["\"%s\"" % s for s in NGUNIVERSAL_SCOPED_PACKAGES]) +} -def ng_package(globals = None, **kwargs): - if not globals: - globals = { +GLOBALS = { "@angular/animations": "ng.animations", "@angular/core": "ng.core", "@angular/common": "ng.common", @@ -31,9 +39,30 @@ def ng_package(globals = None, **kwargs): "@nguniversal/express-engine/tokens": "nguniversal.expressEngine.tokens", "@nguniversal/hapi-engine/tokens": "nguniversal.hapiEngine.tokens", "rxjs": "Rx", - "rxjs/operators": "Rx.operators" + "rxjs/operators": "Rx.operators", "fs": "fs", "express": "express", "hapi": "hapi" } - _ng_package(globals = globals, **kwargs) + +def ts_test_library(node_modules=None, **kwargs): + ts_library(testonly=1, **kwargs) + +def ts_library(tsconfig = None, node_modules = None, **kwargs): + if not tsconfig: + tsconfig = DEFAULT_TS_CONFIG + if not node_modules: + node_modules = DEFAULT_NODE_MODULES + _ts_library(tsconfig = tsconfig, **kwargs) + +def ng_module(tsconfig = None, node_modules = None, **kwargs): + if not tsconfig: + tsconfig = DEFAULT_TS_CONFIG + if not node_modules: + node_modules = DEFAULT_NODE_MODULES + _ng_module(tsconfig = tsconfig, **kwargs) + +def ng_package(globals = {}, **kwargs): + globals = dict(globals, **GLOBALS) + + _ng_package(globals = globals, replacements=PKG_GROUP_REPLACEMENTS, **kwargs) diff --git a/tsconfig.json b/tsconfig.json index 5ab35bcd0..01d43cbf3 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -16,6 +16,7 @@ "typeRoots": [ "node_modules/@types" ], + "types": ["tslib", "jasmine", "node"], "lib": [ "dom", "es6", diff --git a/yarn.lock b/yarn.lock index 1456c37ca..d4c3a653f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,6 @@ # yarn lockfile v1 -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> chore: upgrade to v6 "@angular/animations@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.0-rc.1.tgz#fefd83733d4ffcf93eff137e5460412ed88dcd0e" @@ -15,20 +11,6 @@ "@angular/bazel@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-6.0.0-rc.1.tgz#8adcd16be933e368d2012eb741f28cf7c7476df7" -<<<<<<< HEAD -======= -======= -"@angular/animations@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.0.0-rc.0.tgz#8e22f0075d4e78d9e7714b526cb50fa695f5859f" - dependencies: - tslib "^1.9.0" - -"@angular/bazel@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/bazel/-/bazel-6.0.0-rc.0.tgz#a729be982b42b2d189de143f6ad23d186dfaeb83" ->>>>>>> 5973e7b... build: add secondary entrypoints for tokens ->>>>>>> chore: upgrade to v6 dependencies: "@bazel/typescript" "^0.11.1" "@types/node" "6.0.84" @@ -36,10 +18,6 @@ protobufjs "5.0.0" shelljs "0.7.8" -<<<<<<< HEAD -======= -<<<<<<< HEAD ->>>>>>> chore: upgrade to v6 "@angular/common@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0-rc.1.tgz#dc45ad017fe0eb2d3c4325580f5428b51dbc71f8" @@ -49,27 +27,12 @@ "@angular/compiler-cli@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0-rc.1.tgz#3803501e19f70ba9337293ea756e87087c2aded7" -<<<<<<< HEAD -======= -======= -"@angular/common@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.0.0-rc.0.tgz#7ff0ba47c0548b8cdfacde9288b4ba8fb26308ce" - dependencies: - tslib "^1.9.0" - -"@angular/compiler-cli@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.0.0-rc.0.tgz#92efa9a5bf5d2876c95f8078a4fb7821aabdf3ca" ->>>>>>> 5973e7b... build: add secondary entrypoints for tokens ->>>>>>> chore: upgrade to v6 dependencies: chokidar "^1.4.2" minimist "^1.2.0" reflect-metadata "^0.1.2" tsickle "^0.27.2" -<<<<<<< HEAD "@angular/compiler@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0-rc.1.tgz#cb3451b25e4c77ad3b4a55bff29d65833ac1dbab" @@ -103,77 +66,6 @@ "@angular/platform-server@6.0.0-rc.1": version "6.0.0-rc.1" resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0-rc.1.tgz#a626e455d35c3218c3930494b160eefbc20d6f1a" -======= -<<<<<<< HEAD -"@angular/compiler@6.0.0-rc.1": - version "6.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0-rc.1.tgz#cb3451b25e4c77ad3b4a55bff29d65833ac1dbab" - dependencies: - tslib "^1.9.0" - -"@angular/core@6.0.0-rc.1": - version "6.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0-rc.1.tgz#1c57db9aa46991a8f75dcef38dc4ca63bd1b7fec" - dependencies: - tslib "^1.9.0" - -"@angular/http@6.0.0-rc.1": - version "6.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.0-rc.1.tgz#4294be3edaa28a26655d7c298ffd36b0796b9455" - dependencies: - tslib "^1.9.0" - -"@angular/platform-browser-dynamic@6.0.0-rc.1": - version "6.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0-rc.1.tgz#94de105d372edeca8345b2f1987cde526536ec70" - dependencies: - tslib "^1.9.0" - -"@angular/platform-browser@6.0.0-rc.1": - version "6.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0-rc.1.tgz#d67f14f3bc4236b3a5a763cf447834f03ed2d5e9" - dependencies: - tslib "^1.9.0" - -"@angular/platform-server@6.0.0-rc.1": - version "6.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0-rc.1.tgz#a626e455d35c3218c3930494b160eefbc20d6f1a" -======= -"@angular/compiler@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.0.0-rc.0.tgz#9c6a8b3d60f53f4a00426a3ea18a8edbf9d13ef1" - dependencies: - tslib "^1.9.0" - -"@angular/core@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.0.0-rc.0.tgz#8cf9eb1f1fa43d58ee42ea0f399187deea0c0047" - dependencies: - tslib "^1.9.0" - -"@angular/http@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.0.0-rc.0.tgz#7dab369539cc9936326b10411b72fa7ce2a62c30" - dependencies: - tslib "^1.9.0" - -"@angular/platform-browser-dynamic@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.0.0-rc.0.tgz#4d030bddf76f138a138f879550338adb31eedbc1" - dependencies: - tslib "^1.9.0" - -"@angular/platform-browser@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.0.0-rc.0.tgz#9d7e434e4c50d63f35b75175841d1a566a7df052" - dependencies: - tslib "^1.9.0" - -"@angular/platform-server@6.0.0-rc.0": - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.0.0-rc.0.tgz#8519c66a13dcf88279d98a0f04b55eaa3339ace8" ->>>>>>> 5973e7b... build: add secondary entrypoints for tokens ->>>>>>> chore: upgrade to v6 dependencies: domino "^2.0.1" tslib "^1.9.0" @@ -255,8 +147,8 @@ resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.6.tgz#14445b6a1613cf4e05dd61c3c3256d0e95c0421e" "@types/joi@*": - version "13.0.5" - resolved "https://registry.yarnpkg.com/@types/joi/-/joi-13.0.5.tgz#50829402204e8fec8ee287eeb37d79fbff34913c" + version "13.0.7" + resolved "https://registry.yarnpkg.com/@types/joi/-/joi-13.0.7.tgz#89cd7092fc24160b9d59597270cd0d3620e709d8" "@types/mime-db@*": version "1.27.0" @@ -277,16 +169,16 @@ resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" "@types/node@*", "@types/node@^9.4.6": - version "9.4.7" - resolved "https://registry.yarnpkg.com/@types/node/-/node-9.4.7.tgz#57d81cd98719df2c9de118f2d5f3b1120dcd7275" + version "9.6.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.1.tgz#e2d374ef15b315b48e7efc308fa1a7cd51faa06c" "@types/node@6.0.84": version "6.0.84" resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.84.tgz#193ffe5a9f42864d425ffd9739d95b753c6a1eab" "@types/node@^6.0.46": - version "6.0.102" - resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.102.tgz#a6cf3b9843286b63eb362a8522bc382d96fe68d1" + version "6.0.103" + resolved "https://registry.yarnpkg.com/@types/node/-/node-6.0.103.tgz#4fddb6c254756e98004039da4e4f4230d1e397ca" "@types/podium@*": version "1.0.0" @@ -342,7 +234,7 @@ accept@^2.1.4: boom "5.x.x" hoek "4.x.x" -accepts@~1.3.4: +accepts@~1.3.4, accepts@~1.3.5: version "1.3.5" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2" dependencies: @@ -633,8 +525,8 @@ asynckit@^0.4.0: resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" atob@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d" + version "2.1.0" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc" aws-sign2@~0.6.0: version "0.6.0" @@ -797,8 +689,8 @@ brorand@^1.0.1: resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" browser-pack@^6.0.1: - version "6.0.4" - resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.0.4.tgz#9a73beb3b48f9e36868be007b64400102c04a99f" + version "6.1.0" + resolved "https://registry.yarnpkg.com/browser-pack/-/browser-pack-6.1.0.tgz#c34ba10d0b9ce162b5af227c7131c92c2ecd5774" dependencies: JSONStream "^1.0.3" combine-source-map "~0.8.0" @@ -921,6 +813,10 @@ buffer-crc32@^0.2.5: version "0.2.13" resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" +buffer-from@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531" + buffer-more-ints@0.0.2: version "0.0.2" resolved "https://registry.yarnpkg.com/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz#26b3885d10fa13db7fc01aae3aab870199e0124c" @@ -1051,7 +947,7 @@ chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.3.0: +chalk@^2.0.0, chalk@^2.3.0, chalk@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" dependencies: @@ -1110,8 +1006,8 @@ cliui@^4.0.0: wrap-ansi "^2.0.0" clone@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.3.tgz#298d7e2231660f40c003c2ed3140decf3f53085f" + version "1.0.4" + resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" co@^4.6.0: version "4.6.0" @@ -1136,8 +1032,8 @@ color-name@^1.1.1: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" colors@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" + version "1.2.1" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794" colour@~0.7.1: version "0.7.1" @@ -1158,28 +1054,15 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0: lodash.memoize "~3.0.3" source-map "~0.5.3" -combine-source-map@~0.7.1: - version "0.7.2" - resolved "https://registry.yarnpkg.com/combine-source-map/-/combine-source-map-0.7.2.tgz#0870312856b307a87cc4ac486f3a9a62aeccc09e" - dependencies: - convert-source-map "~1.1.0" - inline-source-map "~0.6.0" - lodash.memoize "~3.0.3" - source-map "~0.5.3" - combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818" dependencies: delayed-stream "~1.0.0" -commander@^2.12.1, commander@^2.9.0: - version "2.15.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.0.tgz#ad2a23a1c3b036e392469b8012cec6b33b4c1322" - -commander@~2.14.1: - version "2.14.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" +commander@^2.12.1, commander@^2.9.0, commander@~2.15.0: + version "2.15.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" compare-func@^1.3.1: version "1.3.2" @@ -1204,10 +1087,11 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@^1.4.10: - version "1.6.1" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.1.tgz#261b8f518301f1d834e36342b9fea095d2620a26" +concat-stream@^1.4.10, concat-stream@^1.6.1: + version "1.6.2" + resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" dependencies: + buffer-from "^1.0.0" inherits "^2.0.3" readable-stream "^2.2.2" typedarray "^0.0.6" @@ -1264,29 +1148,29 @@ conventional-changelog-angular@^1.6.6: compare-func "^1.3.1" q "^1.5.1" -conventional-changelog-atom@^0.2.4: - version "0.2.4" - resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.4.tgz#4917759947f4db86073f9d3838a2d54302d5843d" +conventional-changelog-atom@^0.2.8: + version "0.2.8" + resolved "https://registry.yarnpkg.com/conventional-changelog-atom/-/conventional-changelog-atom-0.2.8.tgz#8037693455990e3256f297320a45fa47ee553a14" dependencies: q "^1.5.1" -conventional-changelog-codemirror@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.4.tgz#debc43991d487d7964e65087fbbe034044bd51fb" +conventional-changelog-codemirror@^0.3.8: + version "0.3.8" + resolved "https://registry.yarnpkg.com/conventional-changelog-codemirror/-/conventional-changelog-codemirror-0.3.8.tgz#a1982c8291f4ee4d6f2f62817c6b2ecd2c4b7b47" dependencies: q "^1.5.1" -conventional-changelog-core@^2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.5.tgz#45b6347c4c6512e1f163f7ff55c9f5bcb88fd990" +conventional-changelog-core@^2.0.10: + version "2.0.10" + resolved "https://registry.yarnpkg.com/conventional-changelog-core/-/conventional-changelog-core-2.0.10.tgz#3e47565ef9d148bcdceab6de6b3651a16dd28dc8" dependencies: - conventional-changelog-writer "^3.0.4" - conventional-commits-parser "^2.1.5" + conventional-changelog-writer "^3.0.9" + conventional-commits-parser "^2.1.7" dateformat "^3.0.0" get-pkg-repo "^1.0.0" - git-raw-commits "^1.3.4" + git-raw-commits "^1.3.6" git-remote-origin-url "^2.0.0" - git-semver-tags "^1.3.4" + git-semver-tags "^1.3.6" lodash "^4.2.1" normalize-package-data "^2.3.5" q "^1.5.1" @@ -1294,21 +1178,21 @@ conventional-changelog-core@^2.0.5: read-pkg-up "^1.0.1" through2 "^2.0.0" -conventional-changelog-ember@^0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.6.tgz#f3825d7434168f3d9211b5532dc1d5769532b668" +conventional-changelog-ember@^0.3.11: + version "0.3.11" + resolved "https://registry.yarnpkg.com/conventional-changelog-ember/-/conventional-changelog-ember-0.3.11.tgz#56ca9b418ee9d7f089bea34307d57497420d72a6" dependencies: q "^1.5.1" -conventional-changelog-eslint@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.5.tgz#8bae05ebbf574e6506caf7b37dc51ca21b74d220" +conventional-changelog-eslint@^1.0.9: + version "1.0.9" + resolved "https://registry.yarnpkg.com/conventional-changelog-eslint/-/conventional-changelog-eslint-1.0.9.tgz#b13cc7e4b472c819450ede031ff1a75c0e3d07d3" dependencies: q "^1.5.1" -conventional-changelog-express@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.4.tgz#812a9cf778677e12f978ac9c40d85297c0bfcca9" +conventional-changelog-express@^0.3.6: + version "0.3.6" + resolved "https://registry.yarnpkg.com/conventional-changelog-express/-/conventional-changelog-express-0.3.6.tgz#4a6295cb11785059fb09202180d0e59c358b9c2c" dependencies: q "^1.5.1" @@ -1324,23 +1208,23 @@ conventional-changelog-jscs@^0.1.0: dependencies: q "^1.4.1" -conventional-changelog-jshint@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.4.tgz#b2de33cd0870d9af804ac6a4fded0ee25b69c9bb" +conventional-changelog-jshint@^0.3.8: + version "0.3.8" + resolved "https://registry.yarnpkg.com/conventional-changelog-jshint/-/conventional-changelog-jshint-0.3.8.tgz#9051c1ac0767abaf62a31f74d2fe8790e8acc6c8" dependencies: compare-func "^1.3.1" q "^1.5.1" -conventional-changelog-preset-loader@^1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.6.tgz#b29af6332f9313857be36427623c9016bfeeaf33" +conventional-changelog-preset-loader@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/conventional-changelog-preset-loader/-/conventional-changelog-preset-loader-1.1.8.tgz#40bb0f142cd27d16839ec6c74ee8db418099b373" -conventional-changelog-writer@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.4.tgz#705b46a8b8277bd7fd79cad8032095b5d803864c" +conventional-changelog-writer@^3.0.9: + version "3.0.9" + resolved "https://registry.yarnpkg.com/conventional-changelog-writer/-/conventional-changelog-writer-3.0.9.tgz#4aecdfef33ff2a53bb0cf3b8071ce21f0e994634" dependencies: compare-func "^1.3.1" - conventional-commits-filter "^1.1.5" + conventional-commits-filter "^1.1.6" dateformat "^3.0.0" handlebars "^4.0.2" json-stringify-safe "^5.0.1" @@ -1351,31 +1235,31 @@ conventional-changelog-writer@^3.0.4: through2 "^2.0.0" conventional-changelog@^1.1.0: - version "1.1.18" - resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.18.tgz#ffe28798e4ddef5f6e2f74398e8248bcb233360b" + version "1.1.23" + resolved "https://registry.yarnpkg.com/conventional-changelog/-/conventional-changelog-1.1.23.tgz#4ac72af8b9ea9af260e97acf556c19d8b2da970e" dependencies: conventional-changelog-angular "^1.6.6" - conventional-changelog-atom "^0.2.4" - conventional-changelog-codemirror "^0.3.4" - conventional-changelog-core "^2.0.5" - conventional-changelog-ember "^0.3.6" - conventional-changelog-eslint "^1.0.5" - conventional-changelog-express "^0.3.4" + conventional-changelog-atom "^0.2.8" + conventional-changelog-codemirror "^0.3.8" + conventional-changelog-core "^2.0.10" + conventional-changelog-ember "^0.3.11" + conventional-changelog-eslint "^1.0.9" + conventional-changelog-express "^0.3.6" conventional-changelog-jquery "^0.1.0" conventional-changelog-jscs "^0.1.0" - conventional-changelog-jshint "^0.3.4" - conventional-changelog-preset-loader "^1.1.6" + conventional-changelog-jshint "^0.3.8" + conventional-changelog-preset-loader "^1.1.8" -conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.5: - version "1.1.5" - resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.5.tgz#77aac065e3de9c1a74b801e8e25c9affb3184f65" +conventional-commits-filter@^1.1.1, conventional-commits-filter@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/conventional-commits-filter/-/conventional-commits-filter-1.1.6.tgz#4389cd8e58fe89750c0b5fb58f1d7f0cc8ad3831" dependencies: is-subset "^0.1.1" modify-values "^1.0.0" -conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.5: - version "2.1.5" - resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.5.tgz#9ac3a4ab221c0c3c9e9dd2c09ae01e6d1e1dabe0" +conventional-commits-parser@^2.1.1, conventional-commits-parser@^2.1.7: + version "2.1.7" + resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-2.1.7.tgz#eca45ed6140d72ba9722ee4132674d639e644e8e" dependencies: JSONStream "^1.0.4" is-text-path "^1.0.0" @@ -1414,8 +1298,8 @@ cookie@0.3.1: resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb" core-js@^2.2.0: - version "2.5.3" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e" + version "2.5.4" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0" core-js@~2.3.0: version "2.3.0" @@ -1628,7 +1512,7 @@ depd@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.1.tgz#5783b4e1c459f06fa5ca27f991f3d06e7a310359" -depd@~1.1.1: +depd@~1.1.1, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" @@ -1697,8 +1581,8 @@ domain-browser@~1.1.0: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" domino@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.1.tgz#9e1d63215d0fe8dcb8202bff07effa1a216db504" + version "2.0.2" + resolved "https://registry.yarnpkg.com/domino/-/domino-2.0.2.tgz#fa2da6ace8381cf64089079470ee33c53901010f" dot-prop@^3.0.0: version "3.0.0" @@ -1745,7 +1629,7 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -encodeurl@~1.0.1: +encodeurl@~1.0.1, encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -1931,10 +1815,10 @@ expand-range@^1.8.1: fill-range "^2.1.0" express@^4.15.2: - version "4.16.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.16.2.tgz#e35c6dfe2d64b7dca0a5cd4f21781be3299e076c" + version "4.16.3" + resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53" dependencies: - accepts "~1.3.4" + accepts "~1.3.5" array-flatten "1.1.1" body-parser "1.18.2" content-disposition "0.5.2" @@ -1942,26 +1826,26 @@ express@^4.15.2: cookie "0.3.1" cookie-signature "1.0.6" debug "2.6.9" - depd "~1.1.1" - encodeurl "~1.0.1" + depd "~1.1.2" + encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" - finalhandler "1.1.0" + finalhandler "1.1.1" fresh "0.5.2" merge-descriptors "1.0.1" methods "~1.1.2" on-finished "~2.3.0" parseurl "~1.3.2" path-to-regexp "0.1.7" - proxy-addr "~2.0.2" + proxy-addr "~2.0.3" qs "6.5.1" range-parser "~1.2.0" safe-buffer "5.1.1" - send "0.16.1" - serve-static "1.13.1" + send "0.16.2" + serve-static "1.13.2" setprototypeof "1.1.0" - statuses "~1.3.1" - type-is "~1.6.15" + statuses "~1.4.0" + type-is "~1.6.16" utils-merge "1.0.1" vary "~1.1.2" @@ -2038,6 +1922,18 @@ finalhandler@1.1.0: statuses "~1.3.1" unpipe "~1.0.0" +finalhandler@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105" + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.2" + statuses "~1.4.0" + unpipe "~1.0.0" + find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -2218,9 +2114,9 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -git-raw-commits@^1.3.0, git-raw-commits@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.4.tgz#442c3df5985b4f5689e9e43597f5194736aac001" +git-raw-commits@^1.3.0, git-raw-commits@^1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-1.3.6.tgz#27c35a32a67777c1ecd412a239a6c19d71b95aff" dependencies: dargs "^4.0.1" lodash.template "^4.0.2" @@ -2235,9 +2131,9 @@ git-remote-origin-url@^2.0.0: gitconfiglocal "^1.0.0" pify "^2.3.0" -git-semver-tags@^1.3.0, git-semver-tags@^1.3.4: - version "1.3.4" - resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.4.tgz#2ceb2a355c6d7514c123c35e297067d08caf3a92" +git-semver-tags@^1.3.0, git-semver-tags@^1.3.6: + version "1.3.6" + resolved "https://registry.yarnpkg.com/git-semver-tags/-/git-semver-tags-1.3.6.tgz#357ea01f7280794fe0927f2806bee6414d2caba5" dependencies: meow "^4.0.0" semver "^5.5.0" @@ -2478,7 +2374,7 @@ htmlescape@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351" -http-errors@1.6.2, http-errors@~1.6.2: +http-errors@1.6.2: version "1.6.2" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736" dependencies: @@ -2487,6 +2383,15 @@ http-errors@1.6.2, http-errors@~1.6.2: setprototypeof "1.0.3" statuses ">= 1.3.1 < 2" +http-errors@~1.6.2: + version "1.6.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.0" + statuses ">= 1.4.0 < 2" + http-proxy-agent@1: version "1.0.0" resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz#cc1ce38e453bf984a0f7702d2dd59c73d081284a" @@ -2550,8 +2455,8 @@ iconv-lite@0.4.19: resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" ieee754@^1.1.4: - version "1.1.8" - resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" + version "1.1.11" + resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455" immediate@~3.0.5: version "3.0.6" @@ -2605,12 +2510,12 @@ inline-source-map@~0.6.0: source-map "~0.5.3" insert-module-globals@^7.0.0: - version "7.0.2" - resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.2.tgz#012c56baa7d3307a8b417d4ec5270cf9741c18f4" + version "7.0.5" + resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.5.tgz#6d0a6f28d4a7e0eae171ad305e0f47bdfe0c258e" dependencies: JSONStream "^1.0.3" - combine-source-map "~0.7.1" - concat-stream "~1.5.1" + combine-source-map "^0.8.0" + concat-stream "^1.6.1" is-buffer "^1.1.0" lexical-scope "^1.2.0" process "~0.11.0" @@ -2748,8 +2653,8 @@ is-path-cwd@^1.0.0: resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" is-path-in-cwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz#6477582b8214d602346094567003be8a9eac04dc" + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz#5ac48b345ef675339bd6c7a48a912110b241cf52" dependencies: is-path-inside "^1.0.0" @@ -2797,7 +2702,7 @@ is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" -isarray@0.0.1, isarray@~0.0.1: +isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -2809,6 +2714,10 @@ isarray@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e" +isarray@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz#38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7" + isbinaryfile@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621" @@ -2913,8 +2822,8 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" json-parse-better-errors@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a" + version "1.0.2" + resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" json-schema-traverse@^0.3.0: version "0.3.1" @@ -3099,11 +3008,11 @@ kind-of@^4.0.0: is-buffer "^1.1.5" labeled-stream-splicer@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz#a52e1d138024c00b86b1c0c91f677918b8ae0a59" + version "2.0.1" + resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz#9cffa32fd99e1612fd1d86a8db962416d5292926" dependencies: inherits "^2.0.1" - isarray "~0.0.1" + isarray "^2.0.4" stream-splicer "^2.0.0" lazy-cache@^1.0.3: @@ -3277,10 +3186,10 @@ lru-cache@~2.6.5: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.6.5.tgz#e56d6354148ede8d7707b58d143220fd08df0fd5" magic-string@^0.22.4: - version "0.22.4" - resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.4.tgz#31039b4e40366395618c1d6cf8193c53917475ff" + version "0.22.5" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e" dependencies: - vlq "^0.2.1" + vlq "^0.2.2" mailcomposer@4.0.1: version "4.0.1" @@ -3463,8 +3372,8 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.1: minimist "0.0.8" modify-values@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.0.tgz#e2b6cdeb9ce19f99317a53722f3dbf5df5eaaab2" + version "1.0.1" + resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022" module-deps@^4.0.8: version "4.1.1" @@ -3495,8 +3404,8 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" nan@^2.3.0: - version "2.9.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.9.2.tgz#f564d75f5f8f36a6d9456cca7a6c4fe488ab7866" + version "2.10.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" negotiator@0.6.1: version "0.6.1" @@ -4016,7 +3925,7 @@ protractor@^5.2.0: webdriver-js-extender "^1.0.0" webdriver-manager "^12.0.6" -proxy-addr@~2.0.2: +proxy-addr@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341" dependencies: @@ -4132,8 +4041,8 @@ raw-body@2, raw-body@2.3.2: unpipe "1.0.0" rc@^1.1.7: - version "1.2.5" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.5.tgz#275cd687f6e3b36cc756baa26dfee80a790301fd" + version "1.2.6" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092" dependencies: deep-extend "~0.4.0" ini "~1.3.0" @@ -4312,10 +4221,10 @@ repeating@^2.0.0: is-finite "^1.0.0" replace-in-file@^3.1.1: - version "3.2.0" - resolved "https://registry.yarnpkg.com/replace-in-file/-/replace-in-file-3.2.0.tgz#c28836ca936af2d56193f671a6c4f6c51fdb6eb1" + version "3.4.0" + resolved "https://registry.yarnpkg.com/replace-in-file/-/replace-in-file-3.4.0.tgz#b48c94567bbf4f44a2bc6fabdf21ab443e806851" dependencies: - chalk "^2.3.0" + chalk "^2.3.2" glob "^7.1.2" yargs "^11.0.0" @@ -4373,8 +4282,8 @@ request@2.81.0: uuid "^3.0.0" request@^2.0.0, request@^2.74.0, request@^2.78.0: - version "2.83.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.83.0.tgz#ca0b65da02ed62935887808e6f510381034e3356" + version "2.85.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" dependencies: aws-sign2 "~0.7.0" aws4 "^1.6.0" @@ -4429,8 +4338,8 @@ resolve@1.1.7, resolve@1.1.x: resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.3.2, resolve@^1.4.0: - version "1.5.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" + version "1.6.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" dependencies: path-parse "^1.0.5" @@ -4470,8 +4379,8 @@ rollup-plugin-commonjs@^8.2.6: rollup-pluginutils "^2.0.1" rollup-plugin-node-resolve@^3.0.2: - version "3.2.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.2.0.tgz#31534952f3ab21f9473c1d092be7ed43937ea4d4" + version "3.3.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.3.0.tgz#c26d110a36812cbefa7ce117cadcd3439aa1c713" dependencies: builtin-modules "^2.0.0" is-module "^1.0.0" @@ -4501,21 +4410,9 @@ rollup@^0.56.5: version "0.56.5" resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.56.5.tgz#40fe3cf0cd1659d469baad11f4d5b6336c14ce84" -<<<<<<< HEAD -rxjs@^6.0.0-rc.0: - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-rc.0.tgz#3fed5454dfaf5a01005c973de857f860826d3eac" -======= -<<<<<<< HEAD rxjs@^6.0.0-rc.0: - version "6.0.0-rc.0" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-rc.0.tgz#3fed5454dfaf5a01005c973de857f860826d3eac" -======= -rxjs@^6.0.0-beta.0: - version "6.0.0-beta.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-beta.1.tgz#ac6b181251ece21051435c3da2538444b43a37c1" ->>>>>>> 5973e7b... build: add secondary entrypoints for tokens ->>>>>>> chore: upgrade to v6 + version "6.0.0-smoosh.2" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.0.0-smoosh.2.tgz#2fbec8bce211ac6cdb21e630f17df2358562b6cc" dependencies: tslib "^1.9.0" @@ -4573,14 +4470,14 @@ semver@~5.0.1: version "5.0.3" resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a" -send@0.16.1: - version "0.16.1" - resolved "https://registry.yarnpkg.com/send/-/send-0.16.1.tgz#a70e1ca21d1382c11d0d9f6231deb281080d7ab3" +send@0.16.2: + version "0.16.2" + resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1" dependencies: debug "2.6.9" - depd "~1.1.1" + depd "~1.1.2" destroy "~1.0.4" - encodeurl "~1.0.1" + encodeurl "~1.0.2" escape-html "~1.0.3" etag "~1.8.1" fresh "0.5.2" @@ -4589,16 +4486,16 @@ send@0.16.1: ms "2.0.0" on-finished "~2.3.0" range-parser "~1.2.0" - statuses "~1.3.1" + statuses "~1.4.0" -serve-static@1.13.1: - version "1.13.1" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.1.tgz#4c57d53404a761d8f2e7c1e8a18a47dbf278a719" +serve-static@1.13.2: + version "1.13.2" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1" dependencies: - encodeurl "~1.0.1" + encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.2" - send "0.16.1" + send "0.16.2" set-blocking@^2.0.0, set-blocking@~2.0.0: version "2.0.0" @@ -4621,8 +4518,8 @@ setprototypeof@1.1.0: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4: - version "2.4.10" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.10.tgz#b1fde5cd7d11a5626638a07c604ab909cfa31f9b" + version "2.4.11" + resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" dependencies: inherits "^2.0.1" safe-buffer "^5.0.1" @@ -4794,8 +4691,8 @@ source-map-support@^0.4.0, source-map-support@~0.4.0: source-map "^0.5.6" source-map-support@^0.5.0: - version "0.5.3" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.3.tgz#2b3d5fff298cfa4d1afd7d4352d569e9a0158e76" + version "0.5.4" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.4.tgz#54456efa89caa9270af7cd624cc2f123e51fbae8" dependencies: source-map "^0.6.0" @@ -4866,8 +4763,8 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" sshpk@^1.7.0: - version "1.13.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3" + version "1.14.1" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" @@ -4903,14 +4800,18 @@ statehood@^5.0.3: items "2.x.x" joi "10.x.x" -"statuses@>= 1.3.1 < 2": - version "1.4.0" - resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" +"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2": + version "1.5.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" statuses@~1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e" +statuses@~1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" + stream-browserify@^2.0.0, stream-browserify@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db" @@ -4926,8 +4827,8 @@ stream-combiner2@^1.1.1: readable-stream "^2.0.2" stream-http@^2.0.0, stream-http@^2.7.2: - version "2.8.0" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.0.tgz#fd86546dac9b1c91aff8fc5d287b98fafb41bc10" + version "2.8.1" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" @@ -4976,8 +4877,8 @@ string-width@^2.0.0, string-width@^2.1.1: strip-ansi "^4.0.0" string_decoder@^1.0.3: - version "1.1.0" - resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403" + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" dependencies: safe-buffer "~5.1.0" @@ -5261,8 +5162,8 @@ tsscmp@~1.0.0: resolved "https://registry.yarnpkg.com/tsscmp/-/tsscmp-1.0.5.tgz#7dc4a33af71581ab4337da91d85ca5427ebd9a97" tsutils@^2.12.1, tsutils@^2.21.2: - version "2.22.2" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.22.2.tgz#0b9f3d87aa3eb95bd32d26ce2b88aa329a657951" + version "2.25.1" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.25.1.tgz#24a46342ab8b174a3fbde632e60dcd11b64982f9" dependencies: tslib "^1.8.1" @@ -5294,7 +5195,7 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-is@~1.6.15: +type-is@~1.6.15, type-is@~1.6.16: version "1.6.16" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194" dependencies: @@ -5319,10 +5220,10 @@ uglify-js@^2.6, uglify-js@^2.8.14: uglify-to-browserify "~1.0.0" uglify-js@^3.0.9: - version "3.3.13" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.13.tgz#8a1a89eeb16e2d6a66b0db2b04cb871af3c669cf" + version "3.3.17" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.17.tgz#f32a66b191fe18a5b6b4b66b75c0a195f7811f9e" dependencies: - commander "~2.14.1" + commander "~2.15.0" source-map "~0.6.1" uglify-to-browserify@~1.0.0: @@ -5342,8 +5243,8 @@ ultron@~1.1.0: resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.1.1.tgz#9fe1536a10a664a65266a1e3ccf85fd36302bc9c" umd@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.1.tgz#8ae556e11011f63c2596708a8837259f01b3d60e" + version "3.0.3" + resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf" underscore@~1.7.0: version "1.7.0" @@ -5428,7 +5329,7 @@ vise@2.x.x: dependencies: hoek "4.x.x" -vlq@^0.2.1: +vlq@^0.2.2: version "0.2.3" resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" @@ -5663,5 +5564,5 @@ yn@^2.0.0: resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a" zone.js@^0.8.12: - version "0.8.20" - resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.20.tgz#a218c48db09464b19ff6fc8f0d4bb5b1046e185d" + version "0.8.23" + resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.23.tgz#7ab0bc9bedb4b9197864563841b4b478dd9bfce7" From bb179bae3a425eaf0b67801d10e6d4ac30f0485b Mon Sep 17 00:00:00 2001 From: Fabian Wiles Date: Thu, 5 Apr 2018 06:03:17 +1200 Subject: [PATCH 3/5] build: add tslib to globals --- tools/defaults.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 383da0060..517e63e7b 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -38,6 +38,7 @@ GLOBALS = { "@nguniversal/aspnetcore-engine/tokens": "nguniversal.aspnetcoreEngine.tokens", "@nguniversal/express-engine/tokens": "nguniversal.expressEngine.tokens", "@nguniversal/hapi-engine/tokens": "nguniversal.hapiEngine.tokens", + 'tslib': 'tslib', "rxjs": "Rx", "rxjs/operators": "Rx.operators", "fs": "fs", From 6f23c5101793264f28ca9e20ef4c52f7cf871953 Mon Sep 17 00:00:00 2001 From: Fabian Wiles Date: Thu, 5 Apr 2018 08:42:06 +1200 Subject: [PATCH 4/5] build: add TODO for macros --- tools/defaults.bzl | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 517e63e7b..f3fd50c52 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -46,6 +46,7 @@ GLOBALS = { "hapi": "hapi" } +// TODO: when a better api for defaults is avilable use that isntead of these macros def ts_test_library(node_modules=None, **kwargs): ts_library(testonly=1, **kwargs) From c7ac93cead4710aa4be90c7f148de68da30e4ae6 Mon Sep 17 00:00:00 2001 From: Fabian Wiles Date: Thu, 5 Apr 2018 08:49:18 +1200 Subject: [PATCH 5/5] build: fix note about default macros --- tools/defaults.bzl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index f3fd50c52..e176c3589 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -46,7 +46,7 @@ GLOBALS = { "hapi": "hapi" } -// TODO: when a better api for defaults is avilable use that isntead of these macros +# TODO: when a better api for defaults is avilable use that isntead of these macros def ts_test_library(node_modules=None, **kwargs): ts_library(testonly=1, **kwargs)