Merge pull request microsoft#683 from Microsoft/ianc/webpack4-plugins

iclanton · web-flow · commit dea45b61ddd8 · 2018-06-08T01:39:41.000-07:00
[webpack plugins] Update plugins to support the new webpack 4 APIs.
diff --git a/common/changes/@microsoft/gulp-core-build-webpack/ianc-webpack4-plugins_2018-06-08-06-51.json b/common/changes/@microsoft/gulp-core-build-webpack/ianc-webpack4-plugins_2018-06-08-06-51.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "packageName": "@microsoft/gulp-core-build-webpack",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/gulp-core-build-webpack",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/loader-load-themed-styles/ianc-webpack4-plugins_2018-06-08-06-51.json b/common/changes/@microsoft/loader-load-themed-styles/ianc-webpack4-plugins_2018-06-08-06-51.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "packageName": "@microsoft/loader-load-themed-styles",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/loader-load-themed-styles",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/loader-raw-script/ianc-webpack4-plugins_2018-06-08-08-34.json b/common/changes/@microsoft/loader-raw-script/ianc-webpack4-plugins_2018-06-08-08-34.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "packageName": "@microsoft/loader-raw-script",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/loader-raw-script",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/loader-set-webpack-public-path/ianc-webpack4-plugins_2018-06-08-08-34.json b/common/changes/@microsoft/loader-set-webpack-public-path/ianc-webpack4-plugins_2018-06-08-08-34.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "comment": "",
+      "packageName": "@microsoft/loader-set-webpack-public-path",
+      "type": "none"
+    }
+  ],
+  "packageName": "@microsoft/loader-set-webpack-public-path",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/resolve-chunk-plugin/ianc-webpack4-plugins_2018-06-08-06-51.json b/common/changes/@microsoft/resolve-chunk-plugin/ianc-webpack4-plugins_2018-06-08-06-51.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/resolve-chunk-plugin",
+      "comment": "Update the plugin to support Webpack 4.",
+      "type": "major"
+    }
+  ],
+  "packageName": "@microsoft/resolve-chunk-plugin",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/common/changes/@microsoft/set-webpack-public-path-plugin/ianc-webpack4-plugins_2018-06-08-06-51.json b/common/changes/@microsoft/set-webpack-public-path-plugin/ianc-webpack4-plugins_2018-06-08-06-51.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/set-webpack-public-path-plugin",
+      "comment": "Update the plugin to support Webpack 4.",
+      "type": "major"
+    }
+  ],
+  "packageName": "@microsoft/set-webpack-public-path-plugin",
+  "email": "iclanton@users.noreply.github.com"
+}
diff --git a/common/config/rush/common-versions.json b/common/config/rush/common-versions.json
@@ -3,6 +3,11 @@
     "ajv": "5.2.2"
   },
   "allowedAlternativeVersions": {
-    "jest-environment-jsdom": ["~21.2.1"]
+    "jest-environment-jsdom": [
+      "~21.2.1"
+    ],
+    "@types/webpack": [
+      "4.4.0"
+    ]
   }
-}
+}
diff --git a/common/config/rush/shrinkwrap.yaml b/common/config/rush/shrinkwrap.yaml
@@ -67,12 +67,11 @@ dependencies:
   '@types/serve-static': 1.13.1
   '@types/sinon': 1.16.34
   '@types/source-map': 0.5.0
-  '@types/tapable': 0.2.4
+  '@types/tapable': 1.0.2
   '@types/tar': 4.0.0
   '@types/through2': 2.0.32
   '@types/uglify-js': 2.6.29
   '@types/vinyl': 1.2.30
-  '@types/webpack': 3.8.11
   '@types/webpack-env': 1.13.0
   '@types/yargs': 0.0.34
   '@types/z-schema': 3.16.31
@@ -522,7 +521,7 @@ packages:
   /@types/loader-utils/1.1.3:
     dependencies:
       '@types/node': 8.5.8
-      '@types/webpack': 3.8.11
+      '@types/webpack': 4.4.0
     dev: false
     resolution:
       integrity: sha512-euKGFr2oCB3ASBwG39CYJMR3N9T0nanVqXdiH7Zu/Nqddt6SmFRxytq/i2w9LQYNQekEtGBz+pE3qG6fQTNvRg==
@@ -615,10 +614,14 @@ packages:
     dev: false
     resolution:
       integrity: sha1-3TS72OMv5OdPLj2KwH+KpbRaR6w=
