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

Jump to bottom

refactor: runtime #949

Merged
merged 1 commit into from Jun 4, 2019
Merged

refactor: runtime #949

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
0 src/runtime/url-escape.js → src/runtime/get-url.js
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions src/utils.js
View file
Open in desktop
Expand Up @@ -207,8 +207,8 @@ function getExports(messages, exportLocalsStyle, importItemReplacer) {
function getImports(messages, importUrlPrefix, loaderContext, callback) {
const imports = [];

// Helper for ensuring valid CSS strings from requires
let hasUrlEscapeHelper = false;
// Helper for getting url
let hasUrlHelper = false;

messages.forEach((message) => {
if (message.type === 'import') {
Expand All @@ -234,15 +234,15 @@ function getImports(messages, importUrlPrefix, loaderContext, callback) {
}

if (message.type === 'url') {
if (!hasUrlEscapeHelper) {
if (!hasUrlHelper) {
imports.push(
`var urlEscape = require(${stringifyRequest(
`var getUrl = require(${stringifyRequest(
loaderContext,
require.resolve('./runtime/url-escape.js')
require.resolve('./runtime/get-url.js')
)});`
);

hasUrlEscapeHelper = true;
hasUrlHelper = true;
}

const { url, placeholder, needQuotes } = message.item;
Expand All @@ -254,7 +254,7 @@ function getImports(messages, importUrlPrefix, loaderContext, callback) {
: '';

imports.push(
`var ${placeholder} = urlEscape(require(${stringifyRequest(
`var ${placeholder} = getUrl(require(${stringifyRequest(
loaderContext,
urlToRequest(normalizedUrl)
)})${hash ? ` + ${hash}` : ''}${needQuotes ? ', true' : ''});`
Expand Down
28 changes: 14 additions & 14 deletions test/__snapshots__/import-option.test.js.snap
View file
Open in desktop
Expand Up @@ -204,8 +204,8 @@ exports.i(require(\\"-!../../../src/index.js??ref--4-0!../import/top-relative.cs
exports.i(require(\\"-!../../../src/index.js??ref--4-0!package/tilde.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!aliasesImport/alias.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!./url.css\\"), \\"\\");
var urlEscape = require(\\"../../../src/runtime/url-escape.js\\");
var ___CSS_LOADER_URL___0___ = urlEscape(require(\\"./img.png\\"));
var getUrl = require(\\"../../../src/runtime/get-url.js\\");
var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\"));

// Module
exports.push([module.id, \\"@import url(test.css);\\\\n@import url('test.css');\\\\n@import url(\\\\\\"test.css\\\\\\");\\\\n@IMPORT url(test.css);\\\\n@import URL(test.css);\\\\n@import url(test.css );\\\\n@import url( test.css);\\\\n@import url( test.css );\\\\n@import url(\\\\n test.css\\\\n);\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import \\\\\\"test.css\\\\\\";\\\\n@import 'test.css';\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\" \\\\\\";\\\\n@import \\\\\\"\\\\n\\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import url(test.css) screen and print;\\\\n@import url(test.css) SCREEN AND PRINT;\\\\n@import url(test.css)screen and print;\\\\n@import url(test.css) screen and print;\\\\n@import url(~package/test.css);\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n\\\\n.class {\\\\n a: b c d;\\\\n}\\\\n\\\\n.foo {\\\\n @import 'path.css';\\\\n}\\\\n\\\\n.background {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\", \\"\\"]);
Expand Down Expand Up @@ -353,8 +353,8 @@ Array [
exports[`import option false: module 1`] = `
"exports = module.exports = require(\\"../../../src/runtime/api.js\\")(false);
// Imports
var urlEscape = require(\\"../../../src/runtime/url-escape.js\\");
var ___CSS_LOADER_URL___0___ = urlEscape(require(\\"./img.png\\"));
var getUrl = require(\\"../../../src/runtime/get-url.js\\");
var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\"));

// Module
exports.push([module.id, \\"@import url(test.css);\\\\n@import url('test.css');\\\\n@import url(\\\\\\"test.css\\\\\\");\\\\n@IMPORT url(test.css);\\\\n@import URL(test.css);\\\\n@import url(test.css );\\\\n@import url( test.css);\\\\n@import url( test.css );\\\\n@import url(\\\\n test.css\\\\n);\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import \\\\\\"test.css\\\\\\";\\\\n@import 'test.css';\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\" \\\\\\";\\\\n@import \\\\\\"\\\\n\\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import url(test.css) screen and print;\\\\n@import url(test.css) SCREEN AND PRINT;\\\\n@import url(test.css)screen and print;\\\\n@import url(test.css) screen and print;\\\\n@import url(test-media.css) screen and print;\\\\n@import url(test-other.css) (min-width: 100px);\\\\n@import url(http://example.com/style.css);\\\\n@import url(http://example.com/style.css);\\\\n@import url(http://example.com/style.css#hash);\\\\n@import url(http://example.com/style.css?#hash);\\\\n@import url(http://example.com/style.css?foo=bar#hash);\\\\n@import url(http://example.com/other-style.css) screen and print;\\\\n@import url(http://example.com/other-style.css) screen and print;\\\\n@import url(\\\\\\"//example.com/style.css\\\\\\");\\\\n@import url(~package/test.css);\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n@import url('query.css?foo=1&bar=1');\\\\n@import url('other-query.css?foo=1&bar=1#hash');\\\\n@import url('other-query.css?foo=1&bar=1#hash') screen and print;\\\\n@import url('https://fonts.googleapis.com/css?family=Roboto');\\\\n@import url('https://fonts.googleapis.com/css?family=Noto+Sans+TC');\\\\n@import url('https://fonts.googleapis.com/css?family=Noto+Sans+TC|Roboto');\\\\n\\\\n.class {\\\\n a: b c d;\\\\n}\\\\n\\\\n.foo {\\\\n @import 'path.css';\\\\n}\\\\n\\\\n@import url('./relative.css');\\\\n@import url('../import/top-relative.css');\\\\n@import url(~package/tilde.css);\\\\n@import url(~aliasesImport/alias.css);\\\\n@import url('./url.css');\\\\n\\\\n.background {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\", \\"\\"]);
Expand Down Expand Up @@ -577,8 +577,8 @@ exports.i(require(\\"-!../../../src/index.js??ref--4-0!../import/top-relative.cs
exports.i(require(\\"-!../../../src/index.js??ref--4-0!package/tilde.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!aliasesImport/alias.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!./url.css\\"), \\"\\");
var urlEscape = require(\\"../../../src/runtime/url-escape.js\\");
var ___CSS_LOADER_URL___0___ = urlEscape(require(\\"./img.png\\"));
var getUrl = require(\\"../../../src/runtime/get-url.js\\");
var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\"));

// Module
exports.push([module.id, \\"@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\" \\\\\\";\\\\n@import \\\\\\"\\\\n\\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n\\\\n.class {\\\\n a: b c d;\\\\n}\\\\n\\\\n.foo {\\\\n @import 'path.css';\\\\n}\\\\n\\\\n.background {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\", \\"\\"]);
Expand Down Expand Up @@ -857,8 +857,8 @@ exports.i(require(\\"-!../../../src/index.js??ref--4-0!../import/top-relative.cs
exports.i(require(\\"-!../../../src/index.js??ref--4-0!package/tilde.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!aliasesImport/alias.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!./url.css\\"), \\"\\");
var urlEscape = require(\\"../../../src/runtime/url-escape.js\\");
var ___CSS_LOADER_URL___0___ = urlEscape(require(\\"./img.png\\"));
var getUrl = require(\\"../../../src/runtime/get-url.js\\");
var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\"));

// Module
exports.push([module.id, \\"@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\" \\\\\\";\\\\n@import \\\\\\"\\\\n\\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n\\\\n.class {\\\\n a: b c d;\\\\n}\\\\n\\\\n.foo {\\\\n @import 'path.css';\\\\n}\\\\n\\\\n.background {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\", \\"\\"]);
Expand Down Expand Up @@ -1137,8 +1137,8 @@ exports.i(require(\\"-!../../../src/index.js??ref--4-0!../import/top-relative.cs
exports.i(require(\\"-!../../../src/index.js??ref--4-0!package/tilde.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!aliasesImport/alias.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!./url.css\\"), \\"\\");
var urlEscape = require(\\"../../../src/runtime/url-escape.js\\");
var ___CSS_LOADER_URL___0___ = urlEscape(require(\\"./img.png\\"));
var getUrl = require(\\"../../../src/runtime/get-url.js\\");
var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\"));

// Module
exports.push([module.id, \\"@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\" \\\\\\";\\\\n@import \\\\\\"\\\\n\\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n\\\\n.hnxX78DgkaA2kCp_BPbLd {\\\\n a: b c d;\\\\n}\\\\n\\\\n._1Lug_45kZL-M7XuNeM4SCw {\\\\n @import 'path.css';\\\\n}\\\\n\\\\n._1E9CLkKp-0idM8IkvZwXn9 {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\", \\"\\"]);
Expand Down Expand Up @@ -1422,8 +1422,8 @@ exports.i(require(\\"-!../../../src/index.js??ref--4-0!../import/top-relative.cs
exports.i(require(\\"-!../../../src/index.js??ref--4-0!package/tilde.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!aliasesImport/alias.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!./url.css\\"), \\"\\");
var urlEscape = require(\\"../../../src/runtime/url-escape.js\\");
var ___CSS_LOADER_URL___0___ = urlEscape(require(\\"./img.png\\"));
var getUrl = require(\\"../../../src/runtime/get-url.js\\");
var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\"));

// Module
exports.push([module.id, \\"@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\" \\\\\\";\\\\n@import \\\\\\"\\\\n\\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n\\\\n.hnxX78DgkaA2kCp_BPbLd {\\\\n a: b c d;\\\\n}\\\\n\\\\n._1Lug_45kZL-M7XuNeM4SCw {\\\\n @import 'path.css';\\\\n}\\\\n\\\\n._1E9CLkKp-0idM8IkvZwXn9 {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\", \\"\\"]);
Expand Down Expand Up @@ -1707,8 +1707,8 @@ exports.i(require(\\"-!../../../src/index.js??ref--4-0!../import/top-relative.cs
exports.i(require(\\"-!../../../src/index.js??ref--4-0!package/tilde.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!aliasesImport/alias.css\\"), \\"\\");
exports.i(require(\\"-!../../../src/index.js??ref--4-0!./url.css\\"), \\"\\");
var urlEscape = require(\\"../../../src/runtime/url-escape.js\\");
var ___CSS_LOADER_URL___0___ = urlEscape(require(\\"./img.png\\"));
var getUrl = require(\\"../../../src/runtime/get-url.js\\");
var ___CSS_LOADER_URL___0___ = getUrl(require(\\"./img.png\\"));

// Module
exports.push([module.id, \\"@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import '';\\\\n@import \\\\\\"\\\\\\";\\\\n@import \\\\\\" \\\\\\";\\\\n@import \\\\\\"\\\\n\\\\\\";\\\\n@import url();\\\\n@import url('');\\\\n@import url(\\\\\\"\\\\\\");\\\\n@import ;\\\\n@import foo-bar;\\\\n@import-normalize;\\\\n@import url('http://') :root {}\\\\n\\\\n.class {\\\\n a: b c d;\\\\n}\\\\n\\\\n.foo {\\\\n @import 'path.css';\\\\n}\\\\n\\\\n.background {\\\\n background: url(\\" + ___CSS_LOADER_URL___0___ + \\");\\\\n}\\\\n\\", \\"\\"]);
Expand Down