Skip to content

fix(@angular/cli): update postcss loader and URL versions. #8535

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
hansl merged 1 commit into from
Nov 17, 2017
Merged

fix(@angular/cli): update postcss loader and URL versions. #8535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
225 changes: 122 additions & 103 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
"opn": "~5.1.0",
"portfinder": "~1.0.12",
"postcss-custom-properties": "^6.1.0",
"postcss-loader": "^1.3.3",
"postcss-url": "^5.1.2",
"postcss-loader": "^2.0.8",
"postcss-url": "^7.1.2",
"raw-loader": "^0.5.1",
"resolve": "^1.1.7",
"rxjs": "^5.5.2",
Expand Down
13 changes: 7 additions & 6 deletions packages/@angular/cli/models/webpack-configs/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,23 +59,24 @@ export function getStylesConfig(wco: WebpackConfigOptions) {

return [
postcssUrl({
url: (URL: string) => {
url: (URL: { url: string }) => {
const { url } = URL;
// Only convert root relative URLs, which CSS-Loader won't process into require().
if (!URL.startsWith('/') || URL.startsWith('//')) {
return URL;
if (!url.startsWith('/') || url.startsWith('//')) {
return URL.url;
}

if (deployUrl.match(/:\/\//)) {
// If deployUrl contains a scheme, ignore baseHref use deployUrl as is.
return `${deployUrl.replace(/\/$/, '')}${URL}`;
return `${deployUrl.replace(/\/$/, '')}${url}`;
} else if (baseHref.match(/:\/\//)) {
// If baseHref contains a scheme, include it as is.
return baseHref.replace(/\/$/, '') +
`/${deployUrl}/${URL}`.replace(/\/\/+/g, '/');
`/${deployUrl}/${url}`.replace(/\/\/+/g, '/');
} else {
// Join together base-href, deploy-url and the original URL.
// Also dedupe multiple slashes into single ones.
return `/${baseHref}/${deployUrl}/${URL}`.replace(/\/\/+/g, '/');
return `/${baseHref}/${deployUrl}/${url}`.replace(/\/\/+/g, '/');
}
}
}),
Expand Down
4 changes: 2 additions & 2 deletions packages/@angular/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@
"opn": "~5.1.0",
"portfinder": "~1.0.12",
"postcss-custom-properties": "^6.1.0",
"postcss-loader": "^1.3.3",
"postcss-url": "^5.1.2",
"postcss-loader": "^2.0.8",
"postcss-url": "^7.1.2",
"raw-loader": "^0.5.1",
"resolve": "^1.1.7",
"rxjs": "^5.5.2",
Expand Down