-  /@types/tapable/0.2.4:
+  /@types/tapable/0.2.5:
+    dev: false
+    resolution:
+      integrity: sha512-dEoVvo/I9QFomyhY+4Q6Qk+I+dhG59TYceZgC6Q0mCifVPErx6Y83PNTKGDS5e9h9Eti6q0S2mm16BU6iQK+3w==
+  /@types/tapable/1.0.2:
     dev: false
     resolution:
-      integrity: sha512-pclMAvhPnXJcJu1ZZ8bQthuUcdDWzDuxDdbSf6l1U6s4fP6EBiZpPsOZYqFOrbqDV97sXGFSsb6AUpiLfv4xIA==
+      integrity: sha512-42zEJkBpNfMEAvWR5WlwtTH22oDzcMjFsL9gDGExwF8X8WvAiw7Vwop7hPw03QT8TKfec83LwbHj6SvpqM4ELQ==
   /@types/tar/4.0.0:
     dependencies:
       '@types/node': 8.5.8
@@ -650,12 +653,21 @@ packages:
   /@types/webpack/3.8.11:
     dependencies:
       '@types/node': 8.5.8
-      '@types/tapable': 0.2.4
+      '@types/tapable': 0.2.5
       '@types/uglify-js': 2.6.29
       source-map: 0.6.1
     dev: false
     resolution:
       integrity: sha512-6a+XQjFMAJekCE7IxkDavoX8cGCEmTE+MrKeUK4CL0Q7SL9w4c5TdrYrUEzcJx3GX3I0fTIC79x0C07Pi5VmlA==
+  /@types/webpack/4.4.0:
+    dependencies:
+      '@types/node': 8.5.8
+      '@types/tapable': 1.0.2
+      '@types/uglify-js': 2.6.29
+      source-map: 0.6.1
+    dev: false
+    resolution:
+      integrity: sha512-G7TXt4IRP7NTQO8R8QyDN7YwkQzlxjiKhA+z7W5FvkGbK7kIdOUtW2e7AE2w33Q10uphyG+vr8pfRy7wBWLmsA==
   /@types/yargs/0.0.34:
     dev: false
     resolution:
@@ -10188,7 +10200,6 @@ packages:
       '@types/orchestrator': 0.0.30
       '@types/q': 0.0.32
       '@types/source-map': 0.5.0
-      '@types/tapable': 0.2.4
       '@types/uglify-js': 2.6.29
       '@types/webpack': 3.8.11
       colors: 1.2.5
@@ -10198,7 +10209,7 @@ packages:
     dev: false
     name: '@rush-temp/gulp-core-build-webpack'
     resolution:
-      integrity: sha512-wrJo5sTNsJW+2U7nZ08YXok9dYn1c89QtVNuckgGSGul9P6ttBA7ZGOHDM0ONqO7HUTxdPlnDM/ZjH6WjUw7wA==
+      integrity: sha512-/rO8tpjYHpkP3hNBUgKa6lG/6eADrlrsqadXPwqZ3fW8OSF03Tdg1WBHAHS+doojAfXUZFowHu9CYUHy0gPXFA==
       tarball: 'file:projects/gulp-core-build-webpack.tgz'
     version: 0.0.0
   'file:projects/gulp-core-build.tgz':
@@ -10271,15 +10282,14 @@ packages:
       '@types/loader-utils': 1.1.3
       '@types/mocha': 2.2.38
       '@types/node': 8.5.8
-      '@types/tapable': 0.2.4
-      '@types/webpack': 3.8.11
+      '@types/webpack': 4.4.0
       chai: 3.5.0
       gulp: 3.9.1
       loader-utils: 1.1.0
     dev: false
     name: '@rush-temp/loader-load-themed-styles'
     resolution:
-      integrity: sha512-HfSqnohCbHEIA47Qdc7PosbWj+xL5pazt6fiUNEK7Ah6WKE+KI/rPxFtwd6CClfvQnmMZH0jWwPdXs8ZbTKSlg==
+      integrity: sha512-wYU/mKRiF+m2tXgI2SoX3So0xLzQ/1fzNl/pnMYbjEeiM/xh3PTlHzBY/FpAmB2C4u7KpReQD/4iSWDv6+WihQ==
       tarball: 'file:projects/loader-load-themed-styles.tgz'
     version: 0.0.0
   'file:projects/loader-raw-script.tgz':
