Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
04c3d16
refactor: drop `css` modules
alexander-akait Jul 9, 2018
09e21c1
refactor: `runtime` code
alexander-akait Jul 9, 2018
c012f9b
refactor: move `postcss` plugin into own file
alexander-akait Jul 9, 2018
b130031
refactor: move `CssLoaderError` into own file
alexander-akait Jul 9, 2018
d1f80ee
refactor: merge code from `processCss` with `loader` code
alexander-akait Jul 9, 2018
ebdaf84
refactor: drop export locals
alexander-akait Jul 9, 2018
8150d2b
refactor: drop `icss` utils
alexander-akait Jul 9, 2018
f95be98
refactor: some stuff
alexander-akait Jul 9, 2018
c81edd4
refactor: `url` part of plugin
alexander-akait Jul 10, 2018
c49b5da
refactor: `import` part of plugin
alexander-akait Jul 10, 2018
254be6b
refactor: stuff
alexander-akait Jul 10, 2018
d22c14f
refactor: escape
alexander-akait Jul 10, 2018
cddbea5
refactor: rename `escape` to `runtimeEscape`
alexander-akait Jul 10, 2018
186f5b6
refactor: `getImportPrefix`
alexander-akait Jul 10, 2018
aa3918a
refactor: loader
alexander-akait Jul 10, 2018
7570df9
refactor: tests
alexander-akait Jul 10, 2018
ff7a4c8
refactor: SyntaxError class
alexander-akait Jul 10, 2018
2f769b3
refactor: loader
alexander-akait Jul 10, 2018
fdfdc17
refactor: use `runtime` message api
alexander-akait Jul 11, 2018
f424b92
refactor: `url` in lowercase
alexander-akait Jul 11, 2018
1aaecdd
refactor: rename `modify-runtime` to `modify-runtime-code`
alexander-akait Jul 11, 2018
45469b7
refactor: `loader` and `plugin`
alexander-akait Jul 11, 2018
ede061d
refactor: options
alexander-akait Jul 12, 2018
9075cfc
feat: validate options
alexander-akait Jul 12, 2018
99ffe87
tests: escaped characters
alexander-akait Jul 12, 2018
81d104a
refactor: webpack-defaults
alexander-akait Jul 12, 2018
f0c5312
refactor: tests
alexander-akait Aug 7, 2018
ae51bf0
refactor: modify message api
alexander-akait Aug 7, 2018
9ad9e21
chore(deps): update postcss to `7` version
alexander-akait Aug 8, 2018
1fdc462
chore(deps): use `schema-utils`
alexander-akait Aug 8, 2018
64a5b48
refactor: SyntaxError and Warning
alexander-akait Aug 8, 2018
0aea5d7
refactor: stuff
alexander-akait Aug 8, 2018
1554d66
test: fix
alexander-akait Aug 8, 2018
ca846b4
refactor: comment
alexander-akait Aug 8, 2018
1330534
refactor: stuff
alexander-akait Aug 8, 2018
84ffe7f
refactor: postcss option
alexander-akait Aug 8, 2018
fe0b78e
test: more
alexander-akait Aug 8, 2018
2b758e8
refactor: remove unnecessary map check
alexander-akait Aug 8, 2018
063dd2d
chore: update `postcss-loader`
alexander-akait Aug 8, 2018
868a5c3
feat: custom error messages
alexander-akait Aug 8, 2018
d49b1db
fix: test
alexander-akait Aug 8, 2018
c4037b0
refactor: reuing ast
alexander-akait Aug 8, 2018
f9cc7ba
docs: note about `css` modules
alexander-akait Aug 8, 2018
eab41ba
fix: use postcss ast only if versions is equals
alexander-akait Aug 15, 2018
06e6d08
refactor: tests
alexander-akait Aug 17, 2018
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: rename escape to runtimeEscape
  • Loading branch information
alexander-akait committed Jul 10, 2018
commit cddbea562ac6349a55ea30368c257be4be0f2fec
8 changes: 4 additions & 4 deletions lib/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,10 @@ module.exports = function(content, map) {

if (query.url !== false && urlItems.length > 0) {
urlEscapeHelper =
"var escape = require(" +
"var runtimeEscape = require(" +
loaderUtils.stringifyRequest(
loaderContext,
require.resolve("./escape.js")
require.resolve("./runtimeEscape.js")
) +
");\n";

Expand All @@ -142,7 +142,7 @@ module.exports = function(content, map) {
urlRequest = url.substr(0, idx);

return (
'" + escape(require(' +
'" + runtimeEscape(require(' +
loaderUtils.stringifyRequest(loaderContext, urlRequest) +
')) + "' +
url.substr(idx)
Expand All @@ -152,7 +152,7 @@ module.exports = function(content, map) {
urlRequest = url;

return (
'" + escape(require(' +
'" + runtimeEscape(require(' +
loaderUtils.stringifyRequest(loaderContext, urlRequest) +
')) + "'
);
Expand Down
File renamed without changes.
7 changes: 4 additions & 3 deletions test/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ function getEvaluated(output, modules) {
var fn = vm.runInThisContext("(function(module, exports, require) {" + output + "})", "testcase.js");
var m = { exports: {}, id: 1 };
fn(m, m.exports, function(module) {
if(module.indexOf("runtime") >= 0)
if(module.indexOf("runtime.js") >= 0)
return require("../lib/runtime");
if(module.indexOf("escape") >= 0)
return require("../lib/escape");
if(module.indexOf("runtimeEscape.js") >= 0) {
return require("../lib/runtimeEscape");
}
if(module.indexOf("-!/path/css-loader!") === 0)
module = module.substr(19);
if(modules && module in modules)
Expand Down