fix: improve dependency resolution

webiny · May 8, 2020 · c43e01e · c43e01e
1 parent 4618ec0
commit c43e01e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -18,7 +18,8 @@
     "nohoist": [
       "**/inquirer/**",
       "**/mime/**",
-      "**/@types/mocha"
+      "**/@types/mocha",
+      "**/semver"
     ]
   },
   "contributors": [

diff --git a/packages/project-utils/bundling/app/config/webpack.config.js b/packages/project-utils/bundling/app/config/webpack.config.js
@@ -295,12 +295,13 @@ module.exports = function(webpackEnv, { paths, babelCustomizer }) {
             alias: {
                 // Support React Native Web
                 // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-                "react-native": "react-native-web",
-                "react-dom": "@hot-loader/react-dom",
+                "react-native": require.resolve("react-native-web"),
+                "react-dom$": require.resolve("@hot-loader/react-dom"),
+                react: require.resolve("react"),
                 // Allows for better profiling with ReactDevTools
                 ...(isEnvProductionProfile && {
-                    "react-dom$": "react-dom/profiling",
-                    "scheduler/tracing": "scheduler/tracing-profiling"
+                    "react-dom$": require.resolve("react-dom/profiling"),
+                    "scheduler/tracing": require.resolve("scheduler/tracing-profiling")
                 }),
                 ...(modules.webpackAliases || {})
             },

diff --git a/packages/project-utils/package.json b/packages/project-utils/package.json
@@ -13,11 +13,13 @@
     "Adrian Smijulj <[email protected]>"
   ],
   "dependencies": {
-    "@babel/core": "7.7.4",
+    "@apollo/react-ssr": "^3.1.5",
+    "@babel/core": "^7.9.6",
     "@babel/preset-env": "^7.9.6",
     "@babel/preset-react": "^7.9.4",
     "@babel/preset-typescript": "^7.9.0",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
     "@hot-loader/react-dom": "^16.13.0",
     "@svgr/webpack": "4.3.3",
     "@testing-library/jest-dom": "^4.2.4",
@@ -66,8 +68,11 @@
     "postcss-normalize": "8.0.1",
     "postcss-preset-env": "6.7.0",
     "postcss-safe-parser": "4.0.1",
+    "react-apollo": "^3.1.5",
     "react-app-polyfill": "^1.0.5",
     "react-dev-utils": "^10.0.0",
+    "react-helmet": "^6.0.0",
+    "react-native-web": "^0.12.2",
     "resolve": "1.12.2",
     "resolve-url-loader": "3.1.1",
     "sass-loader": "8.0.0",