Commit 734e5b0

authored

fix: serialize path query params without change (mzgoddard#408)

* fix: add query test * fix: serialize path query params without change * fixup! fix: serialize path query params without change

1 parent 6551c8e commit 734e5b0Copy full SHA for 734e5b0

File tree

+34

-4

lines changed

+34

-4

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ const relateNormalPath = (exports.relateNormalPath = function relateNormalPath(`
`26`	`26`	`if (key === '') {`
`27`	`27`	`return key;`
`28`	`28`	`}`
`29`		`- return path.relative(compilerContext(compiler), key).replace(/\\/g, '/');`
	`29`	`+ const rel = path.relative(compilerContext(compiler), key.split('?')[0]);`
	`30`	`+ return [rel.replace(/\\/g, '/')].concat(key.split('?').slice(1)).join('?');`
`30`	`31`	`});`
`31`	`32`
`32`	`33`	`const relateNormalRequest = (exports.relateNormalRequest = function relateNormalRequest(`
`@@ -88,7 +89,10 @@ const contextNormalPath = (exports.contextNormalPath = function contextNormalPat`
`88`	`89`	`if (key === '') {`
`89`	`90`	`return '';`
`90`	`91`	`}`
`91`		`- return path.resolve(compilerContext(compiler), key).replace(/\//g, path.sep);`
	`92`	`+ const abs = path.resolve(compilerContext(compiler), key.split('?')[0]);`
	`93`	`+ return [abs.replace(/\//g, path.sep)]`
	`94`	`+ .concat(key.split('?').slice(1))`
	`95`	`+ .join('?');`
`92`	`96`	`});`
`93`	`97`
`94`	`98`	`const contextNormalRequest = (exports.contextNormalRequest = function contextNormalRequest(`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,12 +7,14 @@ var describeWP = require('./util').describeWP;`
`7`	`7`
`8`	`8`	`describeWP(3)('basic webpack 3 use - compiles identically', function() {`
`9`	`9`
	`10`	`+ itCompilesTwice('base-1dep-query');`
	`11`	`+ itCompilesTwice('base-1dep-query', {exportStats: true});`
	`12`	`+ itCompilesTwice('base-devtool-nosources-source-map');`
	`13`	`+ itCompilesTwice('base-devtool-nosources-source-map', {exportStats: true});`
`10`	`14`	`itCompilesTwice('base-es2015-module-export-star');`
`11`	`15`	`itCompilesTwice('base-es2015-module-export-star', {exportStats: true});`
`12`	`16`	`itCompilesTwice('base-es2015-module-export-star-alt');`
`13`	`17`	`itCompilesTwice('base-es2015-module-export-star-alt', {exportStats: true});`
`14`		`- itCompilesTwice('base-devtool-nosources-source-map');`
`15`		`- itCompilesTwice('base-devtool-nosources-source-map', {exportStats: true});`
`16`	`18`
`17`	`19`	`itCompilesHardModules('base-es2015-module-export-star', ['./export.js', './fab.js', './fib.js', './index.js']);`
`18`	`20`	`itCompilesHardModules('base-es2015-module-export-star-alt', ['./export.js', './fab.js', './fib.js', './index.js']);`

Lines changed: 3 additions & 0 deletions

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+var fib = require('./fib?http://localhost');`
	`2`	`+`
	`3`	`+console.log(fib(3));`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,18 @@`
	`1`	`+var HardSourceWebpackPlugin = require('../../..');`
	`2`	`+`
	`3`	`+module.exports = {`
	`4`	`+ context: __dirname,`
	`5`	`+ entry: './index.js',`
	`6`	`+ output: {`
	`7`	`+ path: __dirname + '/tmp',`
	`8`	`+ filename: 'main.js',`
	`9`	`+ },`
	`10`	`+ plugins: [`
	`11`	`+ new HardSourceWebpackPlugin({`
	`12`	`+ cacheDirectory: 'cache',`
	`13`	`+ environmentHash: {`
	`14`	`+ root: __dirname + '/../../..',`
	`15`	`+ },`
	`16`	`+ }),`
	`17`	`+ ],`
	`18`	`+};`

Comments

(0)