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.

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

fix: performance #1144

Merged
merged 1 commit into from
Jul 29, 2020
Merged
Changes from all commits
Commits
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
11 changes: 6 additions & 5 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -62,11 +62,11 @@ export default async function loader(content, map, meta) {

if (shouldUseImportPlugin(options)) {
const resolver = this.getResolve({
conditionNames: ['style'],
extensions: ['.css'],
mainFields: ['css', 'style', 'main', '...'],
mainFiles: ['index', '...'],
extensions: ['.css'],
restrictions: [/\.css$/i],
conditionNames: ['style'],
});

plugins.push(
@@ -90,8 +90,9 @@ export default async function loader(content, map, meta) {

if (shouldUseURLPlugin(options)) {
const urlResolver = this.getResolve({
mainFields: ['asset'],
conditionNames: ['asset'],
mainFields: ['asset'],
mainFiles: [],
extensions: [],
});

@@ -113,10 +114,10 @@ export default async function loader(content, map, meta) {

if (needUseModulesPlugins || options.icss) {
const icssResolver = this.getResolve({
conditionNames: ['style'],
extensions: [],
mainFields: ['css', 'style', 'main', '...'],
mainFiles: ['index', '...'],
extensions: [],
conditionNames: ['style'],
});

plugins.push(
31 changes: 16 additions & 15 deletions src/plugins/postcss-import-parser.js
Original file line number Diff line number Diff line change
@@ -108,16 +108,16 @@ export default postcss.plugin(pluginName, (options) => async (css, result) => {
let normalizedUrl = url;
let prefix = '';

const queryParts = normalizedUrl.split('!');

if (queryParts.length > 1) {
normalizedUrl = queryParts.pop();
prefix = queryParts.join('!');
}

const isRequestable = isUrlRequestable(normalizedUrl);

if (isRequestable) {
const queryParts = normalizedUrl.split('!');

if (queryParts.length > 1) {
normalizedUrl = queryParts.pop();
prefix = queryParts.join('!');
}

normalizedUrl = normalizeUrl(normalizedUrl, isStringValue);

// Empty url after normalize - `@import '\
@@ -149,16 +149,17 @@ export default postcss.plugin(pluginName, (options) => async (css, result) => {

if (isRequestable) {
const request = requestify(normalizedUrl, options.rootContext);
const doResolve = async () => {
const { resolver, context } = options;
const resolvedUrl = await resolveRequests(resolver, context, [
...new Set([request, normalizedUrl]),
]);

return { url: resolvedUrl, media, prefix, isRequestable };
};
tasks.push(
(async () => {
const { resolver, context } = options;
const resolvedUrl = await resolveRequests(resolver, context, [
...new Set([request, normalizedUrl]),
]);

tasks.push(doResolve());
return { url: resolvedUrl, media, prefix, isRequestable };
})()
);
} else {
tasks.push({ url, media, prefix, isRequestable });
}
19 changes: 11 additions & 8 deletions src/plugins/postcss-url-parser.js
Original file line number Diff line number Diff line change
@@ -169,16 +169,17 @@ export default postcss.plugin(pluginName, (options) => async (css, result) => {
hash += hashOrQuery ? `#${hashOrQuery}` : '';

const request = requestify(pathname, options.rootContext);
const doResolve = async () => {
const { resolver, context } = options;
const resolvedUrl = await resolveRequests(resolver, context, [
...new Set([request, normalizedUrl]),
]);

return { url: resolvedUrl, prefix, hash, parsedResult };
};
tasks.push(
(async () => {
const { resolver, context } = options;
const resolvedUrl = await resolveRequests(resolver, context, [
...new Set([request, normalizedUrl]),
]);

tasks.push(doResolve());
return { url: resolvedUrl, prefix, hash, parsedResult };
})()
);
}

const results = await Promise.all(tasks);
@@ -230,5 +231,7 @@ export default postcss.plugin(pluginName, (options) => async (css, result) => {
decl.value = parsed.toString();
}

console.timeEnd('URL');

return Promise.resolve();
});