Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: webpack-contrib/css-loader
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.5.0
Choose a base ref
...
head repository: webpack-contrib/css-loader
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.5.1
Choose a head ref
  • 2 commits
  • 6 files changed
  • 2 contributors

Commits on Apr 7, 2020

  1. fix: don't generate an invalid code for locals (#1072)

    @evilebottnawi
    evilebottnawi authored Apr 7, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    866b84a View commit details

  2. chore(release): 3.5.1

    @alexander-akait
    alexander-akait committed Apr 7, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    239e43d View commit details
Showing with 68 additions and 29 deletions.
  1. +7 −0 CHANGELOG.md
  2. +1 −1 package-lock.json
  3. +1 −1 package.json
  4. +13 −15 src/utils.js
  5. +42 −12 test/__snapshots__/localsConvention-option.test.js.snap
  6. +4 −0 test/fixtures/modules/localsConvention/localsConvention.css
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

### [3.5.1](https://github.com/webpack-contrib/css-loader/compare/v3.5.0...v3.5.1) (2020-04-07)


### Bug Fixes

* don't generate an invalid code for `locals` ([#1072](https://github.com/webpack-contrib/css-loader/issues/1072)) ([866b84a](https://github.com/webpack-contrib/css-loader/commit/866b84acd7fd47651f741ca1e6cf7081c2bbe357))

## [3.5.0](https://github.com/webpack-contrib/css-loader/compare/v3.4.2...v3.5.0) (2020-04-06)


