Merge pull request #6189 from jasongrout/updates2

Update webpack

.gitignore

@@ -46,3 +46,5 @@ lerna-debug.log
 yarn-error.log
 
 junit.xml
+
+*.tsbuildinfo

buildutils/package.json

@@ -45,13 +45,13 @@
     "fs-extra": "~4.0.2",
     "glob": "~7.1.2",
     "inquirer": "~3.3.0",
-    "mini-css-extract-plugin": "~0.4.4",
+    "mini-css-extract-plugin": "~0.6.0",
     "package-json": "~5.0.0",
     "path": "~0.12.7",
     "semver": "^5.5.0",
     "sort-package-json": "~1.7.1",
     "typescript": "~3.4.3",
-    "webpack": "~4.12.0"
+    "webpack": "~4.29.6"
   },
   "devDependencies": {
     "@types/fs-extra": "~4.0.3",
@@ -59,7 +59,7 @@
     "@types/inquirer": "0.0.36",
     "@types/mini-css-extract-plugin": "^0.2.0",
     "@types/node": "~8.0.47",
-    "@types/webpack": "^4.4.17",
+    "@types/webpack": "^4.4.27",
     "rimraf": "~2.6.2"
   },
   "gitHead": "31f68f6d1717b58c344a5fb4f4baf3b123b7c75c"

dev_mode/package.json

@@ -114,28 +114,28 @@
   },
   "devDependencies": {
     "@jupyterlab/buildutils": "^1.0.0-alpha.3",
-    "css-loader": "~0.28.7",
+    "css-loader": "~2.1.1",
     "duplicate-package-checker-webpack-plugin": "^3.0.0",
-    "file-loader": "~1.1.11",
+    "file-loader": "~3.0.1",
     "fs-extra": "~4.0.2",
     "glob": "~7.1.2",
     "handlebars": "~4.0.11",
-    "html-loader": "^0.5.1",
+    "html-loader": "~0.5.5",
     "html-webpack-plugin": "~3.2.0",
-    "mini-css-extract-plugin": "~0.4.4",
-    "raw-loader": "~0.5.1",
+    "mini-css-extract-plugin": "~0.6.0",
+    "raw-loader": "~2.0.0",
     "rimraf": "~2.6.2",
     "sort-package-json": "~1.7.1",
     "source-map-loader": "~0.2.1",
-    "style-loader": "~0.21.0",
-    "svg-url-loader": "~2.3.1",
-    "svgo": "~1.0.4",
-    "svgo-loader": "~2.1.0",
-    "uglifyjs-webpack-plugin": "~1.2.5",
-    "url-loader": "~1.0.1",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3",
-    "webpack-merge": "^4.1.1",
+    "style-loader": "~0.23.1",
+    "svg-url-loader": "~2.3.2",
+    "svgo": "~1.2.1",
+    "svgo-loader": "~2.2.0",
+    "uglifyjs-webpack-plugin": "~2.1.2",
+    "url-loader": "~1.1.2",
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0",
+    "webpack-merge": "^4.2.1",
     "webpack-visualizer-plugin": "^0.1.11"
   },
   "engines": {

examples/app/package.json

@@ -40,22 +40,22 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "css-loader": "~0.28.7",
-    "file-loader": "~1.1.11",
+    "css-loader": "~2.1.1",
+    "file-loader": "~3.0.1",
     "fs-extra": "~4.0.2",
     "glob": "~7.1.2",
-    "mini-css-extract-plugin": "~0.4.4",
-    "raw-loader": "~0.5.1",
+    "mini-css-extract-plugin": "~0.6.0",
+    "raw-loader": "~2.0.0",
     "read-package-tree": "~5.1.6",
     "rimraf": "~2.6.2",
-    "style-loader": "~0.21.0",
-    "svg-url-loader": "~2.3.1",
-    "svgo": "~1.0.4",
-    "svgo-loader": "~2.1.0",
-    "url-loader": "~1.0.1",
+    "style-loader": "~0.23.1",
+    "svg-url-loader": "~2.3.2",
+    "svgo": "~1.2.1",
+    "svgo-loader": "~2.2.0",
+    "url-loader": "~1.1.2",
     "watch": "~1.0.2",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3",
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0",
     "whatwg-fetch": "~2.0.3"
   }
 }

