Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit

Permalink
build: update several dev dependencies (#1285)
Browse files Browse the repository at this point in the history 
With this change we update several development dependencies including;

- several `@bazel/` to `0.38.0`
- `typescript` to `3.6.4`
- `@types/node` to `12.11.1` which is required for TS 3.6 support
- `@angular/` packages to `9.0.0-next.11`
- `@angular-devkit/` packages to `9.0.0-next.10`
  • Loading branch information
@alan-agius4 @CaerusKaru
alan-agius4 authored and CaerusKaru committed Oct 20, 2019
1 parent 6d8d9cc commit 4b2f825
Show file tree
Hide file tree
Showing 15 changed files with 254 additions and 236 deletions.
6 changes: 3 additions & 3 deletions WORKSPACE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# Add NodeJS rules (explicitly used for sass bundle rules)
http_archive(
name = "build_bazel_rules_nodejs",
sha256 = "0d9660cf0894f1fe1e9840818553e0080fbce0851169812d77a70bdb9981c946",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.37.0/rules_nodejs-0.37.0.tar.gz"],
sha256 = "ad4be2c6f40f5af70c7edf294955f9d9a0222c8e2756109731b25f79ea2ccea0",
urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.38.3/rules_nodejs-0.38.3.tar.gz"],
)

# Setup the NodeJS toolchain
Expand Down Expand Up @@ -46,7 +46,7 @@ load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
install_bazel_dependencies()

# Setup TypeScript toolchain
load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
load("@npm_bazel_typescript//:index.bzl", "ts_setup_workspace")

ts_setup_workspace()

Expand Down
10 changes: 5 additions & 5 deletions integration/common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
"url": "https://github.com/angular/angular.git"
},
"dependencies": {
"@angular/animations": "^9.0.0-next.8",
"@angular/common": "^9.0.0-next.8",
"@angular/animations": "file:../../node_modules/@angular/animations",
"@angular/common": "file:../../node_modules/@angular/common",
"@angular/compiler": "file:../../node_modules/@angular/compiler",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@angular/core": "file:../../node_modules/@angular/core",
"@angular/platform-browser": "^9.0.0-next.8",
"@angular/platform-browser-dynamic": "^9.0.0-next.8",
"@angular/platform-server": "^9.0.0-next.8",
"@angular/platform-browser": "file:../../node_modules/@angular/platform-browser",
"@angular/platform-browser-dynamic": "file:../../node_modules/@angular/platform-browser-dynamic",
"@angular/platform-server": "file:../../node_modules/@angular/platform-server",
"@nguniversal/common": "file:../../dist/modules-dist/common",
"@nguniversal/express-engine": "file:../../dist/modules-dist/express-engine",
"express": "file:../../node_modules/express",
Expand Down
18 changes: 9 additions & 9 deletions integration/express-engine-ivy/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^9.0.0-next.8",
"@angular/common": "^9.0.0-next.8",
"@angular/animations": "file:../../node_modules/@angular/animations",
"@angular/common": "file:../../node_modules/@angular/common",
"@angular/compiler": "file:../../node_modules/@angular/compiler",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@angular/core": "file:../../node_modules/@angular/core",
"@angular/forms": "^9.0.0-next.8",
"@angular/platform-browser": "^9.0.0-next.8",
"@angular/platform-browser-dynamic": "^9.0.0-next.8",
"@angular/platform-server": "^9.0.0-next.8",
"@angular/router": "^9.0.0-next.8",
"@angular/platform-browser": "file:../../node_modules/@angular/platform-browser",
"@angular/platform-browser-dynamic": "file:../../node_modules/@angular/platform-browser-dynamic",
"@angular/platform-server": "file:../../node_modules/@angular/platform-server",
"@angular/router": "file:../../node_modules/@angular/router",
"@nguniversal/express-engine": "file:../../dist/modules-dist/express-engine",
"express": "file:../../node_modules/express",
"rxjs": "file:../../node_modules/rxjs",
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.900.0-next.4",
"@angular/cli": "9.0.0-next.4",
"@angular-devkit/build-angular": "^0.900.0-next.10",
"@angular/cli": "^9.0.0-next.10",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@types/express": "file:../../node_modules/@types/express",
"@types/node": "file:../../node_modules/@types/node",
Expand Down
18 changes: 9 additions & 9 deletions integration/express-engine-ve/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,23 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^9.0.0-next.8",
"@angular/common": "^9.0.0-next.8",
"@angular/animations": "file:../../node_modules/@angular/animations",
"@angular/common": "file:../../node_modules/@angular/common",
"@angular/compiler": "file:../../node_modules/@angular/compiler",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@angular/core": "file:../../node_modules/@angular/core",
"@angular/forms": "^9.0.0-next.8",
"@angular/platform-browser": "^9.0.0-next.8",
"@angular/platform-browser-dynamic": "^9.0.0-next.8",
"@angular/platform-server": "^9.0.0-next.8",
"@angular/router": "^9.0.0-next.8",
"@angular/platform-browser": "file:../../node_modules/@angular/platform-browser",
"@angular/platform-browser-dynamic": "file:../../node_modules/@angular/platform-browser-dynamic",
"@angular/platform-server": "file:../../node_modules/@angular/platform-server",
"@angular/router": "file:../../node_modules/@angular/router",
"@nguniversal/express-engine": "file:../../dist/modules-dist/express-engine",
"express": "file:../../node_modules/express",
"rxjs": "file:../../node_modules/rxjs",
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.900.0-next.4",
"@angular/cli": "9.0.0-next.4",
"@angular-devkit/build-angular": "^0.900.0-next.10",
"@angular/cli": "^9.0.0-next.10",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@types/express": "file:../../node_modules/@types/express",
"@types/node": "file:../../node_modules/@types/node",
Expand Down
18 changes: 9 additions & 9 deletions integration/hapi-engine-ivy/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^9.0.0-next.8",
"@angular/common": "^9.0.0-next.8",
"@angular/animations": "file:../../node_modules/@angular/animations",
"@angular/common": "file:../../node_modules/@angular/common",
"@angular/compiler": "file:../../node_modules/@angular/compiler",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@angular/core": "file:../../node_modules/@angular/core",
"@angular/forms": "^9.0.0-next.8",
"@angular/platform-browser": "^9.0.0-next.8",
"@angular/platform-browser-dynamic": "^9.0.0-next.8",
"@angular/platform-server": "^9.0.0-next.8",
"@angular/router": "^9.0.0-next.8",
"@angular/platform-browser": "file:../../node_modules/@angular/platform-browser",
"@angular/platform-browser-dynamic": "file:../../node_modules/@angular/platform-browser-dynamic",
"@angular/platform-server": "file:../../node_modules/@angular/platform-server",
"@angular/router": "file:../../node_modules/@angular/router",
"@nguniversal/hapi-engine": "file:../../dist/modules-dist/hapi-engine",
"hapi": "file:../../node_modules/hapi",
"inert": "5.1.0",
"rxjs": "file:../../node_modules/rxjs",
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.900.0-next.4",
"@angular/cli": "9.0.0-next.4",
"@angular-devkit/build-angular": "^0.900.0-next.10",
"@angular/cli": "^9.0.0-next.10",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@types/inert": "file:../../node_modules/@types/inert",
"@types/node": "file:../../node_modules/@types/node",
Expand Down
18 changes: 9 additions & 9 deletions integration/hapi-engine-ve/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^9.0.0-next.8",
"@angular/common": "^9.0.0-next.8",
"@angular/animations": "file:../../node_modules/@angular/animations",
"@angular/common": "file:../../node_modules/@angular/common",
"@angular/compiler": "file:../../node_modules/@angular/compiler",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@angular/core": "file:../../node_modules/@angular/core",
"@angular/forms": "^9.0.0-next.8",
"@angular/platform-browser": "^9.0.0-next.8",
"@angular/platform-browser-dynamic": "^9.0.0-next.8",
"@angular/platform-server": "^9.0.0-next.8",
"@angular/router": "^9.0.0-next.8",
"@angular/platform-browser": "file:../../node_modules/@angular/platform-browser",
"@angular/platform-browser-dynamic": "file:../../node_modules/@angular/platform-browser-dynamic",
"@angular/platform-server": "file:../../node_modules/@angular/platform-server",
"@angular/router": "file:../../node_modules/@angular/router",
"@nguniversal/hapi-engine": "file:../../dist/modules-dist/hapi-engine",
"hapi": "file:../../node_modules/hapi",
"inert": "5.1.0",
"rxjs": "file:../../node_modules/rxjs",
"zone.js": "file:../../node_modules/zone.js"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.900.0-next.4",
"@angular/cli": "9.0.0-next.4",
"@angular-devkit/build-angular": "^0.900.0-next.10",
"@angular/cli": "^9.0.0-next.10",
"@angular/compiler-cli": "file:../../node_modules/@angular/compiler-cli",
"@types/inert": "file:../../node_modules/@types/inert",
"@types/node": "file:../../node_modules/@types/node",
Expand Down
2 changes: 1 addition & 1 deletion modules/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@npm_bazel_typescript//:defs.bzl", "ts_config")
load("@npm_bazel_typescript//:index.bzl", "ts_config")

package(default_visibility = ["//visibility:public"])

Expand Down
5 changes: 3 additions & 2 deletions modules/aspnetcore-engine/src/file-loader.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@
import * as fs from 'fs';
import { ResourceLoader } from '@angular/compiler';

/** ResourceLoader implementation for loading files */
export class FileLoader implements ResourceLoader {
get(url: string): Promise<string> {
return new Promise((resolve, reject) => {
fs.readFile(url, (err: NodeJS.ErrnoException, buffer: Buffer) => {
fs.readFile(url, (err: NodeJS.ErrnoException | null, data: Buffer) => {
if (err) {
return reject(err);
}

resolve(buffer.toString());
resolve(data.toString());
});
});
}
Expand Down
2 changes: 1 addition & 1 deletion modules/builders/BUILD.bazel
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@npm_bazel_typescript//:defs.bzl", "ts_config")
load("@npm_bazel_typescript//:index.bzl", "ts_config")
load("//tools:defaults.bzl", "npm_package", "ts_library")

ts_config(
Expand Down
4 changes: 2 additions & 2 deletions modules/common/engine/src/file-loader.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import { ResourceLoader } from '@angular/compiler';
export class FileLoader implements ResourceLoader {
get(url: string): Promise<string> {
return new Promise((resolve, reject) => {
fs.readFile(url, (err: NodeJS.ErrnoException, buffer: Buffer) => {
fs.readFile(url, (err: NodeJS.ErrnoException | null, data: Buffer) => {
if (err) {
return reject(err);
}

resolve(buffer.toString());
resolve(data.toString());
});
});
}
Expand Down
5 changes: 3 additions & 2 deletions modules/express-engine/src/file-loader.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@
import * as fs from 'fs';
import { ResourceLoader } from '@angular/compiler';

/** ResourceLoader implementation for loading files */
export class FileLoader implements ResourceLoader {
get(url: string): Promise<string> {
return new Promise((resolve, reject) => {
fs.readFile(url, (err: NodeJS.ErrnoException, buffer: Buffer) => {
fs.readFile(url, (err: NodeJS.ErrnoException | null, data: Buffer) => {
if (err) {
return reject(err);
}

resolve(buffer.toString());
resolve(data.toString());
});
});
}
Expand Down
5 changes: 3 additions & 2 deletions modules/hapi-engine/src/file-loader.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@
import * as fs from 'fs';
import { ResourceLoader } from '@angular/compiler';

/** ResourceLoader implementation for loading files */
export class FileLoader implements ResourceLoader {
get(url: string): Promise<string> {
return new Promise((resolve, reject) => {
fs.readFile(url, (err: NodeJS.ErrnoException, buffer: Buffer) => {
fs.readFile(url, (err: NodeJS.ErrnoException | null, data: Buffer) => {
if (err) {
return reject(err);
}

resolve(buffer.toString());
resolve(data.toString());
});
});
}
Expand Down
51 changes: 25 additions & 26 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,53 +34,52 @@
"preinstall": "node ./tools/npm/check-npm.js",
"bazel": "bazel"
},
"dependencies": {
"@angular/animations": "^9.0.0-next.8",
"@angular/common": "^9.0.0-next.8",
"@angular/compiler": "^9.0.0-next.8",
"@angular/compiler-cli": "^9.0.0-next.8",
"@angular/core": "^9.0.0-next.8",
"@angular/platform-browser": "^9.0.0-next.8",
"@angular/platform-browser-dynamic": "^9.0.0-next.8",
"@angular/platform-server": "^9.0.0-next.8",
"rxjs": "^6.5.3",
"typescript": "~3.5.3"
},
"devDependencies": {
"@angular-devkit/architect": "^0.900.0-next.7",
"@angular-devkit/core": "^9.0.0-next.7",
"@angular-devkit/schematics": "^9.0.0-next.7",
"@angular/bazel": "^9.0.0-next.8",
"@angular-devkit/architect": "^0.900.0-next.10",
"@angular-devkit/core": "^9.0.0-next.10",
"@angular-devkit/schematics": "^9.0.0-next.10",
"@angular/animations": "^9.0.0-next.11",
"@angular/bazel": "9.0.0-next.11",
"@angular/common": "^9.0.0-next.11",
"@angular/compiler": "^9.0.0-next.11",
"@angular/compiler-cli": "^9.0.0-next.11",
"@angular/core": "^9.0.0-next.11",
"@angular/platform-browser": "^9.0.0-next.11",
"@angular/platform-browser-dynamic": "^9.0.0-next.11",
"@angular/platform-server": "^9.0.0-next.11",
"@angular/router": "^9.0.0-next.11",
"@bazel/bazel": "0.28.1",
"@bazel/buildifier": "^0.25.1",
"@bazel/hide-bazel-files": "^0.32.2",
"@bazel/hide-bazel-files": "^0.38.0",
"@bazel/ibazel": "^0.10.3",
"@bazel/jasmine": "^0.32.2",
"@bazel/karma": "^0.32.2",
"@bazel/typescript": "^0.32.2",
"@schematics/angular": "^9.0.0-next.7",
"@types/express": "^4.0.39",
"@bazel/jasmine": "^0.38.0",
"@bazel/karma": "^0.38.0",
"@bazel/typescript": "^0.38.0",
"@schematics/angular": "^9.0.0-next.10",
"@types/express": "^4.17.1",
"@types/fs-extra": "^4.0.5",
"@types/hapi": "^17.0.12",
"@types/inert": "^5.1.2",
"@types/jasmine": "^2.8.6",
"@types/node": "^9.4.6",
"@types/jasmine": "^3.4.4",
"@types/node": "^12.11.1",
"domino": "^2.1.2",
"express": "^4.15.2",
"hapi": "^17.5.1",
"jasmine-core": "^2.8.0",
"jasmine-core": "^2.11.0",
"karma": "^4.1.0",
"karma-chrome-launcher": "^2.2.0",
"karma-jasmine": "^2.0.1",
"karma-sourcemap-loader": "^0.3.7",
"karma-typescript": "^4.1.0",
"minimatch": "^3.0.4",
"protractor": "5.4.2",
"rxjs": "^6.5.3",
"source-map-support": "^0.5.9",
"ts-node": "8.4.1",
"tslib": "1.9.3",
"tslib": "~1.10.0",
"tslint": "^5.18.0",
"tsutils": "^2.21.2",
"typescript": "~3.6.4",
"xhr2": "^0.1.4",
"zone.js": "^0.10.2"
}
Expand Down
4 changes: 2 additions & 2 deletions tools/defaults.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ load("@npm_angular_bazel//:index.bzl", _ng_module = "ng_module", _ng_package = "
load("@build_bazel_rules_nodejs//:defs.bzl", _npm_package = "npm_package")
load("@npm_bazel_jasmine//:index.bzl", _jasmine_node_test = "jasmine_node_test")
load(
"@npm_bazel_typescript//:defs.bzl",
"@npm_bazel_typescript//:index.bzl",
_ts_library = "ts_library",
)
load("@npm_bazel_karma//:defs.bzl", _ts_web_test_suite = "ts_web_test_suite")
load("@npm_bazel_karma//:index.bzl", _ts_web_test_suite = "ts_web_test_suite")

DEFAULT_TSCONFIG_BUILD = "//modules:bazel-tsconfig-build.json"
DEFAULT_TSCONFIG_TEST = "//modules:bazel-tsconfig-test"
Expand Down
Loading

0 comments on commit 4b2f825

Please sign in to comment.