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

chore(webpack): enable xhtml tags in ng build #3743

Merged
merged 8 commits into from
Dec 28, 2016
Merged

chore(webpack): enable xhtml tags in ng build #3743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2b5b08f
Merge pull request #1 from angular/master
CarreraPHP Dec 8, 2016
4e7a6ad
Merge pull request #2 from angular/master
CarreraPHP Dec 9, 2016
510da5e
Merge remote-tracking branch 'angular/master'
CarreraPHP Dec 10, 2016
a401de1
Merge pull request #3 from angular/master
CarreraPHP Dec 21, 2016
23a0e13
chore(webpack): enable xhtml tags in ng build
CarreraPHP Dec 26, 2016
3e61d10
Merge branch 'angular/master' into self-closing-tags
CarreraPHP Dec 26, 2016
ab6dc30
chore(weback): enable xhtml tags in ng build
CarreraPHP Dec 27, 2016
27971ce
chore(weback): enable xhtml tags in ng build
CarreraPHP Dec 27, 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
3 changes: 2 additions & 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 @@ -137,7 +137,8 @@ export function getWebpackCommonConfig(
template: path.resolve(appRoot, appConfig.index),
filename: path.resolve(appConfig.outDir, appConfig.index),
chunksSortMode: packageChunkSort(['inline', 'styles', 'scripts', 'vendor', 'main']),
excludeChunks: lazyChunks
excludeChunks: lazyChunks,
xhtml: true
}),
new BaseHrefWebpackPlugin({
baseHref: baseHref
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/tests/build/scripts-array.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function () {
.then(() => expectFileToMatch('dist/common-entry.bundle.css', '.common-entry-style'))
// index.html lists the right bundles
.then(() => expectFileToMatch('dist/index.html', oneLineTrim`
<link href="common-entry.bundle.css" rel="stylesheet">
<link href="common-entry.bundle.css" rel="stylesheet"/>
`))
.then(() => expectFileToMatch('dist/index.html', oneLineTrim`
<script type="text/javascript" src="inline.bundle.js"></script>
Expand Down
6 changes: 3 additions & 3 deletions tests/e2e/tests/build/styles/styles-array.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ export default function () {
.then(() => expectToFail(() => expectFileToExist('dist/renamed-lazy-styles.bundle.js')))
// index.html lists the right bundles
.then(() => expectFileToMatch('dist/index.html', oneLineTrim`
<link href="renamed-style.bundle.css" rel="stylesheet">
<link href="styles.bundle.css" rel="stylesheet">
<link href="common-entry.bundle.css" rel="stylesheet">
<link href="renamed-style.bundle.css" rel="stylesheet"/>
<link href="styles.bundle.css" rel="stylesheet"/>
<link href="common-entry.bundle.css" rel="stylesheet"/>
`))
.then(() => expectFileToMatch('dist/index.html', oneLineTrim`
<script type="text/javascript" src="inline.bundle.js"></script>
Expand Down