Skip to content

Commit

Permalink
chore(deps): Build against TypeScript 2.6 and Angular 5.2 (#841)
Browse files Browse the repository at this point in the history 
Closes #709
  • Loading branch information
@brandonroberts @MikeRyanDev
brandonroberts authored and MikeRyanDev committed Feb 19, 2018
1 parent 2befd4d commit 2e4bea2
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 38 deletions.
9 changes: 6 additions & 3 deletions modules/schematics/src/container/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,12 @@ export default function(options: FeatureOptions): Rule {
throw new SchematicsException(`sourceDir option is required.`);
}

const opts = ['state', 'stateInterface'].reduce((current, key) => {
return omit(current, key as any);
}, options);
const opts = ['state', 'stateInterface'].reduce(
(current: Partial<FeatureOptions>, key) => {
return omit(current, key as any);
},
options
);

const templateSource = apply(url('./files'), [
options.spec ? noop() : filter(path => !path.endsWith('__spec.ts')),
Expand Down
6 changes: 3 additions & 3 deletions modules/schematics/src/utility/ast-utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export function getDecoratorMetadata(
source,
ts.SyntaxKind.ImportDeclaration
)
.map((node: ts.ImportDeclaration) => _angularImportsFromNode(node, source))
.map(node => _angularImportsFromNode(node as ts.ImportDeclaration, source))
.reduce(
(
acc: { [name: string]: string },
Expand Down Expand Up @@ -271,7 +271,7 @@ function _addSymbolToNgModuleMetadata(
.filter(prop => prop.kind == ts.SyntaxKind.PropertyAssignment)
// Filter out every fields that's not "metadataField". Also handles string literals
// (but not expressions).
.filter((prop: ts.PropertyAssignment) => {
.filter((prop: any) => {
const name = prop.name;
switch (name.kind) {
case ts.SyntaxKind.Identifier:
Expand Down Expand Up @@ -361,7 +361,7 @@ function _addSymbolToNgModuleMetadata(
);

if (effectsModule && symbolName.includes('EffectsModule')) {
const effectsArgs = (effectsModule as ts.CallExpression).arguments.shift();
const effectsArgs = (effectsModule as any).arguments.shift();

if (
effectsArgs &&
Expand Down
2 changes: 1 addition & 1 deletion modules/schematics/src/utility/route-utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export function insertImport(

// no such import declaration exists
const useStrict = findNodes(rootNode, ts.SyntaxKind.StringLiteral).filter(
(n: ts.StringLiteral) => n.text === 'use strict'
n => n.getText() === 'use strict'
);
let fallbackPos = 0;
if (useStrict.length > 0) {
Expand Down
2 changes: 1 addition & 1 deletion modules/store/spec/edge.spec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ describe('ngRx Store', () => {
let todosNextCount = 0;
let todosCountNextCount = 0;

store.pipe(select('todos')).subscribe((todos: any[]) => {
store.pipe(select<TodoAppSchema, Todo[]>('todos')).subscribe(todos => {
todosNextCount++;
store.dispatch({ type: 'SET_COUNT', payload: todos.length });
});
Expand Down
28 changes: 14 additions & 14 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,26 +61,26 @@
]
},
"dependencies": {
"@angular/animations": "^5.0.0",
"@angular/animations": "^5.2.0",
"@angular/cli": "^1.5.0",
"@angular/common": "^5.0.0",
"@angular/compiler": "^5.0.0",
"@angular/compiler-cli": "^5.0.0",
"@angular/core": "^5.0.0",
"@angular/forms": "^5.0.0",
"@angular/http": "^5.0.0",
"@angular/material": "^5.0.0",
"@angular/platform-browser": "^5.0.0",
"@angular/platform-browser-dynamic": "^5.0.0",
"@angular/platform-server": "^5.0.0",
"@angular/router": "^5.0.0",
"@angular/common": "^5.2.0",
"@angular/compiler": "^5.2.0",
"@angular/compiler-cli": "^5.2.0",
"@angular/core": "^5.2.0",
"@angular/forms": "^5.2.0",
"@angular/http": "^5.2.0",
"@angular/material": "^5.2.0",
"@angular/platform-browser": "^5.2.0",
"@angular/platform-browser-dynamic": "^5.2.0",
"@angular/platform-server": "^5.2.0",
"@angular/router": "^5.2.0",
"@ngrx/db": "^2.1.0",
"@ngrx/effects": "^5.1.0",
"@ngrx/entity": "^5.1.0",
"@ngrx/router-store": "^5.0.1",
"@ngrx/store": "^5.1.0",
"@ngrx/store-devtools": "^5.1.0",
"@angular/cdk": "^5.0.0",
"@angular/cdk": "^5.2.0",
"core-js": "^2.4.1",
"hammerjs": "^2.0.8",
"ngrx-store-freeze": "^0.2.1",
Expand Down Expand Up @@ -138,7 +138,7 @@
"tslib": "1.6.0",
"tslint": "^5.0.0",
"tsutils": "2.20.0",
"typescript": "~2.4.0",
"typescript": "~2.6.0",
"uglify-js": "^3.1.9"
},

Expand Down
32 changes: 16 additions & 16 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
minimist "^1.2.0"
rxjs "^5.5.2"

"@angular/animations@^5.0.0":
"@angular/animations@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.2.5.tgz#3e72184321c4979305619c74902b8be92d76db70"
dependencies:
tslib "^1.7.1"

"@angular/cdk@^5.0.0":
"@angular/cdk@^5.2.0":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-5.2.1.tgz#11500502deeaf42f88f92ca7d78d9a7642b07761"
dependencies:
Expand Down Expand Up @@ -101,13 +101,13 @@
optionalDependencies:
node-sass "^4.3.0"

"@angular/common@^5.0.0":
"@angular/common@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.5.tgz#08dd636fa46077d047066b13a1aae494066f6c55"
dependencies:
tslib "^1.7.1"

"@angular/compiler-cli@^5.0.0":
"@angular/compiler-cli@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.5.tgz#b1988bb2c0a956e7fc163acf8c7d794a07a88d08"
dependencies:
Expand All @@ -116,57 +116,57 @@
reflect-metadata "^0.1.2"
tsickle "^0.26.0"

"@angular/compiler@^5.0.0":
"@angular/compiler@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.5.tgz#5e3b511906048a579fcd007aba72911472e5aa28"
dependencies:
tslib "^1.7.1"

"@angular/core@^5.0.0":
"@angular/core@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.5.tgz#24f9cd75c5b2728f2ddd1869777590ea7177bca9"
dependencies:
tslib "^1.7.1"

"@angular/forms@^5.0.0":
"@angular/forms@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.5.tgz#2ad7a420c6ef6cd87a34071c5319ec83f7ed56aa"
dependencies:
tslib "^1.7.1"

"@angular/http@^5.0.0":
"@angular/http@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.5.tgz#1208256e36f0e486d96d10a733fdc8424ffa16bf"
dependencies:
tslib "^1.7.1"

"@angular/material@^5.0.0":
"@angular/material@^5.2.0":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/material/-/material-5.2.1.tgz#c0433edf98904dc35ae15dfa93ede755418843dd"
dependencies:
tslib "^1.7.1"

"@angular/platform-browser-dynamic@^5.0.0":
"@angular/platform-browser-dynamic@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.5.tgz#b89df410bd953e2a6843325f9ac3c09a10eadaf0"
dependencies:
tslib "^1.7.1"

"@angular/platform-browser@^5.0.0":
"@angular/platform-browser@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.5.tgz#eae4af2b742fb901d84d6367cd99f9e88102151f"
dependencies:
tslib "^1.7.1"

"@angular/platform-server@^5.0.0":
"@angular/platform-server@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.2.5.tgz#2111bfd836a16c787a10f2099a0c26b6a3a02b05"
dependencies:
domino "^1.0.29"
tslib "^1.7.1"
xhr2 "^0.1.4"

"@angular/router@^5.0.0":
"@angular/router@^5.2.0":
version "5.2.5"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.5.tgz#f8f220d5fb85fc10d60fe606b0f2a64732265142"
dependencies:
Expand Down Expand Up @@ -7599,9 +7599,9 @@ typescript@^2.3.3:
version "2.6.1"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631"

typescript@~2.4.0:
version "2.4.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.2.tgz#f8395f85d459276067c988aa41837a8f82870844"
typescript@~2.6.0:
version "2.6.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4"

uglify-es@^3.1.3:
version "3.1.9"
Expand Down

0 comments on commit 2e4bea2

Please sign in to comment.