Skip to content

refactor: improve resolving #1327

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 19 commits into from
Jul 14, 2021
Merged

refactor: improve resolving #1327

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
84019fc
refactor: improve resolving
alexander-akait Jul 14, 2021
33c1ea3
test: add test for original issue
alexander-akait Jul 14, 2021
8ce9ab5
test: ignore plugin
alexander-akait Jul 14, 2021
cab51d8
fix: resolving
alexander-akait Jul 14, 2021
16c7d24
fix: compatibility with commonjs format
alexander-akait Jul 14, 2021
dc2447f
test: fix
alexander-akait Jul 14, 2021
f13dd7b
test: fix snapshots
alexander-akait Jul 14, 2021
f8e893e
fix: resolving
alexander-akait Jul 14, 2021
12b2503
test: fix
alexander-akait Jul 14, 2021
ac6b02a
test: fix
alexander-akait Jul 14, 2021
c43057c
refactor: add TODO
alexander-akait Jul 14, 2021
afbba34
fix: `file` protocol
alexander-akait Jul 14, 2021
5591d0c
test: fix
alexander-akait Jul 14, 2021
d92a175
test: debug
alexander-akait Jul 14, 2021
3cf9017
test: debug
alexander-akait Jul 14, 2021
18bf9af
test: debug
alexander-akait Jul 14, 2021
49ff320
test: debug
alexander-akait Jul 14, 2021
59b4de7
test: cleanup
alexander-akait Jul 14, 2021
db9a20b
test: added
alexander-akait Jul 14, 2021
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
test: fix
  • Loading branch information
@alexander-akait
alexander-akait committed Jul 14, 2021
commit ac6b02acbd24282e55d464c427c57cb8a47908b8
4 changes: 2 additions & 2 deletions test/__snapshots__/url-option.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ exports[`"url" option should resolve "file" protocol path: module 1`] = `
"// Imports
import ___CSS_LOADER_API_IMPORT___ from \\"../../../src/runtime/api.js\\";
import ___CSS_LOADER_GET_URL_IMPORT___ from \\"../../../src/runtime/getUrl.js\\";
var ___CSS_LOADER_URL_IMPORT_0___ = new URL(\\"<cwd>/test/fixtures/url/img.png\\", import.meta.url);
var ___CSS_LOADER_URL_IMPORT_0___ = new URL(\\"<file-protocol-url>\\", import.meta.url);
var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(function(i){return i[1]});
var ___CSS_LOADER_URL_REPLACEMENT_0___ = ___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___);
// Module
Expand Down Expand Up @@ -46,7 +46,7 @@ exports[`"url" option should resolve absolute path: module 1`] = `
"// Imports
import ___CSS_LOADER_API_IMPORT___ from \\"../../../src/runtime/api.js\\";
import ___CSS_LOADER_GET_URL_IMPORT___ from \\"../../../src/runtime/getUrl.js\\";
var ___CSS_LOADER_URL_IMPORT_0___ = new URL(\\"<cwd>/test/fixtures/url/img.png\\", import.meta.url);
var ___CSS_LOADER_URL_IMPORT_0___ = new URL(\\"<absolute-path>\\", import.meta.url);
var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(function(i){return i[1]});
var ___CSS_LOADER_URL_REPLACEMENT_0___ = ___CSS_LOADER_GET_URL_IMPORT___(___CSS_LOADER_URL_IMPORT_0___);
// Module
Expand Down
8 changes: 4 additions & 4 deletions test/url-option.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ describe('"url" option', () => {

expect(
getModuleSource("./url/url-absolute.css", stats).replace(
new RegExp(process.cwd().replace(/\\/g, "/"), "g"),
"<cwd>"
absolutePath,
"<absolute-path>"
)
).toMatchSnapshot("module");
expect(getExecutedCode("main.bundle.js", compiler, stats)).toMatchSnapshot(
Expand Down Expand Up @@ -176,8 +176,8 @@ describe('"url" option', () => {

expect(
getModuleSource("./url/url-file-protocol.css", stats).replace(
new RegExp(process.cwd().replace(/\\/g, "/"), "g"),
"<cwd>"
absolutePath,
"<file-protocol-url>"
)
).toMatchSnapshot("module");
expect(getExecutedCode("main.bundle.js", compiler, stats)).toMatchSnapshot(
Expand Down