Skip to content
This repository was archived by the owner on Oct 29, 2021. It is now read-only.

Commit b2c273b

Browse files
dependabot-preview[bot]silvenon
dependabot-preview[bot]
authored and
silvenon
committed
Bump css-loader from 1.0.1 to 3.2.0
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.1 to 3.2.0. - [Release notes](https://github.com/webpack-contrib/css-loader/releases) - [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/css-loader@v1.0.1...v3.2.0) Renames `exportOnlyLocals` option to `onlyLocals` to match `css-loader`. Normalizes machine-specific directories in snapshots so that they look the same on CI. Signed-off-by: dependabot-preview[bot] <[email protected]>
1 parent 2c36cac commit b2c273b

File tree

10 files changed

+188
-209
lines changed

10 files changed

+188
-209
lines changed

‎example/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"babel-loader": "^8.0.4",
1313
"cloudinary-core": "^2.5.0",
1414
"css-customs-loader": "^0.3.0",
15-
"css-loader": "^1.0.1",
15+
"css-loader": "^3.2.0",
1616
"html-webpack-plugin": "^3.2.0",
1717
"postcss-loader": "^3.0.0",
1818
"postcss-preset-env": "^6.4.0",

‎packages/css-customs-loader/lib/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const rawLoader = require.resolve('raw-loader')
1111

1212
module.exports = async function(content, sourceMap, meta) {
1313
const callback = this.async()
14-
const { exportOnlyLocals = false } = getOptions(this) || {}
14+
const { onlyLocals = false } = getOptions(this) || {}
1515
const presetEnvOptions = {
1616
stage: 0,
1717
}
@@ -137,7 +137,7 @@ module.exports = async function(content, sourceMap, meta) {
137137
to: undefined,
138138
})
139139

140-
const exportObj = exportOnlyLocals ? 'module.exports' : 'exports.locals'
140+
const exportObj = onlyLocals ? 'module.exports' : 'exports.locals'
141141
const exportContent = [
142142
`${exportObj} = ${exportObj} || {};`,
143143
...Object.entries(extractedCustoms).map(

‎packages/css-customs-loader/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"raw-loader": "^0.5.1"
3232
},
3333
"devDependencies": {
34-
"css-loader": "^1.0.1",
34+
"css-loader": "^3.2.0",
3535
"jest": "^24.5.0",
3636
"less": "^3.9.0",
3737
"less-loader": "^5.0.0",

‎packages/css-customs-loader/readme.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module.exports = {
2424
loader: 'css-customs-loader'
2525
// defaults
2626
options: {
27-
exportOnlyLocals: false,
27+
onlyLocals: false,
2828
},
2929
},
3030
'css-loader?importLoaders=1',
@@ -56,16 +56,16 @@ module.exports = {
5656

5757
### Options
5858

59-
#### `exportOnlyLocals`
59+
#### `onlyLocals`
6060

61-
This option should be enabled in situations like pre-rendering. You should combine it with [`exportOnlyLocals`][exportOnlyLocals] option in css-loader v2 or [`css-loader/locals`][css-loader-locals] loader in css-loader v1. (Don't use style-loader when pre-rendering.)
61+
This option should be enabled in situations like pre-rendering. You should combine it with [`onlyLocals`][onlyLocals] option in css-loader v2 or [`css-loader/locals`][css-loader-locals] loader in css-loader v1. (Don't use style-loader when pre-rendering.)
6262

6363
## Usage
6464

6565
See usage instructions in the [main readme][basic-usage].
6666

6767
[customs]: https://github.com/silvenon/css-customs/blob/master/readme.md#css-customs
68-
[exportOnlyLocals]: https://github.com/webpack-contrib/css-loader#exportonlylocals
68+
[onlyLocals]: https://github.com/webpack-contrib/css-loader#onlyLocals
6969
[css-loader-locals]: https://github.com/webpack-contrib/css-loader/blob/v1.0.1/locals.js
7070
[postcss-config]: https://github.com/michael-ciniawsky/postcss-load-config
7171
[basic-usage]: https://github.com/silvenon/css-customs/blob/master/readme.md#basic-usage

‎packages/css-customs-loader/test/__snapshots__/index.test.js.snap

Lines changed: 34 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`can export only locals 1`] = `
4-
"module.exports = {
4+
"// Exports
5+
module.exports = {
56
\\"text\\": \\"_3KySKA6rf07sl0ilq7bBBm\\"
67
};
78
@@ -20,9 +21,9 @@ module.exports[\\"customSelectors\\"] = {
2021
exports[`emits an error when css-customs-loader is placed after css-loader 1`] = `
2122
"./fixtures/basic.css
2223
Module build failed (from ../index.js):
23-
Error: css-customs-loader should be added BEFORE css-loader. /Users/silvenon/Code/css-customs/node_modules/css-loader/index.js?importLoaders=2!/Users/silvenon/Code/css-customs/packages/css-customs-loader/index.js!/Users/silvenon/Code/css-customs/node_modules/postcss-loader/src/index.js!/Users/silvenon/Code/css-customs/packages/css-customs-loader/test/fixtures/basic.css
24-
at Object.<anonymous>.exports.addBeforeCssLoader.request [as addBeforeCssLoader] (/Users/silvenon/Code/css-customs/packages/css-customs-loader/lib/errors.js:3:6)
25-
at Object.addBeforeCssLoader (/Users/silvenon/Code/css-customs/packages/css-customs-loader/lib/index.js:20:27)"
24+
Error: css-customs-loader should be added BEFORE css-loader. <CWD>/node_modules/css-loader/dist/cjs.js??ref--4-0!<CWD>/packages/css-customs-loader/index.js!<CWD>/node_modules/postcss-loader/src/index.js!<CWD>/packages/css-customs-loader/test/fixtures/basic.css
25+
at Object.<anonymous>.exports.addBeforeCssLoader (<CWD>/packages/css-customs-loader/lib/errors.js:3:6)
26+
at Object.addBeforeCssLoader (<CWD>/packages/css-customs-loader/lib/index.js:20:27)"
2627
`;
2728
2829
exports[`emits an error when postcss-loader is missing 1`] = `
@@ -31,16 +32,16 @@ Module build failed (from ../index.js):
3132
Error:
3233
postcss-loader is missing, you need to use it in order for css-customs-loader to work properly.
3334
34-
at Object.<anonymous> (/Users/silvenon/Code/css-customs/packages/css-customs-loader/lib/errors.js:8:32)
35-
at Runtime._execModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:867:68)
36-
at Runtime._loadModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:577:12)
37-
at Runtime.requireModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:433:10)
38-
at Runtime.requireModuleOrMock (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:598:21)
39-
at Object.require (/Users/silvenon/Code/css-customs/packages/css-customs-loader/lib/index.js:8:15)
40-
at Runtime._execModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:867:68)
41-
at Runtime._loadModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:577:12)
42-
at Runtime.requireModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:433:10)
43-
at Runtime.requireModuleOrMock (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:598:21)"
35+
at Object.<anonymous> (<CWD>/packages/css-customs-loader/lib/errors.js:8:32)
36+
at Runtime._execModule (<CWD>/node_modules/jest-runtime/build/index.js:867:68)
37+
at Runtime._loadModule (<CWD>/node_modules/jest-runtime/build/index.js:577:12)
38+
at Runtime.requireModule (<CWD>/node_modules/jest-runtime/build/index.js:433:10)
39+
at Runtime.requireModuleOrMock (<CWD>/node_modules/jest-runtime/build/index.js:598:21)
40+
at Object.require (<CWD>/packages/css-customs-loader/lib/index.js:8:15)
41+
at Runtime._execModule (<CWD>/node_modules/jest-runtime/build/index.js:867:68)
42+
at Runtime._loadModule (<CWD>/node_modules/jest-runtime/build/index.js:577:12)
43+
at Runtime.requireModule (<CWD>/node_modules/jest-runtime/build/index.js:433:10)
44+
at Runtime.requireModuleOrMock (<CWD>/node_modules/jest-runtime/build/index.js:598:21)"
4445
`;
4546
4647
exports[`emits an error when postcss-preset-env is missing 1`] = `
@@ -49,27 +50,23 @@ Module build failed (from ../index.js):
4950
Error:
5051
postcss-preset-env is missing from your plugins, you need to use it in order for css-customs-loader to work properly.
5152
52-
at Object.<anonymous> (/Users/silvenon/Code/css-customs/packages/css-customs-loader/lib/errors.js:14:35)
53-
at Runtime._execModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:867:68)
54-
at Runtime._loadModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:577:12)
55-
at Runtime.requireModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:433:10)
56-
at Runtime.requireModuleOrMock (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:598:21)
57-
at Object.require (/Users/silvenon/Code/css-customs/packages/css-customs-loader/lib/index.js:8:15)
58-
at Runtime._execModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:867:68)
59-
at Runtime._loadModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:577:12)
60-
at Runtime.requireModule (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:433:10)
61-
at Runtime.requireModuleOrMock (/Users/silvenon/Code/css-customs/node_modules/jest-runtime/build/index.js:598:21)"
53+
at Object.<anonymous> (<CWD>/packages/css-customs-loader/lib/errors.js:14:35)
54+
at Runtime._execModule (<CWD>/node_modules/jest-runtime/build/index.js:867:68)
55+
at Runtime._loadModule (<CWD>/node_modules/jest-runtime/build/index.js:577:12)
56+
at Runtime.requireModule (<CWD>/node_modules/jest-runtime/build/index.js:433:10)
57+
at Runtime.requireModuleOrMock (<CWD>/node_modules/jest-runtime/build/index.js:598:21)
58+
at Object.require (<CWD>/packages/css-customs-loader/lib/index.js:8:15)
59+
at Runtime._execModule (<CWD>/node_modules/jest-runtime/build/index.js:867:68)
60+
at Runtime._loadModule (<CWD>/node_modules/jest-runtime/build/index.js:577:12)
61+
at Runtime.requireModule (<CWD>/node_modules/jest-runtime/build/index.js:433:10)
62+
at Runtime.requireModuleOrMock (<CWD>/node_modules/jest-runtime/build/index.js:598:21)"
6263
`;
6364
6465
exports[`exposes CSS Modules in the same object as customs 1`] = `
65-
"exports = module.exports = require(\\"<path to node_modules>/css-loader/lib/css-base.js\\")(false);
66-
// imports
67-
68-
69-
// module
66+
"exports = module.exports = require(\\"<relative path to CWD>/node_modules/css-loader/dist/runtime/api.js\\")(false);
67+
// Module
7068
exports.push([module.id, \\":root {\\\\n --primary-color: lightblue;\\\\n}\\\\n\\\\n._3KySKA6rf07sl0ilq7bBBm {\\\\n color: lightblue;\\\\n color: var(--primary-color);\\\\n}\\\\n\\", \\"\\"]);
71-
72-
// exports
69+
// Exports
7370
exports.locals = {
7471
\\"text\\": \\"_3KySKA6rf07sl0ilq7bBBm\\"
7572
};
@@ -87,15 +84,10 @@ exports.locals[\\"customSelectors\\"] = {
8784
`;
8885
8986
exports[`exposes CSS customs in the default export object 1`] = `
90-
"exports = module.exports = require(\\"<path to node_modules>/css-loader/lib/css-base.js\\")(false);
91-
// imports
92-
93-
94-
// module
87+
"exports = module.exports = require(\\"<relative path to CWD>/node_modules/css-loader/dist/runtime/api.js\\")(false);
88+
// Module
9589
exports.push([module.id, \\":root {\\\\n --primary-color: lightblue;\\\\n}\\\\n\\", \\"\\"]);
9690
97-
// exports
98-
9991
exports.locals = exports.locals || {};
10092
exports.locals[\\"customMedia\\"] = {
10193
\\"--narrow-window\\": \\"(max-width: 30em)\\"
@@ -109,15 +101,10 @@ exports.locals[\\"customSelectors\\"] = {
109101
`;
110102
111103
exports[`uses PostCSS plugins before postcss-preset-env 1`] = `
112-
"exports = module.exports = require(\\"<path to node_modules>/css-loader/lib/css-base.js\\")(false);
113-
// imports
114-
115-
116-
// module
104+
"exports = module.exports = require(\\"<relative path to CWD>/node_modules/css-loader/dist/runtime/api.js\\")(false);
105+
// Module
117106
exports.push([module.id, \\":root {\\\\n --primary-color: #1da1f2;\\\\n}\\\\n\\", \\"\\"]);
118107
119-
// exports
120-
121108
exports.locals = exports.locals || {};
122109
exports.locals[\\"customMedia\\"] = {};
123110
exports.locals[\\"customProperties\\"] = {
@@ -127,15 +114,10 @@ exports.locals[\\"customSelectors\\"] = {};"
127114
`;
128115
129116
exports[`uses webpack loaders after postcss-loader 1`] = `
130-
"exports = module.exports = require(\\"<path to node_modules>/css-loader/lib/css-base.js\\")(false);
131-
// imports
132-
133-
134-
// module
117+
"exports = module.exports = require(\\"<relative path to CWD>/node_modules/css-loader/dist/runtime/api.js\\")(false);
118+
// Module
135119
exports.push([module.id, \\":root {\\\\n --primary-color: lightblue;\\\\n}\\\\n.text {\\\\n color: lightblue;\\\\n color: var(--primary-color);\\\\n}\\\\n\\", \\"\\"]);
136120
137-
// exports
138-
139121
exports.locals = exports.locals || {};
140122
exports.locals[\\"customMedia\\"] = {};
141123
exports.locals[\\"customProperties\\"] = {

‎packages/css-customs-loader/test/compile.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ const webpack = require('webpack')
22
const MemoryFs = require('memory-fs')
33
const path = require('path')
44

5+
const normalizeOutput = str =>
6+
str
7+
// for CI
8+
.replace(new RegExp(process.cwd(), 'g'), '<CWD>')
9+
// for Node versions
10+
.replace('.request [as addBeforeCssLoader]', '')
11+
512
// https://webpack.js.org/contribute/writing-a-loader/#testing
613

714
module.exports = ({ entry, writeToDisk = false, rules }) => {
@@ -24,10 +31,10 @@ module.exports = ({ entry, writeToDisk = false, rules }) => {
2431
return new Promise((resolve, reject) => {
2532
compiler.run((err, stats) => {
2633
if (err != null) {
27-
return reject(err)
34+
return reject(normalizeOutput(err))
2835
}
2936
if (stats.hasErrors()) {
30-
return reject(stats.toJson().errors.join('\n\n'))
37+
return reject(normalizeOutput(stats.toJson().errors.join('\n\n')))
3138
}
3239
resolve({ stats, entry })
3340
})

‎packages/css-customs-loader/test/index.test.js

Lines changed: 62 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const path = require('path')
12
const compile = require('./compile')
23

34
const cssCustomsLoader = require.resolve('../')
@@ -8,7 +9,11 @@ const getCompiledOutput = ({ stats, entry }) =>
89
({ name, identifier }) =>
910
name.includes(entry) && identifier.includes(cssCustomsLoader)
1011
)
11-
.source.replace(/(["'])(\.\.\/)+node_modules/, '$1<path to node_modules>')
12+
// normalize for CI
13+
.source.replace(
14+
path.relative(`${__dirname}/fixtures`, process.cwd()),
15+
'<relative path to CWD>'
16+
)
1217

1318
describe(`emits an error`, () => {
1419
test(`when css-customs-loader is placed after css-loader`, async () => {
@@ -19,7 +24,12 @@ describe(`emits an error`, () => {
1924
{
2025
test: /\.css$/,
2126
use: [
22-
'css-loader?importLoaders=2',
27+
{
28+
loader: 'css-loader',
29+
options: {
30+
importLoaders: 2,
31+
},
32+
},
2333
cssCustomsLoader,
2434
'postcss-loader',
2535
],
@@ -38,7 +48,12 @@ describe(`emits an error`, () => {
3848
test: /\.css$/,
3949
use: [
4050
cssCustomsLoader,
41-
'css-loader?importLoaders=1',
51+
{
52+
loader: 'css-loader',
53+
options: {
54+
importLoaders: 1,
55+
},
56+
},
4257
{
4358
loader: 'postcss-loader',
4459
options: {
@@ -73,7 +88,16 @@ it(`exposes CSS customs in the default export object`, async () => {
7388
rules: [
7489
{
7590
test: /\.css$/,
76-
use: [cssCustomsLoader, 'css-loader?importLoaders=1', 'postcss-loader'],
91+
use: [
92+
cssCustomsLoader,
93+
{
94+
loader: 'css-loader',
95+
options: {
96+
importLoaders: 1,
97+
},
98+
},
99+
'postcss-loader',
100+
],
77101
},
78102
],
79103
})
@@ -89,7 +113,13 @@ it(`exposes CSS Modules in the same object as customs`, async () => {
89113
test: /\.css$/,
90114
use: [
91115
cssCustomsLoader,
92-
'css-loader?importLoaders=1&modules',
116+
{
117+
loader: 'css-loader',
118+
options: {
119+
importLoaders: 1,
120+
modules: true,
121+
},
122+
},
93123
'postcss-loader',
94124
],
95125
},
@@ -106,8 +136,15 @@ it(`can export only locals`, async () => {
106136
{
107137
test: /\.css$/,
108138
use: [
109-
`${cssCustomsLoader}?exportOnlyLocals`,
110-
'css-loader/locals?importLoaders=1&modules',
139+
`${cssCustomsLoader}?onlyLocals`,
140+
{
141+
loader: 'css-loader',
142+
options: {
143+
importLoaders: 1,
144+
modules: true,
145+
onlyLocals: true,
146+
},
147+
},
111148
'postcss-loader',
112149
],
113150
},
@@ -126,7 +163,12 @@ it(`supports files with external @imports`, async () => {
126163
include: `${__dirname}/fixtures`,
127164
use: [
128165
cssCustomsLoader,
129-
'css-loader?importLoaders=1',
166+
{
167+
loader: 'css-loader',
168+
options: {
169+
importLoaders: 1,
170+
},
171+
},
130172
{
131173
loader: 'postcss-loader',
132174
options: {
@@ -147,7 +189,12 @@ it(`uses PostCSS plugins before postcss-preset-env`, async () => {
147189
test: /\.css$/,
148190
use: [
149191
cssCustomsLoader,
150-
'css-loader?importLoaders=1',
192+
{
193+
loader: 'css-loader',
194+
options: {
195+
importLoaders: 1,
196+
},
197+
},
151198
{
152199
loader: 'postcss-loader',
153200
options: {
@@ -173,7 +220,12 @@ it('uses webpack loaders after postcss-loader', async () => {
173220
test: /\.less$/,
174221
use: [
175222
cssCustomsLoader,
176-
'css-loader?importLoaders=2',
223+
{
224+
loader: 'css-loader',
225+
options: {
226+
importLoaders: 2,
227+
},
228+
},
177229
'postcss-loader',
178230
'less-loader',
179231
],

‎packages/gatsby-plugin-css-customs/gatsby-node.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports.onCreateWebpackConfig = ({
2121
const cssCustomsLoader = {
2222
loader: require.resolve('css-customs-loader'),
2323
options: {
24-
exportOnlyLocals: stage.includes('html'),
24+
onlyLocals: stage.includes('html'),
2525
},
2626
}
2727

0 commit comments

Comments
 (0)