@@ -10359,15 +10369,14 @@ packages:
   'file:projects/resolve-chunk-plugin.tgz':
     dependencies:
       '@types/mocha': 2.2.38
-      '@types/tapable': 0.2.4
-      '@types/webpack': 3.8.11
+      '@types/webpack': 4.4.0
       chai: 3.5.0
       gulp: 3.9.1
       mocha: 3.4.2
     dev: false
     name: '@rush-temp/resolve-chunk-plugin'
     resolution:
-      integrity: sha512-V/wo3hdYQtf4EEKOaWRJfMvT1vivGuFUjLAcqHETV2Vk7e+mcqo9ZRV0HvG+/+hP2bHbPNJZB77INL3DQ6U4Pw==
+      integrity: sha512-jNM0fnFsRmx4mYTD+BdZxe316UCtTZ0m3QTiuMMmvJP5wP9Pp1GNG8If+e/FcdNxFdnDldIUnlEvdReGwUXmFw==
       tarball: 'file:projects/resolve-chunk-plugin.tgz'
     version: 0.0.0
   'file:projects/rush-lib.tgz':
@@ -10470,9 +10479,9 @@ packages:
       '@types/lodash': 4.14.74
       '@types/mocha': 2.2.38
       '@types/node': 8.5.8
-      '@types/tapable': 0.2.4
+      '@types/tapable': 1.0.2
       '@types/uglify-js': 2.6.29
-      '@types/webpack': 3.8.11
+      '@types/webpack': 4.4.0
       chai: 3.5.0
       gulp: 3.9.1
       lodash: 4.15.0
@@ -10481,7 +10490,7 @@ packages:
     dev: false
     name: '@rush-temp/set-webpack-public-path-plugin'
     resolution:
-      integrity: sha512-NBGkwa+Ff9tX3n5QbFB/0SBpocOU8Sx+1IofnlYuJvGfv9z+cOoBvOL78ZUMIPSDHs2SuQezayVm7fyxf/NkjQ==
+      integrity: sha512-FW2ios7f80Ths2NhTQqdcO4y6pjGlj/mWy5ThAaM8gMeE7psFhM7mQvErQBKhmqFgWPRQaaBiCEV488u7xdoOQ==
       tarball: 'file:projects/set-webpack-public-path-plugin.tgz'
     version: 0.0.0
   'file:projects/stream-collator.tgz':
@@ -10611,12 +10620,11 @@ specifiers:
   '@types/serve-static': 1.13.1
   '@types/sinon': 1.16.34
   '@types/source-map': 0.5.0
-  '@types/tapable': 0.2.4
+  '@types/tapable': 1.0.2
   '@types/tar': 4.0.0
   '@types/through2': 2.0.32
   '@types/uglify-js': 2.6.29
   '@types/vinyl': 1.2.30
-  '@types/webpack': 3.8.11
   '@types/webpack-env': 1.13.0
   '@types/yargs': 0.0.34
   '@types/z-schema': 3.16.31
diff --git a/core-build/gulp-core-build-webpack/package.json b/core-build/gulp-core-build-webpack/package.json
@@ -26,7 +26,6 @@
     "@types/orchestrator": "0.0.30",
     "@types/q": "0.0.32",
     "@types/source-map": "0.5.0",
-    "@types/tapable": "0.2.4",
     "@types/uglify-js": "2.6.29",
     "@types/webpack": "3.8.11"
   }
diff --git a/webpack/loader-load-themed-styles/package.json b/webpack/loader-load-themed-styles/package.json
@@ -17,8 +17,7 @@
     "@types/mocha": "2.2.38",
     "@types/node": "8.5.8",
     "@types/loader-utils": "1.1.3",
-    "@types/tapable": "0.2.4",
-    "@types/webpack": "3.8.11",
+    "@types/webpack": "4.4.0",
     "chai": "~3.5.0",
     "gulp": "~3.9.1",
     "@microsoft/node-library-build": "4.3.41"
diff --git a/webpack/loader-load-themed-styles/src/index.ts b/webpack/loader-load-themed-styles/src/index.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 import { LoadThemedStylesLoader } from './LoadThemedStylesLoader';
 
diff --git a/webpack/loader-load-themed-styles/src/test/LoadThemedStylesLoader.test.ts b/webpack/loader-load-themed-styles/src/test/LoadThemedStylesLoader.test.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 /// <reference types="mocha" />
 
