Skip to content

fix(@angular-devkit/build-angular): resolve assets in styles relative to importee #12437

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
merged 1 commit into from
Oct 4, 2018
Merged

fix(@angular-devkit/build-angular): resolve assets in styles relative to importee #12437

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
18 changes: 12 additions & 6 deletions packages/angular_devkit/build_angular/src/angular-cli-files/plugins/postcss-cli-resources.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/
import { interpolateName } from 'loader-utils';
import * as path from 'path';
import * as postcss from 'postcss';
import * as url from 'url';
import * as webpack from 'webpack';
Expand Down Expand Up @@ -52,7 +53,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou

const dedupeSlashes = (url: string) => url.replace(/\/\/+/g, '/');

const process = async (inputUrl: string, resourceCache: Map<string, string>) => {
const process = async (inputUrl: string, context: string, resourceCache: Map<string, string>) => {
// If root-relative or absolute, leave as is
if (inputUrl.match(/^(?:\w+:\/\/|data:|chrome:|#)/)) {
return inputUrl;
Expand All @@ -63,7 +64,8 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
return inputUrl.substr(1);
}

const cachedUrl = resourceCache.get(inputUrl);
const cacheKey = path.resolve(context, inputUrl);
const cachedUrl = resourceCache.get(cacheKey);
if (cachedUrl) {
return cachedUrl;
}
Expand All @@ -85,7 +87,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
outputUrl = dedupeSlashes(`/${baseHref}/${deployUrl}/${inputUrl}`);
}

resourceCache.set(inputUrl, outputUrl);
resourceCache.set(cacheKey, outputUrl);

return outputUrl;
}
Expand All @@ -102,7 +104,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
});
});

const result = await resolve(pathname as string, loader.context, resolver);
const result = await resolve(pathname as string, context, resolver);

return new Promise<string>((resolve, reject) => {
loader.fs.readFile(result, (err: Error, content: Buffer) => {
Expand Down Expand Up @@ -130,7 +132,7 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
outputUrl = url.resolve(deployUrl, outputUrl);
}

resourceCache.set(inputUrl, outputUrl);
resourceCache.set(cacheKey, outputUrl);
resolve(outputUrl);
});
});
Expand Down Expand Up @@ -158,12 +160,16 @@ export default postcss.plugin('postcss-cli-resources', (options: PostcssCliResou
let match;
let lastIndex = 0;
let modified = false;

// We want to load it relative to the file that imports
const context = path.dirname(decl.source.input.file);

// tslint:disable-next-line:no-conditional-assignment
while (match = urlRegex.exec(value)) {
const originalUrl = match[1] || match[2] || match[3];
let processedUrl;
try {
processedUrl = await process(originalUrl, resourceCache);
processedUrl = await process(originalUrl, context, resourceCache);
} catch (err) {
loader.emitError(decl.error(err.message, { word: originalUrl }).toString());
continue;
Expand Down
14 changes: 14 additions & 0 deletions packages/angular_devkit/build_angular/test/browser/styles_spec_large.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,20 @@ describe('Browser Builder styles', () => {
).toPromise().then(done, done.fail);
}, 30000);

it(`supports font-awesome imports without extractCss`, (done) => {
host.writeMultipleFiles({
'src/styles.scss': `
@import "~font-awesome/css/font-awesome.css";
`,
});

const overrides = { extractCss: false, styles: [`src/styles.scss`] };

runTargetSpec(host, browserTargetSpec, overrides).pipe(
tap((buildEvent) => expect(buildEvent.success).toBe(true)),
).toPromise().then(done, done.fail);
}, 30000);

it(`uses autoprefixer`, (done) => {
host.writeMultipleFiles({
'src/styles.css': tags.stripIndents`
Expand Down