Merge branch 'master' of https://github.com/webpack-contrib/css-loader

pillowfication · pillowfication · commit ffcda875fd10 · 2020-05-12T15:08:48.000-07:00
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -55,7 +55,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node-version: [8.x, 10.x, 12.x, 13.x]
+        node-version: [8.x, 10.x, 12.x, 14.x]
         webpack-version: [latest, next]
 
     runs-on: ${{ matrix.os }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 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.3](https://github.com/webpack-contrib/css-loader/compare/v3.5.2...v3.5.3) (2020-04-24)
+
+
+### Bug Fixes
+
+* add file from an error to file dependencies ([841423f](https://github.com/webpack-contrib/css-loader/commit/841423fca2932c18f8ac0cf0a1f0012fc0a62fb6))
+* avoid query string in source maps ([#1082](https://github.com/webpack-contrib/css-loader/issues/1082)) ([f64de13](https://github.com/webpack-contrib/css-loader/commit/f64de13f7377eff9501348cf26213212ca696913))
+
 ### [3.5.2](https://github.com/webpack-contrib/css-loader/compare/v3.5.1...v3.5.2) (2020-04-10)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "css-loader",
-  "version": "3.5.2-1",
+  "version": "3.5.3",
   "description": "css loader module for webpack",
   "license": "MIT",
   "repository": "webpack-contrib/css-loader",
@@ -54,40 +54,40 @@
     "postcss-modules-scope": "^2.2.0",
     "postcss-modules-values": "^3.0.0",
     "postcss-value-parser": "^4.0.3",
-    "schema-utils": "^2.6.5",
+    "schema-utils": "^2.6.6",
     "semver": "^6.3.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",
     "@babel/core": "^7.9.0",
-    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-env": "^7.9.5",
     "@commitlint/cli": "^8.3.5",
     "@commitlint/config-conventional": "^8.3.4",
     "@webpack-contrib/defaults": "^6.3.0",
     "@webpack-contrib/eslint-config-webpack": "^3.0.0",
-    "babel-jest": "^25.3.0",
+    "babel-jest": "^25.4.0",
     "cross-env": "^7.0.2",
     "del": "^5.1.0",
     "del-cli": "^3.0.0",
     "es-check": "^5.1.0",
     "eslint": "^6.8.0",
-    "eslint-config-prettier": "^6.10.1",
+    "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-import": "^2.20.2",
     "file-loader": "^6.0.0",
     "husky": "^4.2.5",
-    "jest": "^25.3.0",
-    "lint-staged": "^10.1.3",
+    "jest": "^25.4.0",
+    "lint-staged": "^10.1.7",
     "memfs": "^3.1.2",
     "npm-run-all": "^4.1.5",
     "postcss-loader": "^3.0.0",
     "postcss-preset-env": "^6.7.0",
-    "prettier": "^2.0.4",
+    "prettier": "^2.0.5",
     "sass": "^1.26.3",
     "sass-loader": "^8.0.2",
     "standard-version": "^7.1.0",
     "strip-ansi": "^6.0.0",
     "url-loader": "^4.1.0",
-    "webpack": "^4.42.1"
+    "webpack": "^4.43.0"
   },
   "keywords": [
     "webpack",
diff --git a/src/index.js b/src/index.js
@@ -82,8 +82,8 @@ export default function loader(content, map, meta) {
 
   postcss(plugins)
     .process(content, {
-      from: this.remainingRequest.split('!').pop(),
-      to: this.currentRequest.split('!').pop(),
+      from: this.resourcePath,
+      to: this.resourcePath,
       map: options.sourceMap
         ? {
             // Some loaders (example `"postcss-loader": "1.x.x"`) always generates source map, we should remove it
@@ -150,6 +150,10 @@ export default function loader(content, map, meta) {
       return callback(null, `${importCode}${moduleCode}${exportCode}`);
     })
     .catch((error) => {
+      if (error.file) {
+        this.addDependency(error.file);
+      }
+
       callback(
         error.name === 'CssSyntaxError' ? new CssSyntaxError(error) : error
       );
diff --git a/test/__snapshots__/sourceMap-option.test.js.snap b/test/__snapshots__/sourceMap-option.test.js.snap
@@ -294,6 +294,49 @@ Array [
 
 exports[`"sourceMap" option not specified should not generate source maps: warnings 1`] = `Array []`;
 
+exports[`"sourceMap" option true should generate source maps #2: errors 1`] = `Array []`;
+
+exports[`"sourceMap" option true should generate source maps #2: module 1`] = `
+"// Imports
+var ___CSS_LOADER_API_IMPORT___ = require(\\"../../../src/runtime/api.js\\");
+exports = ___CSS_LOADER_API_IMPORT___(true);
+// Module
+exports.push([module.id, \\".foo {\\\\n  color: red;\\\\n}\\\\n\\", \\"\\",{\\"version\\":3,\\"sources\\":[\\"with-query.css\\"],\\"names\\":[],\\"mappings\\":\\"AAAA;EACE,UAAU;AACZ\\",\\"file\\":\\"with-query.css\\",\\"sourcesContent\\":[\\".foo {\\\\n  color: red;\\\\n}\\\\n\\"]}]);
+// Exports
+module.exports = exports;
+"
+`;
+
+exports[`"sourceMap" option true should generate source maps #2: result 1`] = `
+Array [
+  Array [
+    "./source-map/with-query.css?url=false",
+    ".foo {
+  color: red;
+}
+",
+    "",
+    Object {
+      "file": "with-query.css",
+      "mappings": "AAAA;EACE,UAAU;AACZ",
+      "names": Array [],
+      "sources": Array [
+        "with-query.css",
+      ],
+      "sourcesContent": Array [
+        ".foo {
+  color: red;
+}
+",
+      ],
+      "version": 3,
+    },
+  ],
+]
+`;
+
+exports[`"sourceMap" option true should generate source maps #2: warnings 1`] = `Array []`;
+
 exports[`"sourceMap" option true should generate source maps when source maps equal to "null" from an other loader: errors 1`] = `Array []`;
 
 exports[`"sourceMap" option true should generate source maps when source maps equal to "null" from an other loader: module 1`] = `
diff --git a/test/fixtures/error.css b/test/fixtures/error.css
diff --git a/test/fixtures/error.js b/test/fixtures/error.js
@@ -1,4 +1,4 @@
-import css from './invalid.css';
+import css from './error.css';
 
 __export__ = css;
 
diff --git a/test/fixtures/source-map/with-query.css b/test/fixtures/source-map/with-query.css
@@ -0,0 +1,3 @@
+.foo {
+  color: red;
+}
diff --git a/test/fixtures/source-map/with-query.js b/test/fixtures/source-map/with-query.js
@@ -0,0 +1,5 @@
+import css from './with-query.css?url=false';
+
+__export__ = css;
+
+export default css;
diff --git a/test/helpers/ast-loader.js b/test/helpers/ast-loader.js
@@ -11,7 +11,10 @@ export default function astLoader(content) {
   const { spy = jest.fn() } = this.query;
 
   postcss([postcssPresetEnv({ stage: 0 })])
-    .process(content)
+    .process(content, {
+      // eslint-disable-next-line no-undefined
+      from: undefined,
+    })
     .then(({ css, map, root, messages }) => {
       const ast = {
         type: 'postcss',
diff --git a/test/loader.test.js b/test/loader.test.js
@@ -123,9 +123,14 @@ describe('loader', () => {
   });
 
   it('should throw error on invalid css syntax', async () => {
-    const compiler = getCompiler('./invalid.js', {});
+    const compiler = getCompiler('./error.js', {});
     const stats = await compile(compiler);
 
+    expect(
+      stats.compilation.fileDependencies.has(
+        path.resolve('./test/fixtures/error.css')
+      )
+    ).toBe(true);
     expect(getWarnings(stats)).toMatchSnapshot('warnings');
     expect(getErrors(stats)).toMatchSnapshot('errors');
   });
diff --git a/test/sourceMap-option.test.js b/test/sourceMap-option.test.js
@@ -45,6 +45,22 @@ describe('"sourceMap" option', () => {
       expect(getErrors(stats)).toMatchSnapshot('errors');
     });
 
+    it('should generate source maps #2', async () => {
+      const compiler = getCompiler('./source-map/with-query.js', {
+        sourceMap: true,
+      });
+      const stats = await compile(compiler);
+
+      expect(
+        getModuleSource('./source-map/with-query.css?url=false', stats)
+      ).toMatchSnapshot('module');
+      expect(
+        getExecutedCode('main.bundle.js', compiler, stats)
+      ).toMatchSnapshot('result');
+      expect(getWarnings(stats)).toMatchSnapshot('warnings');
+      expect(getErrors(stats)).toMatchSnapshot('errors');
+    });
+
     it('should generate source maps when source maps equal to "null" from an other loader', async () => {
       const compiler = getCompiler(
         './source-map/basic.js',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import css from './invalid.css';`
	`1`	`+import css from './error.css';`
`2`	`2`
`3`	`3`	`__export__ = css;`
`4`	`4`