Skip to content

fix: reduce count of require #1004

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
alexander-akait merged 10 commits into from
Dec 5, 2019
Merged

fix: reduce count of require #1004

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
decacd3
refactor: reduce count of require
alexander-akait Dec 3, 2019
1d3d475
refactor: avoid unnecessary empty media
alexander-akait Dec 4, 2019
6cb49d5
refactor: perf
alexander-akait Dec 4, 2019
8f93da4
refactor: order require and runtime code
alexander-akait Dec 4, 2019
cfcbc8e
refactor: postcss-url-parser
alexander-akait Dec 4, 2019
c90c49b
refactor: code
alexander-akait Dec 4, 2019
f9fa4c3
refactor: postcss-url-parser
alexander-akait Dec 4, 2019
0007dee
refactor: postcss-import-parser
alexander-akait Dec 5, 2019
7282e09
refactor: postcss-url-parser
alexander-akait Dec 5, 2019
2e75460
refactor: code
alexander-akait Dec 5, 2019
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
Prev Previous commit
Next Next commit
refactor: order require and runtime code
  • Loading branch information
@alexander-akait
alexander-akait committed Dec 4, 2019
commit 8f93da49dceb9b5542baef76b54a74d2fa211116
15 changes: 8 additions & 7 deletions src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,8 @@ function getApiCode(loaderContext, sourceMap) {
}

function getImportCode(loaderContext, imports, options) {
const items = [];
const importItems = [];
const codeItems = [];

let hasUrlHelperCode = false;

Expand All @@ -223,15 +224,15 @@ function getImportCode(loaderContext, imports, options) {
const media = item.media ? `, ${JSON.stringify(item.media)}` : '';

if (!isUrlRequest(item.url)) {
items.push(`exports.push([module.id, ${url}${media}]);`);
codeItems.push(`exports.push([module.id, ${url}${media}]);`);

return;
}

items.push(`var ${item.name} = require(${url});`);
importItems.push(`var ${item.name} = require(${url});`);

if (options.exportType === 'full') {
items.push(`exports.i(${item.name}${media});`);
codeItems.push(`exports.i(${item.name}${media});`);
}
}

Expand All @@ -240,7 +241,7 @@ function getImportCode(loaderContext, imports, options) {
const pathToGetUrl = require.resolve('./runtime/getUrl.js');
const url = stringifyRequest(loaderContext, pathToGetUrl);

items.push(`var getUrl = require(${url});`);
importItems.push(`var getUrl = require(${url});`);

hasUrlHelperCode = true;
}
Expand Down Expand Up @@ -269,13 +270,13 @@ function getImportCode(loaderContext, imports, options) {
const preparedOptions =
getUrlOptions.length > 0 ? `, { ${getUrlOptions.join(', ')} }` : '';

items.push(
codeItems.push(
`var ${name} = getUrl(require(${preparedUrl})${preparedOptions});`
);
}
});

return `// Imports\n${items.join('\n')}\n`;
return `// Imports\n${importItems.join('\n')}\n${codeItems.join('\n')}\n`;
}

function getModuleCode(loaderContext, result, replacers, sourceMap) {
Expand Down
Loading