Merge pull request #15967 from grafana/bump-webpack

Bump npm packages related to the dev process

package.json

@@ -11,11 +11,11 @@
     "url": "http://github.com/grafana/grafana.git"
   },
   "devDependencies": {
-    "@babel/core": "^7.1.2",
+    "@babel/core": "^7.3.4",
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/preset-env": "^7.1.0",
+    "@babel/preset-env": "^7.3.4",
     "@babel/preset-react": "^7.0.0",
-    "@babel/preset-typescript": "^7.1.0",
+    "@babel/preset-typescript": "^7.3.3",
     "@rtsao/plugin-proposal-class-properties": "^7.0.1-patch.1",
     "@types/angular": "^1.6.6",
     "@types/chalk": "^2.2.0",
@@ -24,9 +24,10 @@
     "@types/d3": "^4.10.1",
     "@types/enzyme": "^3.1.13",
     "@types/inquirer": "^0.0.43",
-    "@types/jest": "^23.3.2",
+    "@types/jest": "^24.0.11",
     "@types/jquery": "^1.10.35",
     "@types/node": "^8.0.31",
+    "@types/papaparse": "^4.5.9",
     "@types/react": "^16.8.8",
     "@types/react-dom": "^16.8.2",
     "@types/react-grid-layout": "^0.16.6",
@@ -35,16 +36,16 @@
     "@types/react-virtualized": "^9.18.12",
     "@types/clipboard": "^2.0.1",
     "angular-mocks": "1.6.6",
-    "autoprefixer": "^6.4.0",
+    "autoprefixer": "^9.4.10",
-    "axios": "^0.17.1",
+    "axios": "^0.18.0",
     "babel-core": "^7.0.0-bridge",
-    "babel-jest": "^23.6.0",
+    "babel-jest": "^24.5.0",
     "babel-loader": "^8.0.4",
-    "babel-plugin-angularjs-annotate": "^0.9.0",
+    "babel-plugin-angularjs-annotate": "^0.10.0",
     "chalk": "^2.4.2",
-    "clean-webpack-plugin": "^0.1.19",
+    "clean-webpack-plugin": "^2.0.0",
     "concurrently": "^4.1.0",
-    "css-loader": "^0.28.7",
+    "css-loader": "^2.1.1",
     "enzyme": "^3.6.0",
     "enzyme-adapter-react-16": "^1.5.0",
     "enzyme-to-json": "^3.3.4",
@@ -52,11 +53,11 @@
     "es6-shim": "^0.35.3",
     "execa": "^1.0.0",
     "expect.js": "~0.2.0",
-    "expose-loader": "^0.7.3",
+    "expose-loader": "0.7.5",
-    "file-loader": "^1.1.11",
+    "file-loader": "^3.0.1",
-    "fork-ts-checker-webpack-plugin": "^0.4.9",
+    "fork-ts-checker-webpack-plugin": "^1.0.0",
     "gaze": "^1.1.2",
-    "glob": "~7.0.0",
+    "glob": "~7.1.3",
     "grunt": "1.0.1",
     "grunt-angular-templates": "^1.1.0",
     "grunt-cli": "~1.2.0",
@@ -70,29 +71,29 @@
     "grunt-sass-lint": "^0.2.4",
     "grunt-usemin": "3.1.1",
     "grunt-webpack": "^3.0.2",
-    "html-loader": "^0.5.1",
+    "html-loader": "0.5.5",
-    "html-webpack-harddisk-plugin": "^0.2.0",
+    "html-webpack-harddisk-plugin": "^1.0.1",
     "html-webpack-plugin": "^3.2.0",
     "husky": "^1.3.1",
     "inquirer": "^6.2.2",
-    "jest": "^23.6.0",
+    "jest": "^24.5.0",
     "jest-date-mock": "^1.0.6",
     "lint-staged": "^8.1.3",
     "load-grunt-tasks": "3.5.2",
-    "mini-css-extract-plugin": "^0.4.0",
+    "mini-css-extract-plugin": "^0.5.0",
     "mocha": "^4.0.1",
     "monaco-editor": "^0.15.6",
     "ng-annotate-loader": "^0.6.1",
     "ng-annotate-webpack-plugin": "^0.3.0",
     "ngtemplate-loader": "^2.0.1",
     "node-sass": "^4.11.0",
-    "npm": "^5.4.2",
+    "npm": "^6.9.0",
-    "optimize-css-assets-webpack-plugin": "^4.0.2",
+    "optimize-css-assets-webpack-plugin": "^5.0.1",
-    "ora": "^3.1.0",
+    "ora": "^3.2.0",
     "phantomjs-prebuilt": "^2.1.15",
     "postcss-browser-reporter": "^0.5.0",
-    "postcss-loader": "^2.0.6",
+    "postcss-loader": "^3.0.0",
-    "postcss-reporter": "^5.0.0",
+    "postcss-reporter": "^6.0.1",
     "prettier": "1.16.4",
     "react-hot-loader": "^4.3.6",
     "react-test-renderer": "^16.5.0",
@@ -100,27 +101,27 @@
     "regexp-replace-loader": "^1.0.1",
     "rimraf": "^2.6.3",
     "sass-lint": "^1.10.2",
-    "sass-loader": "^7.0.1",
+    "sass-loader": "7.1.0",
     "semver": "^5.6.0",
     "sinon": "1.17.6",
-    "style-loader": "^0.21.0",
+    "style-loader": "0.23.1",
     "systemjs": "0.20.19",
     "systemjs-plugin-css": "^0.1.36",
-    "ts-jest": "^23.10.4",
+    "terser-webpack-plugin": "^1.2.3",
-    "ts-loader": "^5.1.0",
+    "ts-jest": "^24.0.0",
+    "ts-loader": "5.3.3",
     "ts-node": "8.0.2",
-    "tslib": "^1.9.3",
+    "tslib": "1.9.3",
-    "tslint": "^5.8.0",
+    "tslint": "5.14.0",
     "tslint-loader": "^3.5.3",
     "tslint-react": "^3.6.0",
-    "typescript": "^3.0.3",
+    "typescript": "3.3.3333",
-    "uglifyjs-webpack-plugin": "^1.2.7",
+    "webpack": "4.29.6",
-    "webpack": "4.19.1",
+    "webpack-bundle-analyzer": "3.1.0",
-    "webpack-bundle-analyzer": "^2.9.0",
     "webpack-cleanup-plugin": "^0.5.1",
-    "webpack-cli": "^2.1.4",
+    "webpack-cli": "3.2.3",
-    "webpack-dev-server": "^3.1.0",
+    "webpack-dev-server": "3.2.1",
-    "webpack-merge": "^4.1.0",
+    "webpack-merge": "4.2.1",
     "zone.js": "^0.7.2"
   },
   "scripts": {
@@ -189,6 +190,7 @@
     "mousetrap": "^1.6.0",
     "mousetrap-global-bind": "^1.1.0",
     "nodemon": "^1.18.10",
+    "papaparse": "^4.6.3",
     "prismjs": "^1.6.0",
     "prop-types": "^15.6.2",
     "rc-cascader": "^0.14.0",

packages/grafana-ui/src/components/ColorPicker/_ColorPicker.scss

@@ -45,7 +45,7 @@ $arrowSize: 15px;
     border-right-color: transparent;
     border-top-color: transparent;
     top: 0;
-    left: calc(100% -$arrowSize);
+    left: calc(100%-#{$arrowSize});
   }
 
   &[data-placement^='right'] {

packages/grafana-ui/src/components/ThresholdsEditor/__snapshots__/ThresholdsEditor.test.tsx.snap

@@ -17,7 +17,7 @@ exports[`Render should render with base threshold 1`] = `
       ],
       "results": Array [
         Object {
-          "isThrow": false,
+          "type": "return",
           "value": undefined,
         },
       ],

public/app/plugins/datasource/prometheus/specs/datasource.test.ts

@@ -351,7 +351,7 @@ const timeSrv = {
 };
 
 describe('PrometheusDatasource', () => {
-  describe('When querying prometheus with one target using query editor target spec', async () => {
+  describe('When querying prometheus with one target using query editor target spec', () => {
     let results;
     const query = {
       range: { from: time({ seconds: 63 }), to: time({ seconds: 183 }) },

scripts/webpack/sass.rule.js

@@ -12,8 +12,7 @@ module.exports = function(options) {
         options: {
           importLoaders: 2,
           url: options.preserveUrl,
-          sourceMap: options.sourceMap,
+          sourceMap: options.sourceMap
-          minimize: options.minimize,
         },
       },
       {

scripts/webpack/webpack.dev.js

@@ -19,13 +19,6 @@ module.exports = merge(common, {
     light: './public/sass/grafana.light.scss',
   },
 
-  output: {
-    path: path.resolve(__dirname, '../../public/build'),
-    filename: '[name].[hash].js',
-    // Keep publicPath relative for host.com/grafana/ deployments
-    publicPath: "public/build/",
-  },
-
   module: {
     rules: [
       {
@@ -50,7 +43,7 @@ module.exports = merge(common, {
           },
         },
       },
-      require('./sass.rule.js')({ sourceMap: false, minimize: false, preserveUrl: false }),
+      require('./sass.rule.js')({ sourceMap: false, preserveUrl: false }),
       {
         test: /\.(png|jpg|gif|ttf|eot|svg|woff(2)?)(\?[a-z0-9=&.]+)?$/,
         loader: 'file-loader'
@@ -59,7 +52,7 @@ module.exports = merge(common, {
   },
 
   plugins: [
-    new CleanWebpackPlugin('../../public/build', { allowExternal: true }),
+    new CleanWebpackPlugin(),
     new MiniCssExtractPlugin({
       filename: "grafana.[name].[hash].css"
     }),

scripts/webpack/webpack.hot.js

@@ -56,7 +56,7 @@ module.exports = merge(common, {
               plugins: [
                 [require('@rtsao/plugin-proposal-class-properties'), { loose: true }],
                 'angularjs-annotate',
-                'syntax-dynamic-import', // needed for `() => import()` in routes.ts
+                '@babel/plugin-syntax-dynamic-import', // needed for `() => import()` in routes.ts
                 'react-hot-loader/babel',
               ],
               presets: [
@@ -98,7 +98,7 @@ module.exports = merge(common, {
   },
 
   plugins: [
-    new CleanWebpackPlugin('../public/build', { allowExternal: true }),
+    new CleanWebpackPlugin(),
     new HtmlWebpackPlugin({
       filename: path.resolve(__dirname, '../../public/views/index.html'),
       template: path.resolve(__dirname, '../../public/views/index-template.html'),

scripts/webpack/webpack.prod.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const merge = require('webpack-merge');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 const common = require('./webpack.common.js');
 const path = require('path');
 const ngAnnotatePlugin = require('ng-annotate-webpack-plugin');
@@ -43,14 +43,14 @@ module.exports = merge(common, {
         },
       },
       require('./sass.rule.js')({
-        sourceMap: false, minimize: false, preserveUrl: false
+        sourceMap: false, preserveUrl: false
       })
     ]
   },
   optimization: {
     minimizer: [
-      new UglifyJsPlugin({
+      new TerserPlugin({
-        cache: true,
+        cache: false,
         parallel: true,
         sourceMap: true
       }),