Skip to content

Commit

Permalink
build: upgrade TS to 3.9 to ensure that no breaking changes get added (
Browse files Browse the repository at this point in the history
  • Loading branch information
arturovt authored Jun 22, 2020
1 parent f8d08d9 commit 07811af
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 58 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ $ npm install @ngxs/store@dev
- Fix: Router Plugin - Update state after route successfully activates [#1606](https://github.com/ngxs/store/pull/1606)
- Fix: HMR Plugin - Show error when use Angular Ivy with JIT mode [#1607](https://github.com/ngxs/store/pull/1607)
- Fix: Logger Plugin - Filter out only `undefined` payloads [#1617](https://github.com/ngxs/store/pull/1617)
- Build: Upgrade TS to 3.9.5 to ensure that no breaking changes get added [#1626](https://github.com/ngxs/store/pull/1626)
- Build: Compile using Angular 9 [#1596](https://github.com/ngxs/store/pull/1596)

## NGXS-Labs
Expand Down
9 changes: 8 additions & 1 deletion integration/main.server.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
export { AppServerModule } from './app/app.server.module';
import { enableProdMode } from '@angular/core';

import { environment } from './environments/environment';

if (environment.production) {
enableProdMode();
}

export { AppServerModule } from './app/app.server.module';
export { renderModule, renderModuleFactory } from '@angular/platform-server';
1 change: 0 additions & 1 deletion integration/server.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import 'zone.js/dist/zone-node';

import { APP_BASE_HREF } from '@angular/common';
import '@angular/localize/init';
import { ngExpressEngine } from '@nguniversal/express-engine';
import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
import * as express from 'express';
Expand Down
5 changes: 4 additions & 1 deletion integration/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,8 @@
"target": "es2015",
"types": ["node"]
},
"files": ["main.browser.ts", "polyfills.ts"]
"files": ["main.browser.ts", "polyfills.ts"],
"angularCompilerOptions": {
"disableTypeScriptVersionCheck": true
}
}
1 change: 1 addition & 0 deletions integration/tsconfig.server.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"files": ["main.server.ts", "server.ts"],
"exclude": ["cypress"],
"angularCompilerOptions": {
"disableTypeScriptVersionCheck": true,
"entryModule": "app/app.server.module#AppServerModule"
}
}
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,7 @@
"private": true,
"devDependencies": {
"@angular-builders/jest": "^9.0.1",
"@nguniversal/express-engine": "9.1.1",
"@angular-devkit/build-angular": "~0.901.7",
"@angular/localize": "9.1.9",
"@angular/animations": "9.1.9",
"@angular/cli": "9.1.7",
"@angular/common": "9.1.9",
Expand All @@ -129,6 +127,7 @@
"@commitlint/cli": "^8.3.5",
"@commitlint/config-conventional": "^8.3.4",
"@cypress/webpack-preprocessor": "^5.4.1",
"@nguniversal/express-engine": "9.1.1",
"@types/express": "^4.17.6",
"@types/jest": "^25.2.3",
"@types/node": "^12.6.2",
Expand Down Expand Up @@ -159,7 +158,7 @@
"tsickle": "^0.38.1",
"tslib": "^1.11.1",
"tslint": "^5.20.1",
"typescript": "~3.8.3",
"typescript": "^3.9.5",
"zone.js": "~0.10.3"
}
}
2 changes: 1 addition & 1 deletion packages/store/operators/tests/update-item.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ describe('update item', () => {
games: updateItem<Game>(
item => item!.name === 'CS:GO',
patch({
categories: updateItem(
categories: updateItem<Category>(
item => item!.name === 'shooter',
patch({ name: 'shooter' })
)
Expand Down
60 changes: 9 additions & 51 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,6 @@
resolved "https://registry.npmjs.org/@angular/language-service/-/language-service-9.1.9.tgz#332a7e54d5e553b92342b10703dc13aba474a28f"
integrity sha512-yT6HPpdAe2mD9HRoTCiWFog1MRJt+0j+CLbI/Ql7C6pH6vbjmfsJ55xMmQ7eS6trsnebpMWTUv1f2GRykv3ygw==

"@angular/[email protected]":
version "9.1.9"
resolved "https://registry.npmjs.org/@angular/localize/-/localize-9.1.9.tgz#0867a82abcdeb6b88cbd4d61e1410f3c63a66ddb"
integrity sha512-U/4axUr99GO3+dRuMIEyJ1FqXauT82x/w7GulWu05qk8ML8MaIQ58RcB/LTJJY1s1qfwdcsyzX2wZrZcwBLKlA==
dependencies:
"@babel/core" "7.8.3"
glob "7.1.2"
yargs "15.3.0"

"@angular/[email protected]":
version "9.1.9"
resolved "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-9.1.9.tgz#12f8b05d3c9ef0844df88f3833e29ea1e49ec5e0"
Expand Down Expand Up @@ -249,27 +240,6 @@
invariant "^2.2.4"
semver "^5.5.0"

"@babel/[email protected]":
version "7.8.3"
resolved "https://registry.npmjs.org/@babel/core/-/core-7.8.3.tgz#30b0ebb4dd1585de6923a0b4d179e0b9f5d82941"
integrity sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA==
dependencies:
"@babel/code-frame" "^7.8.3"
"@babel/generator" "^7.8.3"
"@babel/helpers" "^7.8.3"
"@babel/parser" "^7.8.3"
"@babel/template" "^7.8.3"
"@babel/traverse" "^7.8.3"
"@babel/types" "^7.8.3"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.1"
json5 "^2.1.0"
lodash "^4.17.13"
resolve "^1.3.2"
semver "^5.4.1"
source-map "^0.5.0"

"@babel/[email protected]":
version "7.9.0"
resolved "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e"
Expand Down Expand Up @@ -324,7 +294,7 @@
lodash "^4.17.13"
source-map "^0.5.0"

"@babel/generator@^7.8.3", "@babel/generator@^7.9.0", "@babel/generator@^7.9.6":
"@babel/generator@^7.9.0", "@babel/generator@^7.9.6":
version "7.9.6"
resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz#5408c82ac5de98cda0d77d8124e99fa1f2170a43"
integrity sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==
Expand Down Expand Up @@ -506,7 +476,7 @@
"@babel/traverse" "^7.8.3"
"@babel/types" "^7.8.3"

"@babel/helpers@^7.8.3", "@babel/helpers@^7.9.0", "@babel/helpers@^7.9.6":
"@babel/helpers@^7.9.0", "@babel/helpers@^7.9.6":
version "7.9.6"
resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz#092c774743471d0bb6c7de3ad465ab3d3486d580"
integrity sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==
Expand All @@ -524,7 +494,7 @@
chalk "^2.0.0"
js-tokens "^4.0.0"

"@babel/parser@^7.1.0", "@babel/parser@^7.8.3", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.6":
"@babel/parser@^7.1.0", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0", "@babel/parser@^7.9.6":
version "7.9.6"
resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz#3b1bbb30dabe600cd72db58720998376ff653bc7"
integrity sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==
Expand Down Expand Up @@ -5859,18 +5829,6 @@ glob2base@^0.0.12:
dependencies:
find-index "^0.1.1"

[email protected]:
version "7.1.2"
resolved "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
inherits "2"
minimatch "^3.0.4"
once "^1.3.0"
path-is-absolute "^1.0.0"

[email protected], glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
version "7.1.6"
resolved "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
Expand Down Expand Up @@ -7521,7 +7479,7 @@ json3@^3.3.2:
resolved "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81"
integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==

[email protected], json5@^2.1.0, json5@^2.1.2:
[email protected], json5@^2.1.2:
version "2.1.3"
resolved "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
Expand Down Expand Up @@ -12181,16 +12139,16 @@ [email protected]:
resolved "https://registry.npmjs.org/typescript/-/typescript-3.6.5.tgz#dae20114a7b4ff4bd642db9c8c699f2953e8bbdb"
integrity sha512-BEjlc0Z06ORZKbtcxGrIvvwYs5hAnuo6TKdNFL55frVDlB+na3z5bsLhFaIxmT+dPWgBIjMo6aNnTOgHHmHgiQ==

typescript@^3.9.5:
version "3.9.5"
resolved "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz#586f0dba300cde8be52dd1ac4f7e1009c1b13f36"
integrity sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==

typescript@next:
version "4.0.0-dev.20200526"
resolved "https://registry.npmjs.org/typescript/-/typescript-4.0.0-dev.20200526.tgz#6904449ecf49f7f3ce352400e8a9114976ec8745"
integrity sha512-fnDRbKxyBzUufLYMGymzpWoaACWT93Og+YN453XPH5vjzGaluP1EnSIBsW3yASX4McKv9Xt9leXGidrTG5XWxg==

typescript@~3.8.3:
version "3.8.3"
resolved "https://registry.npmjs.org/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061"
integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w==

unicode-canonical-property-names-ecmascript@^1.0.4:
version "1.0.4"
resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"
Expand Down

0 comments on commit 07811af

Please sign in to comment.