Skip to content

Commit

Permalink
Fix broken peer deps
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelbromley committed Feb 3, 2017
1 parent d7aa506 commit 39d5c22
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 1 addition & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,14 @@
"@angular/platform-browser": "2.4.3",
"@angular/platform-browser-dynamic": "2.4.3",
"@angular/platform-server": "2.4.3",
"@ngtools/webpack": "1.1.0",
"angular2-template-loader": "^0.6.0",
"coffee-loader": "^0.7.2",
"copy-webpack-plugin": "^3.0.1",
"css-loader": "^0.23.1",
"electron": "^1.4.14",
"electron-builder": "7.3.0",
"electron-debug": "^1.0.1",
"electron-rebuild": "1.5.6",
"es6-shim": "^0.35.0",
"extract-text-webpack-plugin": "^1.0.1",
"file-loader": "^0.8.5",
"fourier-transform": "^1.0.1",
"hammerjs": "^2.0.8",
Expand All @@ -52,7 +49,7 @@
"node-sass": "^3.7.0",
"perfect-scrollbar": "^0.6.16",
"raw-loader": "^0.5.1",
"reflect-metadata": "0.1.3",
"reflect-metadata": "0.1.9",
"rimraf": "^2.5.2",
"rxjs": "5.0.3",
"sass-loader": "^3.2.0",
Expand Down
8 changes: 5 additions & 3 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
const path = require('path');
const webpack = require('webpack');
const ngtools = require('@ngtools/webpack');
const AotPlugin = require('@ngtools/webpack').AotPlugin;

// Removed for now since it was causing issues with unmet peer deps when ruuning npm install
// const ngtools = require('@ngtools/webpack');
// const AotPlugin = require('@ngtools/webpack').AotPlugin;

// Webpack Plugins
const HtmlWebpackPlugin = require('html-webpack-plugin');
Expand Down Expand Up @@ -74,7 +76,7 @@ module.exports = function (env) {
// Support for .ts files.
{
test: /\.ts$/,
loaders: aotMode ? ['@ngtools/webpack'] : ['ts-loader', 'angular2-template-loader']
loaders: /*aotMode ? ['@ngtools/webpack'] :*/ ['ts-loader', 'angular2-template-loader']
},

// copy those assets to output
Expand Down

0 comments on commit 39d5c22

Please sign in to comment.