Skip to content
This repository has been archived by the owner on Dec 30, 2019. It is now read-only.

Commit

Permalink
Dep. updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DorianGrey
DorianGrey committed Jan 26, 2018
1 parent bd017bd commit a2324c4
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 95 deletions.
40 changes: 20 additions & 20 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@
]
},
"devDependencies": {
"@angular-devkit/build-optimizer": "^0.0.41",
"@angular/compiler-cli": "^5.2.1",
"@angular/platform-server": "^5.2.1",
"@angular-devkit/build-optimizer": "^0.0.42",
"@angular/compiler-cli": "^5.2.2",
"@angular/platform-server": "^5.2.2",
"@angularclass/hmr": "^2.1.3",
"@angularclass/hmr-loader": "^3.0.4",
"@ngrx/store-devtools": "^4.1.1",
"@ngtools/webpack": "^1.9.5",
"@types/jasmine": "^2.8.4",
"@types/lodash": "4.14.93",
"@ngrx/store-devtools": "^5.0.1",
"@ngtools/webpack": "^1.9.6",
"@types/jasmine": "^2.8.5",
"@types/lodash": "4.14.96",
"@types/lodash-es": "4.17.0",
"angular2-template-loader": "^0.6.2",
"autoprefixer": "7.2.5",
Expand Down Expand Up @@ -82,7 +82,7 @@
"karma-remap-istanbul": "^0.6.0",
"karma-sourcemap-loader": "0.3.7",
"karma-webpack": "2.0.9",
"lint-staged": "^6.0.1",
"lint-staged": "^6.1.0",
"lodash": "^4.17.4",
"ngrx-store-freeze": "^0.2.0",
"node-sass": "^4.7.2",
Expand All @@ -103,7 +103,7 @@
"stylelint-scss": "^2.1.0",
"stylelint-webpack-plugin": "^0.10.1",
"to-string-loader": "1.1.5",
"ts-loader": "^3.3.0",
"ts-loader": "^3.3.1",
"tslib": "^1.9.0",
"tslint": "^5.9.1",
"tslint-config-prettier": "^1.6.0",
Expand All @@ -116,19 +116,19 @@
"webpack-karma-die-hard": "^1.0.4",
"webpack-merge": "^4.1.1",
"workbox-webpack-plugin": "^2.1.2",
"yargs": "^10.1.1"
"yargs": "^11.0.0"
},
"dependencies": {
"@angular/common": "^5.2.1",
"@angular/compiler": "^5.2.1",
"@angular/core": "^5.2.1",
"@angular/forms": "^5.2.1",
"@angular/http": "^5.2.1",
"@angular/platform-browser": "^5.2.1",
"@angular/platform-browser-dynamic": "^5.2.1",
"@angular/router": "^5.2.1",
"@ngrx/router-store": "^4.1.1",
"@ngrx/store": "^4.1.1",
"@angular/common": "^5.2.2",
"@angular/compiler": "^5.2.2",
"@angular/core": "^5.2.2",
"@angular/forms": "^5.2.2",
"@angular/http": "^5.2.2",
"@angular/platform-browser": "^5.2.2",
"@angular/platform-browser-dynamic": "^5.2.2",
"@angular/router": "^5.2.2",
"@ngrx/router-store": "^5.0.1",
"@ngrx/store": "^5.0.0",
"@ngx-translate/core": "^9.1.1",
"angular-router-loader": "^0.8.2",
"core-js": "2.5.3",
Expand Down
30 changes: 19 additions & 11 deletions src/app/app.imports.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,22 @@ import { ServiceWorkerModule } from "./service-worker/service-worker.module";
ENV modes. Esp. for readability, these calculations got externalized.
*/

// We need to do some tricks here to be able to load the ngrx modules - where one is only referenced
// conditionally - in between the other modules, but always before the `SharedModule`.
// See this issue comment for details about the import order:
// https://github.com/ngrx/platform/issues/624#issuecomment-360147672
const ngrxImportModules = [
StoreModule.forRoot(reducers, { metaReducers }),
StoreRouterConnectingModule
];
/*
Note: We only consider this extension to be useful in development mode.
If you want to use in production as well, just remove the ENV-specific condition.
*/
if ("production" !== process.env.NODE_ENV) {
ngrxImportModules.push(StoreDevtoolsModule.instrument({ maxAge: 50 }));
}

const imports = [
BrowserModule, // Should only be imported by the root => every other module should import "CommonModule".
APP_ROUTES,
Expand All @@ -27,20 +43,12 @@ const imports = [
useFactory: createTranslateLoader
}
}),

