Merge remote-tracking branch 'upstream/master' into gp/mime-content-type

Author: gpoitch

.travis.yml

@@ -5,15 +5,17 @@ jobs:
   include:
     - stage: Lint
       env: SCRIPT=lint
-      node_js: 'stable'
+      node_js: 6
     - &test
       stage: Test
       env: SCRIPT=test
-      node_js: 'stable'
+      node_js: 6
     - <<: *test
-      node_js: 'lts/*'
+      node_js: 8
     - <<: *test
-      node_js: 6
+      node_js: 10
+    - <<: *test
+      node_js: 11
 
 script: npm run $SCRIPT
 

CHANGELOG.md

@@ -2,13 +2,38 @@
 
 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.4.0](https://github.com/webpack/webpack-dev-middleware/compare/v3.3.0...v3.4.0) (2018-09-24)
+<a name="3.5.2"></a>
+## [3.5.2](https://github.com/webpack/webpack-dev-middleware/compare/v3.5.1...v3.5.2) (2019-02-06)
 
 
 ### Bug Fixes
 
-* **index:** don't modify the default behavior for `unhandledRejection` ([#340](https://github.com/webpack/webpack-dev-middleware/issues/340)) ([f0a8e3e](https://github.com/webpack/webpack-dev-middleware/commit/f0a8e3e))
-* **middleware:** replace `url-join` with `path.posix.join` ([#334](https://github.com/webpack/webpack-dev-middleware/issues/334)) ([d75802b](https://github.com/webpack/webpack-dev-middleware/commit/d75802b))
+* don't add charset to `usdz` file type ([#357](https://github.com/webpack/webpack-dev-middleware/issues/357)) ([b135b3d](https://github.com/webpack/webpack-dev-middleware/commit/b135b3d))
+
+
+
+<a name="3.5.1"></a>
+## [3.5.1](https://github.com/webpack/webpack-dev-middleware/compare/v3.5.0...v3.5.1) (2019-01-17)
+
+
+### Bug Fixes
+
+* remove querystring from filenames when writing to disk ([#361](https://github.com/webpack/webpack-dev-middleware/issues/361)) ([90d0d94](https://github.com/webpack/webpack-dev-middleware/commit/90d0d94))
+
+
+
+<a name="3.5.0"></a>
+# [3.5.0](https://github.com/webpack/webpack-dev-middleware/compare/v3.4.0...v3.5.0) (2019-01-04)
+
+
+### Bug Fixes
+
+* **middleware:** do not add 'null' to Content-Type ([#355](https://github.com/webpack/webpack-dev-middleware/issues/355)) ([cf4d7a9](https://github.com/webpack/webpack-dev-middleware/commit/cf4d7a9))
+
+
+### Features
+
+* allow to redefine `mimeTypes` (possible to use `force` option) ([#349](https://github.com/webpack/webpack-dev-middleware/issues/349)) ([e56a181](https://github.com/webpack/webpack-dev-middleware/commit/e56a181))
 
 
 

appveyor.yml

@@ -5,6 +5,8 @@ init:
 
 environment:
   matrix:
+    - nodejs_version: '11'
+      webpack_version: latest
     - nodejs_version: '10'
       webpack_version: latest
     - nodejs_version: '8'

lib/fs.js

@@ -26,8 +26,9 @@ module.exports = {
         for (const assetPath of Object.keys(assets)) {
           const asset = assets[assetPath];
           const source = asset.source();
-          const isAbsolute = path.isAbsolute(assetPath);
-          const writePath = isAbsolute ? assetPath : path.join(outputPath, assetPath);
+          const [assetPathClean] = assetPath.split('?');
+          const isAbsolute = path.isAbsolute(assetPathClean);
+          const writePath = isAbsolute ? assetPathClean : path.join(outputPath, assetPathClean);
           const relativePath = path.relative(process.cwd(), writePath);
           const allowWrite = filter && typeof filter === 'function' ? filter(writePath) : true;