examples/cell/package.json

@@ -20,20 +20,20 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "css-loader": "~0.28.7",
-    "file-loader": "~1.1.11",
-    "mini-css-extract-plugin": "~0.4.4",
-    "raw-loader": "~0.5.1",
+    "css-loader": "~2.1.1",
+    "file-loader": "~3.0.1",
+    "mini-css-extract-plugin": "~0.6.0",
+    "raw-loader": "~2.0.0",
     "rimraf": "~2.6.2",
-    "style-loader": "~0.21.0",
-    "svg-url-loader": "~2.3.1",
-    "svgo": "~1.0.4",
-    "svgo-loader": "~2.1.0",
+    "style-loader": "~0.23.1",
+    "svg-url-loader": "~2.3.2",
+    "svgo": "~1.2.1",
+    "svgo-loader": "~2.2.0",
     "typescript": "~3.4.3",
-    "url-loader": "~1.0.1",
+    "url-loader": "~1.1.2",
     "watch": "~1.0.2",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3",
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0",
     "whatwg-fetch": "~2.0.3"
   }
 }

examples/console/package.json

@@ -19,20 +19,20 @@
   },
   "devDependencies": {
     "@types/codemirror": "~0.0.70",
-    "css-loader": "~0.28.7",
-    "file-loader": "~1.1.11",
-    "mini-css-extract-plugin": "~0.4.4",
-    "raw-loader": "~0.5.1",
+    "css-loader": "~2.1.1",
+    "file-loader": "~3.0.1",
+    "mini-css-extract-plugin": "~0.6.0",
+    "raw-loader": "~2.0.0",
     "rimraf": "~2.6.2",
-    "style-loader": "~0.21.0",
-    "svg-url-loader": "~2.3.1",
-    "svgo": "~1.0.4",
-    "svgo-loader": "~2.1.0",
+    "style-loader": "~0.23.1",
+    "svg-url-loader": "~2.3.2",
+    "svgo": "~1.2.1",
+    "svgo-loader": "~2.2.0",
     "typescript": "~3.4.3",
-    "url-loader": "~1.0.1",
+    "url-loader": "~1.1.2",
     "watch": "~1.0.2",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3",
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0",
     "whatwg-fetch": "~2.0.3"
   }
 }

examples/filebrowser/package.json

@@ -23,20 +23,20 @@
   },
   "devDependencies": {
     "@types/codemirror": "~0.0.70",
-    "css-loader": "~0.28.7",
-    "file-loader": "~1.1.11",
-    "mini-css-extract-plugin": "~0.4.4",
-    "raw-loader": "~0.5.1",
+    "css-loader": "~2.1.1",
+    "file-loader": "~3.0.1",
+    "mini-css-extract-plugin": "~0.6.0",
+    "raw-loader": "~2.0.0",
     "rimraf": "~2.6.2",
-    "style-loader": "~0.21.0",
-    "svg-url-loader": "~2.3.1",
-    "svgo": "~1.0.4",
-    "svgo-loader": "~2.1.0",
+    "style-loader": "~0.23.1",
+    "svg-url-loader": "~2.3.2",
+    "svgo": "~1.2.1",
+    "svgo-loader": "~2.2.0",
     "typescript": "~3.4.3",
-    "url-loader": "~1.0.1",
+    "url-loader": "~1.1.2",
     "watch": "~1.0.2",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3",
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0",
     "whatwg-fetch": "~2.0.3"
   }
 }

examples/notebook/package.json

