diff --git a/src/index.js b/src/index.js index 6039de07..cda0bf07 100644 --- a/src/index.js +++ b/src/index.js @@ -11,7 +11,7 @@ import schema from './plugin-options.json'; import { MODULE_TYPE, compareModulesByIdentifier } from './utils'; // webpack 5 exposes the sources property to ensure the right version of webpack-sources is used -const { ConcatSource, SourceMapSource, OriginalSource } = +const { ConcatSource, SourceMapSource, RawSource } = // eslint-disable-next-line global-require webpack.sources || require('webpack-sources'); @@ -688,7 +688,7 @@ class MiniCssExtractPlugin { ); } else { source.add( - new OriginalSource(content, m.readableIdentifier(requestShortener)) + new RawSource(content, m.readableIdentifier(requestShortener)) ); } source.add('\n'); diff --git a/test/cases/devtool-source-map-no-source-maps-from-css-loader/expected/main.css b/test/cases/devtool-source-map-from-loaders/expected/webpack-4/main.css similarity index 100% rename from test/cases/devtool-source-map-no-source-maps-from-css-loader/expected/main.css rename to test/cases/devtool-source-map-from-loaders/expected/webpack-4/main.css diff --git a/test/cases/devtool-source-map-from-loaders/expected/webpack-4/main.css.map b/test/cases/devtool-source-map-from-loaders/expected/webpack-4/main.css.map new file mode 100644 index 00000000..bb767168 --- /dev/null +++ b/test/cases/devtool-source-map-from-loaders/expected/webpack-4/main.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["webpack:///./style.css"],"names":[],"mappings":"AAAA;EACE,eAAe;AACjB","file":"main.css","sourcesContent":["body {\n background: red;\n}\n"],"sourceRoot":""} \ No newline at end of file diff --git a/test/cases/devtool-source-map-from-loaders/expected/webpack-5/main.css b/test/cases/devtool-source-map-from-loaders/expected/webpack-5/main.css new file mode 100644 index 00000000..8f8cf968 --- /dev/null +++ b/test/cases/devtool-source-map-from-loaders/expected/webpack-5/main.css @@ -0,0 +1,6 @@ +body { + background: red; +} + + +/*# sourceMappingURL=main.css.map*/ \ No newline at end of file diff --git a/test/cases/devtool-source-map-from-loaders/expected/webpack-5/main.css.map b/test/cases/devtool-source-map-from-loaders/expected/webpack-5/main.css.map new file mode 100644 index 00000000..bb767168 --- /dev/null +++ b/test/cases/devtool-source-map-from-loaders/expected/webpack-5/main.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["webpack:///./style.css"],"names":[],"mappings":"AAAA;EACE,eAAe;AACjB","file":"main.css","sourcesContent":["body {\n background: red;\n}\n"],"sourceRoot":""} \ No newline at end of file diff --git a/test/cases/devtool-source-map-no-source-maps-from-css-loader/index.js b/test/cases/devtool-source-map-from-loaders/index.js similarity index 100% rename from test/cases/devtool-source-map-no-source-maps-from-css-loader/index.js rename to test/cases/devtool-source-map-from-loaders/index.js diff --git a/test/cases/devtool-source-map-no-source-maps-from-css-loader/style.css b/test/cases/devtool-source-map-from-loaders/style.css similarity index 100% rename from test/cases/devtool-source-map-no-source-maps-from-css-loader/style.css rename to test/cases/devtool-source-map-from-loaders/style.css diff --git a/test/cases/devtool-source-map-from-loaders/webpack.config.js b/test/cases/devtool-source-map-from-loaders/webpack.config.js new file mode 100644 index 00000000..c9443105 --- /dev/null +++ b/test/cases/devtool-source-map-from-loaders/webpack.config.js @@ -0,0 +1,27 @@ +import Self from '../../../src'; + +module.exports = { + entry: './index.js', + devtool: 'source-map', + module: { + rules: [ + { + test: /\.css$/, + use: [ + Self.loader, + { + loader: 'css-loader', + options: { + sourceMap: true, + }, + }, + ], + }, + ], + }, + plugins: [ + new Self({ + filename: '[name].css', + }), + ], +}; diff --git a/test/cases/devtool-source-map-no-source-maps-from-css-loader/expected/main.css.map b/test/cases/devtool-source-map-no-source-maps-from-css-loader/expected/main.css.map deleted file mode 100644 index 5acba1b7..00000000 --- a/test/cases/devtool-source-map-no-source-maps-from-css-loader/expected/main.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["webpack:///./style.css"],"names":[],"mappings":"AAAA;AACA;AACA","file":"main.css","sourcesContent":["body {\n background: red;\n}\n"],"sourceRoot":""} \ No newline at end of file diff --git a/test/cases/devtool-source-map-no-source-maps-from-loaders/expected/webpack-4/main.css b/test/cases/devtool-source-map-no-source-maps-from-loaders/expected/webpack-4/main.css new file mode 100644 index 00000000..8f8cf968 --- /dev/null +++ b/test/cases/devtool-source-map-no-source-maps-from-loaders/expected/webpack-4/main.css @@ -0,0 +1,6 @@ +body { + background: red; +} + + +/*# sourceMappingURL=main.css.map*/ \ No newline at end of file diff --git a/test/cases/devtool-source-map-no-source-maps-from-loaders/expected/webpack-4/main.css.map b/test/cases/devtool-source-map-no-source-maps-from-loaders/expected/webpack-4/main.css.map new file mode 100644 index 00000000..b350621d --- /dev/null +++ b/test/cases/devtool-source-map-no-source-maps-from-loaders/expected/webpack-4/main.css.map @@ -0,0 +1 @@ +{"version":3,"sources":[],"names":[],"mappings":"","file":"main.css","sourceRoot":""} \ No newline at end of file diff --git a/test/cases/devtool-source-map-no-source-maps-from-loaders/expected/webpack-5/main.css b/test/cases/devtool-source-map-no-source-maps-from-loaders/expected/webpack-5/main.css new file mode 100644 index 00000000..cebc5c1c --- /dev/null +++ b/test/cases/devtool-source-map-no-source-maps-from-loaders/expected/webpack-5/main.css @@ -0,0 +1,4 @@ +body { + background: red; +} + diff --git a/test/cases/devtool-source-map-no-source-maps-from-loaders/index.js b/test/cases/devtool-source-map-no-source-maps-from-loaders/index.js new file mode 100644 index 00000000..aa3357bf --- /dev/null +++ b/test/cases/devtool-source-map-no-source-maps-from-loaders/index.js @@ -0,0 +1 @@ +import './style.css'; diff --git a/test/cases/devtool-source-map-no-source-maps-from-loaders/style.css b/test/cases/devtool-source-map-no-source-maps-from-loaders/style.css new file mode 100644 index 00000000..67ce83e4 --- /dev/null +++ b/test/cases/devtool-source-map-no-source-maps-from-loaders/style.css @@ -0,0 +1,3 @@ +body { + background: red; +} diff --git a/test/cases/devtool-source-map-no-source-maps-from-css-loader/webpack.config.js b/test/cases/devtool-source-map-no-source-maps-from-loaders/webpack.config.js similarity index 100% rename from test/cases/devtool-source-map-no-source-maps-from-css-loader/webpack.config.js rename to test/cases/devtool-source-map-no-source-maps-from-loaders/webpack.config.js