diff --git a/config/webpack.common.js b/config/webpack.common.js index 863ad15d..bfea786f 100644 --- a/config/webpack.common.js +++ b/config/webpack.common.js @@ -77,11 +77,8 @@ module.exports = function (options) { */ extensions: ['', '.ts', '.js', '.css', '.scss', '.json'], - // Make sure root is src - root: helpers.root('src'), - - // remove other default values - modulesDirectories: ['node_modules'], + // An array of directory names to be resolved to the current directory + modules: [helpers.root('src'), 'node_modules'], }, diff --git a/package.json b/package.json index b7615bf1..be9df2c5 100644 --- a/package.json +++ b/package.json @@ -61,13 +61,13 @@ }, "devDependencies": { "angular2-template-loader": "^0.5.0", - "@types/core-js": "^0.9.28", "@types/electron": "^1.3.20", - "@types/hammerjs": "^2.0.28", + "@types/hammerjs": "^2.0.33", + "@types/jasmine": "^2.2.34", "@types/node": "^6.0.38", - "@types/source-map": "^0.1.26", + "@types/source-map": "^0.1.27", "@types/uglify-js": "^2.0.27", - "@types/webpack": "^1.12.29", + "@types/webpack": "^1.12.34", "@types/lodash": "0.0.28", "gh-pages": "^0.11.0", "parse5": "^1.3.2", @@ -77,14 +77,14 @@ "ts-helpers": "1.1.1", "ts-node": "^1.3.0", "typedoc": "^0.4.5", - "typescript": "2.0.0", + "typescript": "2.0.3", "awesome-typescript-loader": "^2.2.1", "tslint-loader": "^2.1.3", "url-loader": "^0.5.7", "style-loader": "^0.13.1", "raw-loader": "0.5.1", "source-map-loader": "^0.1.5", - "string-replace-loader": "github:gdi2290/string-replace-loader", + "string-replace-loader": "1.0.5", "imports-loader": "^0.6.5", "json-loader": "^0.5.4", "css-loader": "^0.25.0", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index d293c5a4..99c990bc 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -13,7 +13,7 @@ import { routing } from './app.routing'; // App is our top level component import { App } from './app.component'; -import { AppState, InteralStateType } from './app.service'; +import { AppState, InternalStateType } from './app.service'; import { GlobalState } from './global.state'; import { NgaModule } from './theme/nga.module'; import { PagesModule } from './pages/pages.module'; @@ -25,7 +25,7 @@ const APP_PROVIDERS = [ ]; type StoreType = { - state: InteralStateType, + state: InternalStateType, restoreInputValues: () => void, disposeOldHosts: () => void }; diff --git a/src/app/app.service.ts b/src/app/app.service.ts index e9bc98f7..6009e725 100644 --- a/src/app/app.service.ts +++ b/src/app/app.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; -export type InteralStateType = { +export type InternalStateType = { [key: string]: any }; @Injectable() export class AppState { - _state: InteralStateType = {}; + _state: InternalStateType = {}; constructor() { } @@ -34,7 +34,7 @@ export class AppState { } - private _clone(object: InteralStateType) { + private _clone(object: InternalStateType) { // simple object clone return JSON.parse(JSON.stringify(object)); } diff --git a/tsconfig.json b/tsconfig.json index 356939a7..4e96332b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,8 +10,8 @@ "noEmitHelpers": true, "strictNullChecks": false, "baseUrl": "./src", - "paths": [ - ], + "paths": { + }, "lib": [ "dom", "es6"