Skip to content

Commit

Permalink
chore: update angular version
Browse files Browse the repository at this point in the history
BREAKING CHANGE: minimal angular version was updated to 2.3.1.
Angular@^2.3.1 will have to be used as a peer dependency from now on.
  • Loading branch information
troy authored and pkozlowski-opensource committed Jan 25, 2017
1 parent dfec5d0 commit 43b8e2b
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 20 deletions.
7 changes: 6 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,12 @@ gulp.task(

gulp.task(
'build:demo', ['clean:demo', 'generate-docs', 'generate-plunks'],
shell.task(['MODE=build webpack --config webpack.demo.js --progress --profile --bail']));
shell.task(['webpack --config webpack.demo.js --progress --profile --bail'], {env: {MODE: 'build'}}));

gulp.task(
'demo-server:aot', ['generate-docs', 'generate-plunks'],
shell.task(
['webpack-dev-server --port 9090 --config webpack.demo.js --inline --progress'], {env: {MODE: 'build'}}));

gulp.task('demo-push', function() {
return gulp.src(PATHS.demoDist)
Expand Down
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@
},
"homepage": "https://github.com/ng-bootstrap/ng-bootstrap#readme",
"dependencies": {
"@angular/core": "2.0.0",
"@angular/common": "2.0.0",
"@angular/forms": "2.0.0"
"@angular/core": "2.3.1",
"@angular/common": "2.3.1",
"@angular/forms": "2.3.1"
},
"devDependencies": {
"@angular/compiler": "2.0.0",
"@angular/compiler-cli": "0.6.2",
"@angular/http": "2.0.0",
"@angular/platform-browser": "2.0.0",
"@angular/platform-browser-dynamic": "2.0.0",
"@angular/platform-server": "2.0.0",
"@angular/router": "3.0.0",
"@ngtools/webpack": "1.1.4",
"@angular/compiler": "2.3.1",
"@angular/compiler-cli": "2.3.1",
"@angular/http": "2.3.1",
"@angular/platform-browser": "2.3.1",
"@angular/platform-browser-dynamic": "2.3.1",
"@angular/platform-server": "2.3.1",
"@angular/router": "3.3.1",
"@ngtools/webpack": "1.2.4",
"@types/jasmine": "^2.5.37",
"@types/node": "^6.0.46",
"angular2-template-loader": "^0.6.0",
Expand Down Expand Up @@ -82,16 +82,16 @@
"reflect-metadata": "^0.1.8",
"remap-istanbul": "^0.7.0",
"run-sequence": "^1.2.2",
"rxjs": "5.0.0-beta.12",
"rxjs": "5.0.0-rc.4",
"sass-loader": "^4.0.2",
"style-loader": "^0.13.1",
"systemjs": "^0.19.40",
"ts-loader": "1.2.1",
"ts-loader": "2.0.0",
"tslint": "^3.15.1",
"typescript": "2.0.10",
"url-loader": "^0.5.7",
"webpack": "2.1.0-beta.27",
"webpack-dev-server": "2.1.0-beta.11",
"zone.js": "^0.6.23"
"webpack": "2.2.0",
"webpack-dev-server": "2.2.0",
"zone.js": "^0.7.2"
}
}
5 changes: 2 additions & 3 deletions webpack.demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ module.exports = function makeWebpackConfig() {
// Support for .ts files.
{
test: /\.ts$/,
loader: isProd ? '@ngtools/webpack' : 'ts-loader',
exclude: [/node_modules\/(?!(ng2-.+))/]
loader: isProd ? '@ngtools/webpack' : 'ts-loader'
},

{
Expand Down Expand Up @@ -186,7 +185,7 @@ module.exports = function makeWebpackConfig() {
// Reference: https://github.com/angular/angular-cli/tree/master/packages/webpack
new aotplugin.AotPlugin({
tsConfigPath: './tsconfig-aot.json',
entryModule: './demo/src/app/app.module#NgbdModule'
entryModule: root('demo/src/app/') + 'app.module#NgbdModule'
}),

// Reference: http://webpack.github.io/docs/list-of-plugins.html#noerrorsplugin
Expand Down

0 comments on commit 43b8e2b

Please sign in to comment.