...ngrxImportModules,
SharedModule.forRoot(),
InputTestModule,
TodosModule,
ServiceWorkerModule,
StoreModule.forRoot(reducers, { metaReducers }),
StoreRouterConnectingModule
ServiceWorkerModule
];

/*
Note: We only consider this extension to be useful in development mode.
If you want to use in production as well, just remove the ENV-specific condition.
*/
if ("production" !== process.env.NODE_ENV) {
imports.push(StoreDevtoolsModule.instrument({ maxAge: 50 }));
}

export const APP_IMPORTS = imports;
128 changes: 64 additions & 64 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,77 +2,77 @@
# yarn lockfile v1


"@angular-devkit/build-optimizer@^0.0.41":
version "0.0.41"
resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.41.tgz#29bd4a14a425f6946cc75c37a7aa42508d2fc1ac"
"@angular-devkit/build-optimizer@^0.0.42":
version "0.0.42"
resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.0.42.tgz#402b0dda4883db91e2381c3ddc55888408a7894e"
dependencies:
loader-utils "^1.1.0"
source-map "^0.5.6"
typescript "~2.6.2"
webpack-sources "^1.0.1"

"@angular/common@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.1.tgz#a6f2d349f6102e6be7cc488899578a0dc327b755"
"@angular/common@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.2.2.tgz#24f0f21dbc29a8b2dbfe93d19ec5a18defca9edf"
dependencies:
tslib "^1.7.1"

"@angular/compiler-cli@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.1.tgz#9ee3431d937767a4f4ae401f172b507b5db6456e"
"@angular/compiler-cli@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.2.2.tgz#0929463252adcf3f8094b1689cc5cbdcb6f8ceaa"
dependencies:
chokidar "^1.4.2"
minimist "^1.2.0"
reflect-metadata "^0.1.2"
tsickle "^0.26.0"

"@angular/compiler@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.1.tgz#758ed236c361cff018699e041fabbc4bcb7cdc72"
"@angular/compiler@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.2.2.tgz#cf6ef310c5ca2fdae9551af62d10ab24d4feb51a"
dependencies:
tslib "^1.7.1"

"@angular/core@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.1.tgz#47347e4098b0e997220d77652f4d9ca44dda8923"
"@angular/core@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.2.2.tgz#54950023b971d9e01f6f6fdbc30d2b68e4d05eb2"
dependencies:
tslib "^1.7.1"

"@angular/forms@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.1.tgz#530f1249bc71d9560297be642d55a5a6c439d920"
"@angular/forms@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.2.2.tgz#eca24f15d96de285cd0726601db4bffec39c01f3"
dependencies:
tslib "^1.7.1"

"@angular/http@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.1.tgz#dd847fb8aa0972b1906df5376307354b818ef4be"
"@angular/http@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.2.2.tgz#d33c128d5737f8d701bbac3e7e23d831deec3457"
dependencies:
tslib "^1.7.1"

"@angular/platform-browser-dynamic@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.1.tgz#df073c48f5b90e8c5d5b0774aa2bef49f288989c"
"@angular/platform-browser-dynamic@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.2.2.tgz#2ddd7fa28bb34ae9e181e6f286dfe4c96bde95a6"
dependencies:
tslib "^1.7.1"

"@angular/platform-browser@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.1.tgz#0d05a4ba107e7ad8241a862683c83193c26b3c5e"
"@angular/platform-browser@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.2.2.tgz#3eedcbbcc8c0e6c91eba7ed2b32de7c6679d9b62"
dependencies:
tslib "^1.7.1"

"@angular/platform-server@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.2.1.tgz#5230f0845d937eafa084015c28de90a594896de6"
"@angular/platform-server@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-5.2.2.tgz#a95be09afe7af846d394df63e574d4b10d53776d"
dependencies:
domino "^1.0.29"
tslib "^1.7.1"
xhr2 "^0.1.4"

"@angular/router@^5.2.1":
version "5.2.1"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.1.tgz#fbb3a2d644e854bca25d075e506d25f3c670f8d2"
"@angular/router@^5.2.2":
version "5.2.2"
resolved "https://registry.yarnpkg.com/@angular/router/-/router-5.2.2.tgz#b0ffd7121290e8c01f20862b4a2638ebcebc61cf"
dependencies:
tslib "^1.7.1"

Expand All @@ -86,21 +86,21 @@
version "2.1.3"
resolved "https://registry.yarnpkg.com/@angularclass/hmr/-/hmr-2.1.3.tgz#34e658ed3da37f23b0a200e2da5a89be92bb209f"