diff --git a/webpack/loader-load-themed-styles/src/test/testData/LoadThemedStylesMock.ts b/webpack/loader-load-themed-styles/src/test/testData/LoadThemedStylesMock.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 class LoadThemedStylesMock {
   public static loadedData: string[] = [];
diff --git a/webpack/loader-load-themed-styles/src/test/testData/MockStyle1.ts b/webpack/loader-load-themed-styles/src/test/testData/MockStyle1.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 /* tslint:disable:no-any */
 const exportedObject: any = [['A', 'STYLE 1'], ['B', 'STYLE 2']];
diff --git a/webpack/loader-load-themed-styles/src/test/testData/MockStyle2.ts b/webpack/loader-load-themed-styles/src/test/testData/MockStyle2.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 /* tslint:disable:export-name */
 export = 'styles';
diff --git a/webpack/loader-raw-script/src/RawScriptLoader.ts b/webpack/loader-raw-script/src/RawScriptLoader.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 import { EOL } from 'os';
 
diff --git a/webpack/loader-raw-script/src/index.ts b/webpack/loader-raw-script/src/index.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 import * as RawScriptLoader from './RawScriptLoader';
 
diff --git a/webpack/loader-raw-script/src/test/RawScriptLoader.test.ts b/webpack/loader-raw-script/src/test/RawScriptLoader.test.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 import { assert } from 'chai';
 import RawScriptLoader = require('./../RawScriptLoader');
diff --git a/webpack/loader-set-webpack-public-path/src/SetWebpackPublicPathLoader.ts b/webpack/loader-set-webpack-public-path/src/SetWebpackPublicPathLoader.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 import { merge } from 'lodash';
 const loaderUtils = require('loader-utils'); // tslint:disable-line:typedef
diff --git a/webpack/loader-set-webpack-public-path/src/index.ts b/webpack/loader-set-webpack-public-path/src/index.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 import { SetWebpackPublicPathLoader } from './SetWebpackPublicPathLoader';
 
diff --git a/webpack/loader-set-webpack-public-path/src/test/SetWebpackPublicPathLoader.test.ts b/webpack/loader-set-webpack-public-path/src/test/SetWebpackPublicPathLoader.test.ts
@@ -1,7 +1,5 @@
-/*
- * Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
- * See LICENSE in the project root for license information.
- */
+// Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
+// See LICENSE in the project root for license information.
 
 import { assert } from 'chai';
 import { SetWebpackPublicPathLoader } from './../SetWebpackPublicPathLoader';
diff --git a/webpack/resolve-chunk-plugin/package.json b/webpack/resolve-chunk-plugin/package.json
@@ -10,8 +10,7 @@
     "build": "gulp test --clean"
   },
   "dependencies": {
-    "@types/tapable": "0.2.4",
-    "@types/webpack": "3.8.11"
+    "@types/webpack": "4.4.0"
   },
   "devDependencies": {
     "@types/mocha": "2.2.38",
diff --git a/webpack/resolve-chunk-plugin/src/ResolveChunkPlugin.ts b/webpack/resolve-chunk-plugin/src/ResolveChunkPlugin.ts
diff --git a/webpack/resolve-chunk-plugin/typings/webpack-plugin-types.d.ts b/webpack/resolve-chunk-plugin/typings/webpack-plugin-types.d.ts
diff --git a/webpack/set-webpack-public-path-plugin/package.json b/webpack/set-webpack-public-path-plugin/package.json
diff --git a/webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts b/webpack/set-webpack-public-path-plugin/src/SetPublicPathPlugin.ts
diff --git a/webpack/set-webpack-public-path-plugin/src/V3Interfaces.ts b/webpack/set-webpack-public-path-plugin/src/V3Interfaces.ts
diff --git a/webpack/set-webpack-public-path-plugin/src/codeGenerator.ts b/webpack/set-webpack-public-path-plugin/src/codeGenerator.ts

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`"@types/orchestrator": "0.0.30",`
`27`	`27`	`"@types/q": "0.0.32",`
`28`	`28`	`"@types/source-map": "0.5.0",`
`29`		`- "@types/tapable": "0.2.4",`
`30`	`29`	`"@types/uglify-js": "2.6.29",`
`31`	`30`	`"@types/webpack": "3.8.11"`
`32`	`31`	`}`