@@ -23,20 +23,20 @@
   },
   "devDependencies": {
     "@types/codemirror": "~0.0.70",
-    "css-loader": "~0.28.7",
-    "file-loader": "~1.1.11",
-    "mini-css-extract-plugin": "~0.4.4",
-    "raw-loader": "~0.5.1",
+    "css-loader": "~2.1.1",
+    "file-loader": "~3.0.1",
+    "mini-css-extract-plugin": "~0.6.0",
+    "raw-loader": "~2.0.0",
     "rimraf": "~2.6.2",
-    "style-loader": "~0.21.0",
-    "svg-url-loader": "~2.3.1",
-    "svgo": "~1.0.4",
-    "svgo-loader": "~2.1.0",
+    "style-loader": "~0.23.1",
+    "svg-url-loader": "~2.3.2",
+    "svgo": "~1.2.1",
+    "svgo-loader": "~2.2.0",
     "typescript": "~3.4.3",
-    "url-loader": "~1.0.1",
+    "url-loader": "~1.1.2",
     "watch": "~1.0.2",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3",
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0",
     "whatwg-fetch": "~2.0.3"
   }
 }

examples/terminal/package.json

@@ -15,20 +15,20 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "css-loader": "~0.28.7",
-    "file-loader": "~1.1.11",
-    "mini-css-extract-plugin": "~0.4.4",
-    "raw-loader": "~0.5.1",
+    "css-loader": "~2.1.1",
+    "file-loader": "~3.0.1",
+    "mini-css-extract-plugin": "~0.6.0",
+    "raw-loader": "~2.0.0",
     "rimraf": "~2.6.2",
-    "style-loader": "~0.21.0",
-    "svg-url-loader": "~2.3.1",
-    "svgo": "~1.0.4",
-    "svgo-loader": "~2.1.0",
+    "style-loader": "~0.23.1",
+    "svg-url-loader": "~2.3.2",
+    "svgo": "~1.2.1",
+    "svgo-loader": "~2.2.0",
     "typescript": "~3.4.3",
-    "url-loader": "~1.0.1",
+    "url-loader": "~1.1.2",
     "watch": "~1.0.2",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3",
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0",
     "whatwg-fetch": "~2.0.3"
   }
 }

packages/services/examples/browser/package.json

@@ -13,7 +13,7 @@
   },
   "devDependencies": {
     "rimraf": "~2.6.2",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3"
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0"
   }
 }

packages/services/examples/typescript-browser-with-output/package.json

@@ -14,12 +14,11 @@
     "es6-promise": "~4.1.1"
   },
   "devDependencies": {
-    "css-loader": "~0.28.7",
+    "css-loader": "~2.1.1",
     "rimraf": "~2.6.2",
-    "style-loader": "~0.21.0",
-    "tslint": "~5.10.0",
+    "style-loader": "~0.23.1",
     "typescript": "~3.4.3",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3"
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0"
   }
 }

packages/services/package.json

@@ -57,8 +57,8 @@
     "text-encoding": "~0.5.5",
     "typedoc": "^0.14.2",
     "typescript": "~3.4.3",
-    "webpack": "~4.12.0",
-    "webpack-cli": "^3.0.3"
+    "webpack": "~4.29.6",
+    "webpack-cli": "^3.3.0"
   },
   "publishConfig": {
     "access": "public"

tests/package.json

@@ -42,9 +42,9 @@
     "simulate-event": "~1.4.0"
   },
   "devDependencies": {
-    "css-loader": "~0.28.7",
+    "css-loader": "~2.1.1",
     "es6-promise": "~4.1.1",
-    "file-loader": "~1.1.11",
+    "file-loader": "~3.0.1",
     "fork-ts-checker-webpack-plugin": "^0.4.2",
     "fs-extra": "~4.0.2",
     "istanbul-instrumenter-loader": "~3.0.0",
@@ -61,13 +61,13 @@
     "karma-webpack": "~2.0.9",
     "mocha": "~3.5.3",
     "puppeteer": "^1.5.0",
-    "raw-loader": "~0.5.1",
+    "raw-loader": "~2.0.0",
     "rimraf": "~2.6.2",
-    "style-loader": "~0.21.0",
+    "style-loader": "~0.23.1",
     "thread-loader": "^1.1.5",
     "ts-loader": "~5.3.3",
     "typescript": "~3.4.3",
-    "url-loader": "~1.0.1",
-    "webpack": "~4.12.0"
+    "url-loader": "~1.1.2",
+    "webpack": "~4.29.6"
   }
 }

