Skip to content

Commit

Permalink
chore: update to latest Angular Framework and CLI 8.x betas, TypeScri…
Browse files Browse the repository at this point in the history
…pt 3.3 (#1692)

Closes #1673
  • Loading branch information
brandonroberts authored Apr 6, 2019
1 parent c9c9a0e commit 00b550e
Show file tree
Hide file tree
Showing 21 changed files with 1,081 additions and 930 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ version: 2
# See https://blog.daemonl.com/2016/02/yaml.html
# To validate changes, use an online parser, eg.
# https://yaml-online-parser.appspot.com/
var_1: &cache_key yarn-cache-{{ checksum "yarn.lock" }}-0.9.1
var_1: &cache_key yarn-cache-{{ checksum "yarn.lock" }}-0.10.0
var_2: &run_in_node
docker:
- image: circleci/node:10.12
Expand Down
2 changes: 1 addition & 1 deletion modules/effects/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^7.0.0';
export const platformVersion = '^8.0.0-beta.0';
2 changes: 1 addition & 1 deletion modules/entity/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^7.0.0';
export const platformVersion = '^8.0.0-beta.0';
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^7.0.0';
export const platformVersion = '^8.0.0-beta.0';
2 changes: 1 addition & 1 deletion modules/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^7.0.0';
export const platformVersion = '^8.0.0-beta.0';
2 changes: 1 addition & 1 deletion modules/schematics/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^7.0.0';
export const platformVersion = '^8.0.0-beta.0';
1 change: 0 additions & 1 deletion modules/schematics/src/cli.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { Tree, VirtualTree } from '@angular-devkit/schematics';
import {
SchematicTestRunner,
UnitTestTree,
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^7.0.0';
export const platformVersion = '^8.0.0-beta.0';
2 changes: 1 addition & 1 deletion modules/store-devtools/spec/store.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ type Fixture<T> = {
};

function createStore<T>(
reducer: ActionReducer<T, Action>,
reducer: ActionReducer<T | undefined, Action>,
options: StoreDevtoolsOptions = {}
): Fixture<T> {
TestBed.configureTestingModule({
Expand Down
2 changes: 1 addition & 1 deletion modules/store/schematics-core/utility/libs-version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const platformVersion = '^7.0.0';
export const platformVersion = '^8.0.0-beta.0';
4 changes: 2 additions & 2 deletions modules/store/src/selector.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export function defaultMemoize(
}

if (!lastArguments) {
lastResult = projectionFn.apply(null, arguments);
lastResult = projectionFn.apply(null, arguments as any);
lastArguments = arguments;
return lastResult;
}
Expand All @@ -87,7 +87,7 @@ export function defaultMemoize(

lastArguments = arguments;

const newResult = projectionFn.apply(null, arguments);
const newResult = projectionFn.apply(null, arguments as any);
if (isResultEqual(lastResult, newResult)) {
return lastResult;
}
Expand Down
5 changes: 4 additions & 1 deletion modules/store/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,10 @@ export function createReducerFactory<T, V extends Action = Action>(
metaReducers?: MetaReducer<T, V>[]
): ActionReducerFactory<T, V> {
if (Array.isArray(metaReducers) && metaReducers.length > 0) {
reducerFactory = compose.apply(null, [...metaReducers, reducerFactory]);
(reducerFactory as any) = compose.apply(null, [
...metaReducers,
reducerFactory,
]);
}

return (reducers: ActionReducerMap<T, V>, initialState?: InitialState<T>) => {
Expand Down
41 changes: 21 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngrx/platform",
"version": "7.4.0",
"version": "8.0.0-beta.0",
"description": "monorepo for ngrx development",
"scripts": {
"precommit": "lint-staged",
Expand Down Expand Up @@ -77,32 +77,33 @@
]
},
"dependencies": {
"@angular/animations": "^7.0.1",
"@angular/animations": "^8.0.0-beta.10",
"@angular/bazel": "^8.0.0-beta.10",
"@angular/cdk": "^7.0.1",
"@angular/cli": "^7.0.1",
"@angular/common": "^7.0.1",
"@angular/compiler": "^7.0.1",
"@angular/compiler-cli": "^7.0.1",
"@angular/core": "^7.0.1",
"@angular/forms": "^7.0.1",
"@angular/http": "^7.0.1",
"@angular/material": "^7.0.1",
"@angular/platform-browser": "^7.0.1",
"@angular/platform-browser-dynamic": "^7.0.1",
"@angular/platform-server": "^7.0.1",
"@angular/router": "^7.0.1",
"@angular/cdk": "^7.3.0",
"@angular/cli": "^8.0.0-beta.10",
"@angular/common": "^8.0.0-beta.10",
"@angular/compiler": "^8.0.0-beta.10",
"@angular/compiler-cli": "^8.0.0-beta.10",
"@angular/core": "^8.0.0-beta.10",
"@angular/forms": "^8.0.0-beta.10",
"@angular/http": "^8.0.0-beta.10",
"@angular/material": "^7.3.0",
"@angular/platform-browser": "^8.0.0-beta.10",
"@angular/platform-browser-dynamic": "^8.0.0-beta.10",
"@angular/platform-server": "^8.0.0-beta.10",
"@angular/router": "^8.0.0-beta.10",
"@applitools/eyes-cypress": "^3.4.12",
"@bazel/buildifier": "^0.22.0",
"core-js": "^2.5.4",
"hammerjs": "^2.0.8",
"opencollective": "^1.0.3",
"rxjs": "^6.3.3",
"zone.js": "^0.8.26"
"rxjs": "^6.4.0",
"zone.js": "^0.9.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.10.0",
"@angular-devkit/build-angular": "~0.800.0-beta.7",
"@bazel/bazel": "^0.24.0",
"@bazel/ibazel": "^0.10.0",
"@bazel/typescript": "^0.27.8",
"@cypress/webpack-preprocessor": "^4.0.3",
"@octokit/rest": "^15.17.0",
Expand Down Expand Up @@ -160,10 +161,10 @@
"ts-snippet": "^4.1.0",
"tsconfig-paths": "^3.1.3",
"tsickle": "^0.34.3",
"tslib": "^1.7.1",
"tslib": "^1.9.0",
"tslint": "^5.7.0",
"tsutils": "2.20.0",
"typescript": "~3.1.1",
"typescript": "~3.3.4000",
"uglify-js": "^3.1.9"
},
"collective": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ exports[`Logout Confirmation Dialog should compile 1`] = `
class="mat-dialog-actions"
>
<button
aria-label="Close dialog"
class="mat-button"
mat-button=""
ng-reflect-dialog-result="false"
Expand All @@ -39,7 +38,6 @@ exports[`Logout Confirmation Dialog should compile 1`] = `
/>
</button>
<button
aria-label="Close dialog"
class="mat-button"
mat-button=""
ng-reflect-dialog-result="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ exports[`Login Page should compile 1`] = `
>
<p>
<mat-form-field
class="mat-form-field ng-tns-c1-0 mat-primary mat-form-field-type-mat-input mat-form-field-appearance-legacy mat-form-field-can-float mat-form-field-should-float mat-form-field-hide-placeholder ng-untouched ng-pristine ng-valid _mat-animation-noopable"
class="mat-form-field ng-tns-c1-0 mat-primary mat-form-field-type-mat-input mat-form-field-appearance-legacy mat-form-field-can-float mat-form-field-should-float mat-form-field-has-label mat-form-field-hide-placeholder ng-untouched ng-pristine ng-valid _mat-animation-noopable"
>
<div
class="mat-form-field-wrapper"
Expand Down Expand Up @@ -104,7 +104,7 @@ exports[`Login Page should compile 1`] = `
</p>
<p>
<mat-form-field
class="mat-form-field ng-tns-c1-1 mat-primary mat-form-field-type-mat-input mat-form-field-appearance-legacy mat-form-field-can-float mat-form-field-hide-placeholder ng-untouched ng-pristine ng-valid _mat-animation-noopable"
class="mat-form-field ng-tns-c1-1 mat-primary mat-form-field-type-mat-input mat-form-field-appearance-legacy mat-form-field-can-float mat-form-field-has-label mat-form-field-hide-placeholder ng-untouched ng-pristine ng-valid _mat-animation-noopable"
>
<div
class="mat-form-field-wrapper"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exports[`Find Book Page should compile 1`] = `
class="mat-card-content"
>
<mat-form-field
class="mat-form-field ng-tns-c1-0 mat-primary mat-form-field-type-mat-input mat-form-field-appearance-legacy mat-form-field-can-float mat-form-field-hide-placeholder _mat-animation-noopable"
class="mat-form-field ng-tns-c1-0 mat-primary mat-form-field-type-mat-input mat-form-field-appearance-legacy mat-form-field-can-float mat-form-field-has-label mat-form-field-hide-placeholder _mat-animation-noopable"
>
<div
class="mat-form-field-wrapper"
Expand Down
2 changes: 1 addition & 1 deletion projects/ngrx.io/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"copy-404-page": "node scripts/copy-404-page"
},
"engines": {
"node": ">=10.9.0 <11.2.0",
"node": ">=10.9.0 <11.12.0",
"npm": ">=5.3.0",
"yarn": ">=1.9.2 <2.0.0"
},
Expand Down
4 changes: 2 additions & 2 deletions tools/defaults.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ load("@npm_angular_bazel//:index.bzl", _ng_module = "ng_module", _ng_package = "
load("@npm_bazel_typescript//:defs.bzl", _ts_library = "ts_library")

DEFAULT_TSCONFIG = "//:tsconfig.json"
NG_VERSION = "^7.0.0"
RXJS_VERSION = "^6.0.0"
NG_VERSION = "^8.0.0-beta"
RXJS_VERSION = "^6.4.0"
NG_UPDATE_MIGRATIONS = "./migrations/migration.json"
MODULE_SCHEMATICS_COLLECTION = "./schematics/collection.json"

Expand Down
2 changes: 1 addition & 1 deletion tools/testing/bootstrap_node_tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const originalConfigureTestingModule = TestBed.configureTestingModule;
TestBed.configureTestingModule = function() {
TestBed.resetTestingModule();

return originalConfigureTestingModule.apply(null, arguments);
return originalConfigureTestingModule.apply(null, arguments as any);
};

TestBed.initTestEnvironment(ServerTestingModule, platformServerTesting());
1 change: 1 addition & 0 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"compilerOptions": {
"importHelpers": true,
"sourceMap": true,
"declaration": false,
"moduleResolution": "node",
Expand Down
Loading

0 comments on commit 00b550e

Please sign in to comment.