Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged latest changes from master #2

Open
wants to merge 7 commits into
base: feat-webpack-publicPath
Choose a base branch
from
Open

Merged latest changes from master #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
52f9120
chore(version): jasmine types and jasmine-core are out of sync (#3229)
JohannesHoppe Nov 22, 2016
9484a10
chore(webpack): add missing -loader suffix (#3187)
Nov 22, 2016
f833d25
fix(editorconfig): use off instead of 0 for max line length (#3186)
scttcper Nov 22, 2016
6e8a848
fix(aot): lock the angular version to 2.2.1. (#3242)
hansl Nov 23, 2016
c1eb4bf
v1.0.0-beta.21
alxhub Nov 23, 2016
54ef738
fix(version): bump ast-tools and webpack versions to correct mismatch…
alxhub Nov 23, 2016
dda5d82
Merge branch 'master' into fix-pr-3136
jbellmann Nov 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,24 @@
<a name="1.0.0-beta.21"></a>
# [1.0.0-beta.21](https://github.com/angular/angular-cli/compare/v1.0.0-beta.20-1...v1.0.0-beta.21) (2016-11-23)


### Bug Fixes

* **angular-cli:** add necessary dependencies. ([#3152](https://github.com/angular/angular-cli/issues/3152)) ([8f574e4](https://github.com/angular/angular-cli/commit/8f574e4)), closes [#3148](https://github.com/angular/angular-cli/issues/3148)
* **angular-cli:** add necessary dependency. ([f7704b0](https://github.com/angular/angular-cli/commit/f7704b0))
* **angular-cli:** change version of webpack plugin. ([07e96ea](https://github.com/angular/angular-cli/commit/07e96ea))
* **aot:** lock the angular version to 2.2.1. ([#3242](https://github.com/angular/angular-cli/issues/3242)) ([6e8a848](https://github.com/angular/angular-cli/commit/6e8a848))
* **editorconfig:** use off instead of 0 for max line length ([#3186](https://github.com/angular/angular-cli/issues/3186)) ([f833d25](https://github.com/angular/angular-cli/commit/f833d25))
* **generate:** revert change to component dir in generate module, as it caused component declaration to go to parent module ([#3158](https://github.com/angular/angular-cli/issues/3158)) ([71bf855](https://github.com/angular/angular-cli/commit/71bf855))
* **github-pages-deploy:** Show more accurate url ([#3160](https://github.com/angular/angular-cli/issues/3160)) ([a431389](https://github.com/angular/angular-cli/commit/a431389))


### Features

* **build:** add sourcemap option ([#3113](https://github.com/angular/angular-cli/issues/3113)) ([6f9d2c1](https://github.com/angular/angular-cli/commit/6f9d2c1))



<a name="1.0.0-beta.20"></a>
# [1.0.0-beta.20](https://github.com/angular/angular-cli/compare/v1.0.0-beta.19...v1.0.0-beta.20-1) (2016-11-16)

Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-cli",
"version": "1.0.0-beta.20-1",
"version": "1.0.0-beta.21",
"description": "CLI tool for Angular",
"main": "packages/angular-cli/lib/cli/index.js",
"trackingCode": "UA-8594346-19",
Expand Down Expand Up @@ -41,10 +41,10 @@
"homepage": "https://github.com/angular/angular-cli",
"dependencies": {
"@angular-cli/ast-tools": "^1.0.0",
"@angular/compiler": "^2.1.0",
"@angular/compiler-cli": "^2.1.0",
"@angular/core": "^2.1.0",
"@angular/tsc-wrapped": "^0.3.0",
"@angular/compiler": "2.2.1",
"@angular/compiler-cli": "2.2.1",
"@angular/core": "2.2.1",
"@angular/tsc-wrapped": "0.4.0",
"angular2-template-loader": "^0.5.0",
"autoprefixer": "^6.5.3",
"awesome-typescript-loader": "^2.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-cli/blueprints/ng2/files/.editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ insert_final_newline = true
trim_trailing_whitespace = true

[*.md]
max_line_length = 0
max_line_length = off
trim_trailing_whitespace = false
24 changes: 12 additions & 12 deletions packages/angular-cli/blueprints/ng2/files/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,33 +12,33 @@
},
"private": true,
"dependencies": {
"@angular/common": "^2.1.0",
"@angular/compiler": "^2.1.0",
"@angular/core": "^2.1.0",
"@angular/forms": "^2.1.0",
"@angular/http": "^2.1.0",
"@angular/platform-browser": "^2.1.0",
"@angular/platform-browser-dynamic": "^2.1.0",
"@angular/router": "^3.1.0",
"@angular/common": "2.2.1",
"@angular/compiler": "2.2.1",
"@angular/core": "2.2.1",
"@angular/forms": "2.2.1",
"@angular/http": "2.2.1",
"@angular/platform-browser": "2.2.1",
"@angular/platform-browser-dynamic": "2.2.1",
"@angular/router": "3.2.1",
"core-js": "^2.4.1",
"rxjs": "5.0.0-beta.12",
"ts-helpers": "^1.1.1",
"zone.js": "^0.6.23"
},
"devDependencies": {<% if(isMobile) { %>
"@angular/platform-server": "~2.1.0",
"@angular/platform-server": "2.2.1",
"@angular/service-worker": "0.2.0",
"@angular/app-shell": "0.0.0",
"angular2-universal":"0.104.5",
"angular2-universal-polyfills": "0.4.1",
"preboot": "2.1.2",
"parse5": "1.5.1",<% } %>
"@angular/compiler-cli": "^2.1.0",
"@types/jasmine": "^2.2.30",
"@angular/compiler-cli": "2.2.1",
"@types/jasmine": "2.5.38",
"@types/node": "^6.0.42",
"angular-cli": "<%= version %>",
"codelyzer": "~1.0.0-beta.3",
"jasmine-core": "2.4.1",
"jasmine-core": "2.5.2",
"jasmine-spec-reporter": "2.5.0",
"karma": "1.2.0",
"karma-chrome-launcher": "^2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/angular-cli/models/webpack-build-common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export function getWebpackCommonConfig(
       { test: /\.(jpg|png|gif)$/, loader: 'url-loader?limit=10000' },
       { test: /\.html$/, loader: 'raw-loader' },

{ test: /\.(otf|ttf|woff|woff2)$/, loader: 'url?limit=10000' },
{ test: /\.(otf|ttf|woff|woff2)$/, loader: 'url-loader?limit=10000' },
{ test: /\.(eot|svg)$/, loader: 'file-loader' }
]
},
Expand Down
8 changes: 4 additions & 4 deletions packages/angular-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-cli",
"version": "1.0.0-beta.20-1",
"version": "1.0.0-beta.21",
"description": "CLI tool for Angular",
"main": "lib/cli/index.js",
"trackingCode": "UA-8594346-19",
Expand All @@ -27,9 +27,9 @@
"dependencies": {
"@angular-cli/ast-tools": "^1.0.1",
"@angular-cli/base-href-webpack": "^1.0.0",
"@angular/compiler": "^2.1.0",
"@angular/compiler-cli": "^2.1.0",
"@angular/core": "^2.1.0",
"@angular/compiler": "2.2.1",
"@angular/compiler-cli": "2.2.1",
"@angular/core": "2.2.1",
"@ngtools/webpack": "^1.0.0",
"angular2-template-loader": "^0.5.0",
"awesome-typescript-loader": "^2.2.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/ast-tools/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@angular-cli/ast-tools",
"version": "1.0.7",
"version": "1.0.9",
"description": "CLI tool for Angular",
"main": "./src/index.js",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/base-href-webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@angular-cli/base-href-webpack",
"version": "1.0.6",
"version": "1.0.7",
"description": "Base HREF Webpack plugin",
"main": "./src/index.js",
"keywords": [
Expand Down
6 changes: 3 additions & 3 deletions packages/webpack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ngtools/webpack",
"version": "1.1.4",
"version": "1.1.6",
"description": "Webpack plugin that AoT compiles your Angular components and modules.",
"main": "./src/index.js",
"typings": "src/index.d.ts",
Expand Down Expand Up @@ -29,8 +29,8 @@
},
"peerDependencies": {
"typescript": "^2.0.2",
"@angular/compiler-cli": "^2.1.0",
"@angular/core": "^2.1.0",
"@angular/compiler-cli": "2.2.1",
"@angular/core": "2.2.1",
"reflect-metadata": "^0.1.8"
}
}
18 changes: 9 additions & 9 deletions tests/e2e/assets/webpack/test-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"name": "test",
"license": "MIT",
"dependencies": {
"@angular/common": "~2.1.0",
"@angular/compiler": "~2.1.0",
"@angular/compiler-cli": "~2.1.0",
"@angular/core": "~2.1.0",
"@angular/http": "~2.1.0",
"@angular/platform-browser": "~2.1.0",
"@angular/platform-browser-dynamic": "~2.1.0",
"@angular/platform-server": "~2.1.0",
"@angular/router": "~3.1.0",
"@angular/common": "2.2.1",
"@angular/compiler": "2.2.1",
"@angular/compiler-cli": "2.2.1",
"@angular/core": "2.2.1",
"@angular/http": "2.2.1",
"@angular/platform-browser": "2.2.1",
"@angular/platform-browser-dynamic": "2.2.1",
"@angular/platform-server": "2.2.1",
"@angular/router": "3.2.1",
"core-js": "^2.4.1",
"rxjs": "^5.0.0-beta.12",
"zone.js": "^0.6.21"
Expand Down