"@ngrx/router-store@^4.1.1":
version "4.1.1"
resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-4.1.1.tgz#17fac7c0f5ffddef8b75e9a74ed2cb09074f3bca"
"@ngrx/router-store@^5.0.1":
version "5.0.1"
resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-5.0.1.tgz#db872327bb958a2ebf296734c97de68672ec628a"

"@ngrx/store-devtools@^4.1.1":
version "4.1.1"
resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-4.1.1.tgz#20745c39c7560fdc05fa4f22638442a7ec7dd676"
"@ngrx/store-devtools@^5.0.1":
version "5.0.1"
resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-5.0.1.tgz#f1bf5c54d4b2a512afd970e8114057b44e0d3c16"

"@ngrx/store@^4.1.1":
version "4.1.1"
resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-4.1.1.tgz#680e34df2775e8852754ed777ffac95bd81b7de0"
"@ngrx/store@^5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-5.0.0.tgz#483a955ea99a63ee083675ce0596d505e5501747"

"@ngtools/webpack@^1.9.5":
version "1.9.5"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.9.5.tgz#10292e9237d1218fe16dee24423155500b2d2324"
"@ngtools/webpack@^1.9.6":
version "1.9.6"
resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-1.9.6.tgz#102c60ee4b8a84a26ddc1e2b334f327e91821a4d"
dependencies:
chalk "~2.2.0"
enhanced-resolve "^3.1.0"
Expand All @@ -115,9 +115,9 @@
version "9.1.1"
resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-9.1.1.tgz#ae103928836b8a9e069fd2e2e76fa2198cc7e628"

"@types/jasmine@^2.8.4":
version "2.8.4"
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.4.tgz#5528fb5e53f1b27594f81f18debb7eab8dc532cb"
"@types/jasmine@^2.8.5":
version "2.8.5"
resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.5.tgz#96e58872583fa80c7ea0dd29024b180d5e133678"

"@types/[email protected]":
version "4.17.0"
Expand All @@ -129,9 +129,9 @@
version "4.14.86"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.86.tgz#6788d3d75032c46322ff1c144c948cf8117c405b"

"@types/[email protected].93":
version "4.14.93"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.93.tgz#a6d2a1e1601a3c29196f38ef1990b68a9afa1e1c"
"@types/[email protected].96":
version "4.14.96"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.96.tgz#49a402bb6984af7dd9a48cea3781744a3774bff1"

"@types/node@*":
version "8.0.53"
Expand Down Expand Up @@ -4853,9 +4853,9 @@ [email protected]:
version "1.1.0"
resolved "https://registry.yarnpkg.com/libqp/-/libqp-1.1.0.tgz#f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8"

lint-staged@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.0.1.tgz#855f2993ab4a265430e2fd9828427e648d65e6b4"
lint-staged@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-6.1.0.tgz#28f600c10a6cbd249ceb003118a1552e53544a93"
dependencies:
app-root-path "^2.0.0"
chalk "^2.1.0"
Expand Down Expand Up @@ -8561,9 +8561,9 @@ trough@^1.0.0:
dependencies:
glob "^6.0.4"

ts-loader@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.3.0.tgz#3f393e10e5992009b2bffd7204dc28378b753557"
ts-loader@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-3.3.1.tgz#5d24b425876cfed094f8da95375c9fd1e598faec"
dependencies:
chalk "^2.3.0"
enhanced-resolve "^3.0.0"
Expand Down Expand Up @@ -9341,9 +9341,9 @@ yargs-parser@^7.0.0:
dependencies:
camelcase "^4.1.0"

yargs-parser@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
yargs-parser@^9.0.2:
version "9.0.2"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
dependencies:
camelcase "^4.1.0"

Expand All @@ -9365,9 +9365,9 @@ [email protected]:
y18n "^3.2.1"
yargs-parser "^4.2.0"

yargs@^10.1.1:
version "10.1.1"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.1.tgz#5fe1ea306985a099b33492001fa19a1e61efe285"
yargs@^11.0.0:
version "11.0.0"
resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b"
dependencies:
cliui "^4.0.0"
decamelize "^1.1.1"
Expand All @@ -9380,7 +9380,7 @@ yargs@^10.1.1:
string-width "^2.0.0"
which-module "^2.0.0"
y18n "^3.2.1"
yargs-parser "^8.1.0"
yargs-parser "^9.0.2"

yargs@^7.0.0:
version "7.1.0"
Expand Down

0 comments on commit a2324c4

Please sign in to comment.