Update versions and fix other merge errors

Author: jasongrout

jupyterlab_widgets/package.json

@@ -48,9 +48,10 @@
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^4.0.0",
-    "@jupyter-widgets/controls": "^3.0.0",
-    "@jupyter-widgets/output": "^4.0.0",
+    "@jupyter-widgets/base": "^5.0.0-alpha.0",
+    "@jupyter-widgets/base-manager": "^1.0.0-alpha.0",
+    "@jupyter-widgets/controls": "^4.0.0-alpha.0",
+    "@jupyter-widgets/output": "^5.0.0-alpha.0",
     "@jupyterlab/application": "^3.0.0",
     "@jupyterlab/docregistry": "^3.0.0",
     "@jupyterlab/logconsole": "^3.0.0",

package.json

@@ -37,6 +37,7 @@
     "@typescript-eslint/parser": "^2.14.0",
     "eslint": "^6.5.0",
     "eslint-config-prettier": "^6.9.0",
+    "eslint-plugin-prettier": "^3.3.1",
     "husky": "^2.3.0",
     "lerna": "^3.20.2",
     "lint-staged": "^9.5.0",

packages/base-manager/package.json

@@ -32,8 +32,8 @@
     "test:unit:ie": "npm run test:unit:default -- --browsers=IE"
   },
   "dependencies": {
-    "@jupyter-widgets/base": "^4.0.0-alpha.0",
-    "@jupyterlab/services": "^5.0.2",
+    "@jupyter-widgets/base": "^5.0.0-alpha.0",
+    "@jupyterlab/services": "^6.0.0",
     "@lumino/coreutils": "^1.4.2",
     "base64-js": "^1.2.1"
   },

packages/controls/css/labvariables.css

@@ -96,9 +96,6 @@ all of MD as it is not optimized for dense, information rich UIs.
   --jp-ui-inverse-font-color2: rgba(255, 255, 255, 0.7);
   --jp-ui-inverse-font-color3: rgba(255, 255, 255, 0.5);
 
-  /* For backwards compatibility, we still define these below until ipywidgets 8.0.
-  See https://github.com/jupyter-widgets/ipywidgets/pull/2801 */
-
   /* Content Fonts
 
   Content font variables are used for typography of user generated content.

packages/controls/karma.conf.js

@@ -25,7 +25,6 @@ module.exports = function(config) {
     webpack: {
       module: {
         loaders: [
-          {
                     { test: /\.jsx?$/, exclude: /node_modules/, loader: "babel?presets[]=es2015" },
                     { test: /\.css$/, use: ['style-loader', 'css-loader']},
                     { test: /\.json$/, loader: "json-loader" },