2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "css-loader",
"version": "3.5.0",
"version": "3.5.1",
"description": "css loader module for webpack",
"license": "MIT",
"repository": "webpack-contrib/css-loader",
28 changes: 13 additions & 15 deletions src/utils.js
View file
Original file line number Diff line number Diff line change
@@ -348,49 +348,47 @@ function getExportCode(
let code = '';
let localsCode = '';

const addExportToLocalsCode = (name, value, index) => {
const isLastItem = index === exports.length - 1;
const addExportToLocalsCode = (name, value) => {
if (localsCode) {
localsCode += `,\n`;
}

localsCode += `\t${JSON.stringify(name)}: ${JSON.stringify(value)}${
isLastItem ? '' : ',\n'
}`;
localsCode += `\t${JSON.stringify(name)}: ${JSON.stringify(value)}`;
};

for (const [index, item] of exports.entries()) {
const { name, value } = item;

for (const { name, value } of exports) {
switch (localsConvention) {
case 'camelCase': {
addExportToLocalsCode(name, value, index);
addExportToLocalsCode(name, value);

const modifiedName = camelCase(name);

if (modifiedName !== name) {
addExportToLocalsCode(modifiedName, value, index);
addExportToLocalsCode(modifiedName, value);
}
break;
}
case 'camelCaseOnly': {
addExportToLocalsCode(camelCase(name), value, index);
addExportToLocalsCode(camelCase(name), value);
break;
}
case 'dashes': {
addExportToLocalsCode(name, value);

const modifiedName = dashesCamelCase(name, index);
const modifiedName = dashesCamelCase(name);

if (modifiedName !== name) {
addExportToLocalsCode(modifiedName, value, index);
addExportToLocalsCode(modifiedName, value);
}
break;
}
case 'dashesOnly': {
addExportToLocalsCode(dashesCamelCase(name), value, index);
addExportToLocalsCode(dashesCamelCase(name), value);
break;
}
case 'asIs':
default:
addExportToLocalsCode(name, value, index);
addExportToLocalsCode(name, value);
break;
}
}
54 changes: 42 additions & 12 deletions test/__snapshots__/localsConvention-option.test.js.snap
View file
Original file line number Diff line number Diff line change
@@ -7,14 +7,15 @@ exports[`"localsConvention" option should work when not specified: module 1`] =
var ___CSS_LOADER_API_IMPORT___ = require(\\"../../../../src/runtime/api.js\\");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\", \\"\\"]);
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\\\n.jHKqWGMvMrGp5RVPtApZ8 {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]);
// Exports
exports.locals = {
\\"foo\\": \\"bar\\",
\\"my-btn-info_is-disabled\\": \\"value\\",
\\"btn-info_is-disabled\\": \\"erBXHZCN_thRYfCnk-aH8\\",
\\"btn--info_is-disabled_1\\": \\"_2YsQE-S0o0NRXfC6XNApz2\\",
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\"
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\",
\\"foo_bar\\": \\"jHKqWGMvMrGp5RVPtApZ8\\"
};
module.exports = exports;
"
@@ -39,6 +40,10 @@ Array [
a {
color: yellow;
}
.jHKqWGMvMrGp5RVPtApZ8 {
color: red;
}
",
"",
],
@@ -54,14 +59,15 @@ exports[`"localsConvention" option should work with a value equal to "asIs": mod
var ___CSS_LOADER_API_IMPORT___ = require(\\"../../../../src/runtime/api.js\\");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\", \\"\\"]);
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\\\n.jHKqWGMvMrGp5RVPtApZ8 {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]);
// Exports
exports.locals = {
\\"foo\\": \\"bar\\",
\\"my-btn-info_is-disabled\\": \\"value\\",
\\"btn-info_is-disabled\\": \\"erBXHZCN_thRYfCnk-aH8\\",
\\"btn--info_is-disabled_1\\": \\"_2YsQE-S0o0NRXfC6XNApz2\\",
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\"
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\",
\\"foo_bar\\": \\"jHKqWGMvMrGp5RVPtApZ8\\"
};
module.exports = exports;
"
@@ -86,6 +92,10 @@ Array [
a {
color: yellow;
}
.jHKqWGMvMrGp5RVPtApZ8 {
color: red;
}
",
"",
],
@@ -101,7 +111,7 @@ exports[`"localsConvention" option should work with a value equal to "camelCase"
var ___CSS_LOADER_API_IMPORT___ = require(\\"../../../../src/runtime/api.js\\");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\", \\"\\"]);
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\\\n.jHKqWGMvMrGp5RVPtApZ8 {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]);
// Exports
exports.locals = {
\\"foo\\": \\"bar\\",
@@ -111,7 +121,9 @@ exports.locals = {
\\"btnInfoIsDisabled\\": \\"erBXHZCN_thRYfCnk-aH8\\",
\\"btn--info_is-disabled_1\\": \\"_2YsQE-S0o0NRXfC6XNApz2\\",
\\"btnInfoIsDisabled1\\": \\"_2YsQE-S0o0NRXfC6XNApz2\\",
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\"
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\",
\\"foo_bar\\": \\"jHKqWGMvMrGp5RVPtApZ8\\",
\\"fooBar\\": \\"jHKqWGMvMrGp5RVPtApZ8\\"
};
module.exports = exports;
"
@@ -136,6 +148,10 @@ Array [
a {
color: yellow;
}
.jHKqWGMvMrGp5RVPtApZ8 {
color: red;
}
",
"",
],
@@ -151,14 +167,15 @@ exports[`"localsConvention" option should work with a value equal to "camelCaseO
var ___CSS_LOADER_API_IMPORT___ = require(\\"../../../../src/runtime/api.js\\");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\", \\"\\"]);
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\\\n.jHKqWGMvMrGp5RVPtApZ8 {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]);
// Exports
exports.locals = {
\\"foo\\": \\"bar\\",
\\"myBtnInfoIsDisabled\\": \\"value\\",
\\"btnInfoIsDisabled\\": \\"erBXHZCN_thRYfCnk-aH8\\",
\\"btnInfoIsDisabled1\\": \\"_2YsQE-S0o0NRXfC6XNApz2\\",
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\"
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\",
\\"fooBar\\": \\"jHKqWGMvMrGp5RVPtApZ8\\"
};
module.exports = exports;
"
@@ -183,6 +200,10 @@ Array [
a {
color: yellow;
}
.jHKqWGMvMrGp5RVPtApZ8 {
color: red;
}
",
"",
],
@@ -198,7 +219,7 @@ exports[`"localsConvention" option should work with a value equal to "dashes": m
var ___CSS_LOADER_API_IMPORT___ = require(\\"../../../../src/runtime/api.js\\");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\", \\"\\"]);
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\\\n.jHKqWGMvMrGp5RVPtApZ8 {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]);
// Exports
exports.locals = {
\\"foo\\": \\"bar\\",
@@ -209,7 +230,7 @@ exports.locals = {
\\"btn--info_is-disabled_1\\": \\"_2YsQE-S0o0NRXfC6XNApz2\\",
\\"btnInfo_isDisabled_1\\": \\"_2YsQE-S0o0NRXfC6XNApz2\\",
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\",
\\"foo_bar\\": \\"jHKqWGMvMrGp5RVPtApZ8\\"
};
module.exports = exports;
"
@@ -234,6 +255,10 @@ Array [
a {
color: yellow;
}
.jHKqWGMvMrGp5RVPtApZ8 {
color: red;
}
",
"",
],
@@ -249,14 +274,15 @@ exports[`"localsConvention" option should work with a value equal to "dashesOnly
var ___CSS_LOADER_API_IMPORT___ = require(\\"../../../../src/runtime/api.js\\");
exports = ___CSS_LOADER_API_IMPORT___(false);
// Module
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\", \\"\\"]);
exports.push([module.id, \\".erBXHZCN_thRYfCnk-aH8 {\\\\n color: blue;\\\\n}\\\\n\\\\n._2YsQE-S0o0NRXfC6XNApz2 {\\\\n color: blue;\\\\n}\\\\n\\\\n._3gGBcJHZU3seQVP5aq7Ksq {\\\\n color: red;\\\\n}\\\\n\\\\na {\\\\n color: yellow;\\\\n}\\\\n\\\\n.jHKqWGMvMrGp5RVPtApZ8 {\\\\n color: red;\\\\n}\\\\n\\", \\"\\"]);
// Exports
exports.locals = {
\\"foo\\": \\"bar\\",
\\"myBtnInfo_isDisabled\\": \\"value\\",
\\"btnInfo_isDisabled\\": \\"erBXHZCN_thRYfCnk-aH8\\",
\\"btnInfo_isDisabled_1\\": \\"_2YsQE-S0o0NRXfC6XNApz2\\",
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\"
\\"simple\\": \\"_3gGBcJHZU3seQVP5aq7Ksq\\",
\\"foo_bar\\": \\"jHKqWGMvMrGp5RVPtApZ8\\"
};
module.exports = exports;
"
@@ -281,6 +307,10 @@ Array [
a {
color: yellow;
}
.jHKqWGMvMrGp5RVPtApZ8 {
color: red;
}
",
"",
],
4 changes: 4 additions & 0 deletions test/fixtures/modules/localsConvention/localsConvention.css
View file
Original file line number Diff line number Diff line change
@@ -18,3 +18,7 @@ a {
foo: bar;
my-btn-info_is-disabled: value;
}

.foo_bar {
color: red;
}