Merge branch 'master' of github.com:dxos/console

CHANGELOG.md

@@ -8,10 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Unreleased
 
 ### ISSUES
-
-- 05/31/20: `webpack-cli` bug: https://github.com/webpack/webpack-dev-server/issues/2424
-    - workaround: added "nohoist" to root package.json
-    
+- 05/31/20: https://github.com/webpack/webpack-cli/issues/1602 (webpack-cli issue with monorepos)
 
 ### Added
 

package.json

@@ -42,7 +42,8 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-standard": "^4.0.1",
     "lint-staged": "^9.5.0",
-    "pre-commit": "^1.2.2"
+    "pre-commit": "^1.2.2",
+    "webpack-cli": "^3.3.11"
   },
   "eslintConfig": {
     "parser": "babel-eslint",

packages/console-app/package.json

@@ -23,6 +23,7 @@
     "testEnvironment": "node"
   },
   "dependencies": {
+    "@apollo/react-components": "^3.1.5",
     "@apollo/react-hooks": "^3.1.5",
     "@babel/runtime": "^7.8.7",
     "@dxos/debug": "^1.0.0-beta.20",
@@ -35,13 +36,10 @@
     "apollo-cache-inmemory": "^1.6.6",
     "apollo-client": "^2.6.10",
     "apollo-link-http": "^1.5.17",
-    "bable-loader": "^0.0.1-security",
     "build-url": "^2.0.0",
     "clsx": "^1.1.0",
     "compare-versions": "^3.6.0",
     "debug": "^4.1.1",
-    "dotenv-webpack": "^1.8.0",
-    "graphql": "^15.0.0",
     "graphql-tag": "^2.10.3",
     "lodash.defaultsdeep": "^4.6.1",
     "lodash.get": "^4.4.2",
@@ -60,9 +58,11 @@
     "@babel/plugin-proposal-export-default-from": "^7.8.3",
     "@babel/preset-env": "^7.4.5",
     "@babel/preset-react": "^7.0.0",
+    "@webpack-cli/info": "^0.2.0",
+    "@webpack-cli/init": "^0.3.0",
     "babel-eslint": "^10.0.2",
     "babel-jest": "^24.8.0",
-    "babel-loader": "^8.1.0",
+    "babel-loader": "^8.0.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-plugin-import-graphql": "^2.7.0",
     "babel-plugin-inline-import": "^3.0.0",
@@ -81,15 +81,20 @@
     "eslint-plugin-standard": "^4.0.1",
     "html-webpack-plugin": "^4.3.0",
     "jest": "^24.8.0",
+    "react-scripts": "^3.4.1",
     "semistandard": "^14.2.0",
     "webpack": "^4.41.2",
     "webpack-bundle-analyzer": "^3.6.0",
-    "webpack-cli": "^3.3.10",
-    "webpack-dev-server": "^3.9.0",
+    "webpack-cli": "^3.3.11",
+    "webpack-dev-server": "^3.11.0",
     "webpack-merge": "^4.2.2",
     "webpack-version-file-plugin": "^0.4.0",
     "yaml-loader": "^0.6.0"
   },
+  "peerDependencies": {
+    "react": "16.12.0",
+    "react-dom": "^16.12.0"
+  },
   "publishConfig": {
     "access": "public"
   },

packages/console-app/src/theme.js

@@ -8,6 +8,9 @@ import orange from '@material-ui/core/colors/orange';
 
 export const createTheme = (theme) => createMuiTheme({
 
+  // https://material-ui.com/system/shadows
+  shadows: ['none'],
+
   // https://stackoverflow.com/questions/60567673/reactjs-material-ui-theme-mixins-toolbar-offset-is-not-adapting-when-toolbar
   mixins: {
     denseToolbar: {

packages/console-app/src/version.json

@@ -1,7 +1,7 @@
 {
   "build": {
     "name":      "@dxos/console-app",
-    "buildDate": "2020-05-31T17:57:36.205Z",
+    "buildDate": "2020-06-01T01:13:48.575Z",
     "version":   "1.0.0-beta.0"
   }
 }

packages/console-app/webpack-common.config.js

@@ -72,8 +72,7 @@ module.exports = {
 
     // NOTE: Must be defined below Dotenv (otherwise will override).
     // https://webpack.js.org/plugins/environment-plugin
-    new webpack.EnvironmentPlugin({
-    }),
+    // new webpack.EnvironmentPlugin({}),
 
     // Define the build config file based on the target.
     // https://webpack.js.org/plugins/normal-module-replacement-plugin

packages/console-server/package.json

@@ -85,7 +85,7 @@
     "react-dom": "^16.13.1",
     "semistandard": "^14.2.0",
     "webpack": "^4.41.2",
-    "webpack-cli": "^3.3.10",
+    "webpack-cli": "^3.3.11",
     "webpack-dev-server": "^3.11.0",
     "webpack-merge": "^4.2.2"
   },