tests/test-csvviewer/src/model.spec.ts

@@ -9,67 +9,67 @@ import { DSVModel } from '@jupyterlab/csvviewer';
 const CSV_TEST_FILES = [
   [
     'comma_in_quotes',
-    require('csv-spectrum/csvs/comma_in_quotes.csv'),
+    require('csv-spectrum/csvs/comma_in_quotes.csv').default,
     require('csv-spectrum/json/comma_in_quotes.json')
   ],
 
   [
     'empty',
-    require('csv-spectrum/csvs/empty.csv'),
+    require('csv-spectrum/csvs/empty.csv').default,
     require('csv-spectrum/json/empty.json')
   ],
 
   [
     'empty_crlf',
-    require('csv-spectrum/csvs/empty_crlf.csv'),
+    require('csv-spectrum/csvs/empty_crlf.csv').default,
     require('csv-spectrum/json/empty_crlf.json')
   ],
 
   [
     'escaped_quotes',
-    require('csv-spectrum/csvs/escaped_quotes.csv'),
+    require('csv-spectrum/csvs/escaped_quotes.csv').default,
     require('csv-spectrum/json/escaped_quotes.json')
   ],
 
   [
     'json',
-    require('csv-spectrum/csvs/json.csv'),
+    require('csv-spectrum/csvs/json.csv').default,
     require('csv-spectrum/json/json.json')
   ],
 
   [
     'newlines',
-    require('csv-spectrum/csvs/newlines.csv'),
+    require('csv-spectrum/csvs/newlines.csv').default,
     require('csv-spectrum/json/newlines.json')
   ],
 
   [
     'newlines_crlf',
-    require('csv-spectrum/csvs/newlines_crlf.csv'),
+    require('csv-spectrum/csvs/newlines_crlf.csv').default,
     require('csv-spectrum/json/newlines_crlf.json')
   ],
 
   [
     'quotes_and_newlines',
-    require('csv-spectrum/csvs/quotes_and_newlines.csv'),
+    require('csv-spectrum/csvs/quotes_and_newlines.csv').default,
     require('csv-spectrum/json/quotes_and_newlines.json')
   ],
 
   [
     'simple',
-    require('csv-spectrum/csvs/simple.csv'),
+    require('csv-spectrum/csvs/simple.csv').default,
     require('csv-spectrum/json/simple.json')
   ],
 
   [
     'simple_crlf',
-    require('csv-spectrum/csvs/simple_crlf.csv'),
+    require('csv-spectrum/csvs/simple_crlf.csv').default,
     require('csv-spectrum/json/simple_crlf.json')
   ],
 
   [
     'utf8',
-    require('csv-spectrum/csvs/utf8.csv'),
+    require('csv-spectrum/csvs/utf8.csv').default,
     require('csv-spectrum/json/utf8.json')
   ]
 ];

tests/test-rendermime/src/factories.spec.ts

@@ -174,7 +174,8 @@ describe('rendermime/factories', () => {
       });
 
       it('should add header anchors', async () => {
-        const source = require('../../../examples/filebrowser/sample.md') as string;
+        const source = require('../../../examples/filebrowser/sample.md')
+          .default as string;
         const f = markdownRendererFactory;
         const mimeType = 'text/markdown';
         const model = createModel(mimeType, source);