From bac3930b161e9bbdc5c49c3a8d5b51be5f89cf32 Mon Sep 17 00:00:00 2001 From: zackjackson Date: Sun, 27 Jan 2019 15:06:31 -0800 Subject: [PATCH] test: fixing tests removing hot loader to fix tests --- package-lock.json | 103 +++++------------- package.json | 4 +- src/loader.js | 6 +- ...e82.css => style.9b11dfbd73d90b346d16.css} | 0 ...e33.css => style.b62a24baf4785af5a972.css} | 0 5 files changed, 33 insertions(+), 80 deletions(-) rename test/cases/js-hash/expected/{style.c69d9c57cb899f95ee82.css => style.9b11dfbd73d90b346d16.css} (100%) rename test/cases/js-hash/expected/{style.185da89e33584d37fe33.css => style.b62a24baf4785af5a972.css} (100%) diff --git a/package-lock.json b/package-lock.json index 479641c5..dac81a50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5797,7 +5797,6 @@ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", "dev": true, - "optional": true, "requires": { "nan": "2.11.1", "node-pre-gyp": "0.10.0" @@ -5806,8 +5805,7 @@ "abbrev": { "version": "1.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ansi-regex": { "version": "2.1.1", @@ -5817,14 +5815,12 @@ "aproba": { "version": "1.2.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "are-we-there-yet": { "version": "1.1.4", "bundled": true, "dev": true, - "optional": true, "requires": { "delegates": "1.0.0", "readable-stream": "2.3.6" @@ -5847,8 +5843,7 @@ "chownr": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "code-point-at": { "version": "1.1.0", @@ -5868,14 +5863,12 @@ "core-util-is": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "debug": { "version": "2.6.9", "bundled": true, "dev": true, - "optional": true, "requires": { "ms": "2.0.0" } @@ -5883,26 +5876,22 @@ "deep-extend": { "version": "0.5.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "delegates": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "detect-libc": { "version": "1.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "fs-minipass": { "version": "1.2.5", "bundled": true, "dev": true, - "optional": true, "requires": { "minipass": "2.2.4" } @@ -5910,14 +5899,12 @@ "fs.realpath": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "gauge": { "version": "2.7.4", "bundled": true, "dev": true, - "optional": true, "requires": { "aproba": "1.2.0", "console-control-strings": "1.1.0", @@ -5933,7 +5920,6 @@ "version": "7.1.2", "bundled": true, "dev": true, - "optional": true, "requires": { "fs.realpath": "1.0.0", "inflight": "1.0.6", @@ -5946,14 +5932,12 @@ "has-unicode": { "version": "2.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "iconv-lite": { "version": "0.4.21", "bundled": true, "dev": true, - "optional": true, "requires": { "safer-buffer": "2.1.2" } @@ -5962,7 +5946,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimatch": "3.0.4" } @@ -5971,7 +5954,6 @@ "version": "1.0.6", "bundled": true, "dev": true, - "optional": true, "requires": { "once": "1.4.0", "wrappy": "1.0.2" @@ -5985,8 +5967,7 @@ "ini": { "version": "1.3.5", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "is-fullwidth-code-point": { "version": "1.0.0", @@ -5999,8 +5980,7 @@ "isarray": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minimatch": { "version": "3.0.4", @@ -6028,7 +6008,6 @@ "version": "1.1.0", "bundled": true, "dev": true, - "optional": true, "requires": { "minipass": "2.2.4" } @@ -6044,14 +6023,12 @@ "ms": { "version": "2.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "needle": { "version": "2.2.0", "bundled": true, "dev": true, - "optional": true, "requires": { "debug": "2.6.9", "iconv-lite": "0.4.21", @@ -6062,7 +6039,6 @@ "version": "0.10.0", "bundled": true, "dev": true, - "optional": true, "requires": { "detect-libc": "1.0.3", "mkdirp": "0.5.1", @@ -6080,7 +6056,6 @@ "version": "4.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "abbrev": "1.1.1", "osenv": "0.1.5" @@ -6089,14 +6064,12 @@ "npm-bundled": { "version": "1.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "npm-packlist": { "version": "1.1.10", "bundled": true, "dev": true, - "optional": true, "requires": { "ignore-walk": "3.0.1", "npm-bundled": "1.0.3" @@ -6106,7 +6079,6 @@ "version": "4.1.2", "bundled": true, "dev": true, - "optional": true, "requires": { "are-we-there-yet": "1.1.4", "console-control-strings": "1.1.0", @@ -6122,8 +6094,7 @@ "object-assign": { "version": "4.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "once": { "version": "1.4.0", @@ -6136,20 +6107,17 @@ "os-homedir": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "os-tmpdir": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "osenv": { "version": "0.1.5", "bundled": true, "dev": true, - "optional": true, "requires": { "os-homedir": "1.0.2", "os-tmpdir": "1.0.2" @@ -6158,20 +6126,17 @@ "path-is-absolute": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "process-nextick-args": { "version": "2.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "rc": { "version": "1.2.7", "bundled": true, "dev": true, - "optional": true, "requires": { "deep-extend": "0.5.1", "ini": "1.3.5", @@ -6182,8 +6147,7 @@ "minimist": { "version": "1.2.0", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -6191,7 +6155,6 @@ "version": "2.3.6", "bundled": true, "dev": true, - "optional": true, "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", @@ -6206,7 +6169,6 @@ "version": "2.6.2", "bundled": true, "dev": true, - "optional": true, "requires": { "glob": "7.1.2" } @@ -6219,32 +6181,27 @@ "safer-buffer": { "version": "2.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "sax": { "version": "1.2.4", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "semver": { "version": "5.5.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "set-blocking": { "version": "2.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "signal-exit": { "version": "3.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "string-width": { "version": "1.0.2", @@ -6260,7 +6217,6 @@ "version": "1.1.1", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "5.1.1" } @@ -6276,14 +6232,12 @@ "strip-json-comments": { "version": "2.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "tar": { "version": "4.4.1", "bundled": true, "dev": true, - "optional": true, "requires": { "chownr": "1.0.1", "fs-minipass": "1.2.5", @@ -6297,14 +6251,12 @@ "util-deprecate": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "wide-align": { "version": "1.1.2", "bundled": true, "dev": true, - "optional": true, "requires": { "string-width": "1.0.2" } @@ -9946,8 +9898,7 @@ "version": "2.11.1", "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz", "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==", - "dev": true, - "optional": true + "dev": true }, "nanomatch": { "version": "1.2.13", diff --git a/package.json b/package.json index d9a4fd10..27749269 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,9 @@ "webpack": "^4.4.0" }, "dependencies": { - "loader-utils": "^1.2.3", - "normalize-url": "^4.1.0", "schema-utils": "^1.0.0", + "normalize-url": "^4.1.0", + "loader-utils": "^1.1.0", "webpack-sources": "^1.1.0" }, "devDependencies": { diff --git a/src/loader.js b/src/loader.js index 5bc47d3c..ed0018d5 100644 --- a/src/loader.js +++ b/src/loader.js @@ -49,6 +49,7 @@ const findModuleById = (modules, id) => { export function pitch(request) { const query = loaderUtils.getOptions(this) || {}; + const loaders = this.loaders.slice(this.loaderIndex + 1); this.addDependency(this.resourcePath); const childFilename = '*'; // eslint-disable-line no-path-concat @@ -136,7 +137,6 @@ export function pitch(request) { } else { text = text.map((line) => { const module = findModuleById(compilation.modules, line[0]); - return { identifier: module.identifier(), content: line[1], @@ -152,7 +152,9 @@ export function pitch(request) { let resultSource = `// extracted by ${pluginName}`; if (locals && typeof resultSource !== 'undefined') { const result = `\nmodule.exports = ${JSON.stringify(locals)};`; - resultSource += hotLoader(result, { context: this.context, query }); + resultSource += query.hot + ? hotLoader(result, { context: this.context, query }) + : ''; } return callback(null, resultSource); diff --git a/test/cases/js-hash/expected/style.c69d9c57cb899f95ee82.css b/test/cases/js-hash/expected/style.9b11dfbd73d90b346d16.css similarity index 100% rename from test/cases/js-hash/expected/style.c69d9c57cb899f95ee82.css rename to test/cases/js-hash/expected/style.9b11dfbd73d90b346d16.css diff --git a/test/cases/js-hash/expected/style.185da89e33584d37fe33.css b/test/cases/js-hash/expected/style.b62a24baf4785af5a972.css similarity index 100% rename from test/cases/js-hash/expected/style.185da89e33584d37fe33.css rename to test/cases/js-hash/expected/style.b62a24baf4785af5a972.css