Fix site

emotion-js · emmatown · Jul 2, 2018 · May 5, 2018 · May 5, 2018 · Jun 28, 2018
commit ec46278b1a845a6a938bdfc8fcd60122ce0ab1c2
diff --git a/site/gatsby-node.js b/site/gatsby-node.js
@@ -5,9 +5,9 @@ global.Babel = require('babel-standalone')
 
 exports.onCreateWebpackConfig = ({ stage, actions, plugins, getConfig }) => {
   actions.setWebpackConfig({
-    plugins: [plugins.ignore(/^(xor|props)$/)],
+    // xor and props are for react-live and cosmiconfig is for babel-plugin-macros
+    plugins: [plugins.ignore(/^(xor|props|cosmiconfig)$/)],
     resolve: {
-      modules: ['node_modules'],
       alias: {
         assert: 'fbjs/lib/emptyFunction',
         'source-map': 'fbjs/lib/emptyFunction',
@@ -28,6 +28,9 @@ exports.onCreateWebpackConfig = ({ stage, actions, plugins, getConfig }) => {
       ...config.output,
       // this doesn't seem to always merge correctly with `setWebpackConfig` for some reason
       // so i'm setting it here
+      // this is here because it defaults to window and is used for hot reloading and other stuff
+      // so if this wasn't here, the web worker would break
+      // since it would try to access window
       globalObject: 'this'
     },
     module: {

diff --git a/site/package.json b/site/package.json
@@ -26,7 +26,6 @@
     "gatsby-plugin-emotion": "^2.0.0-beta.2",
     "gatsby-plugin-netlify": "1.0.19-11",
     "gatsby-plugin-react-helmet": "^3.0.0-beta.3",
-    "gatsby-plugin-react-next": "next",
     "gatsby-plugin-sharp": "^2.0.0-beta.2",
     "gatsby-plugin-sitemap": "^2.0.0-beta.2",
     "gatsby-remark-autolink-headers": "^2.0.0-beta.3",

diff --git a/site/src/components/live/compile.js b/site/src/components/live/compile.js
@@ -40,8 +40,7 @@ export const compileAndEvaluate = (
   code: string,
   compiler: Compiler,
   scope: Scope
-): Promise<{ error: Error | null, element: React.Element<*> | null }> => {
-  // $FlowFixMe i'm lazy
+): Promise<{ error: Error | null, element: React.Node | null }> => {
   return compiler(code)
     .then(compiledCode => {
       return evaluate(compiledCode, scope)

diff --git a/site/src/components/live/index.js b/site/src/components/live/index.js
@@ -15,7 +15,7 @@ type Props = {
 
 type State = {
   code: string,
-  element: React.Element<*> | null,
+  element: React.Node | null,
   error: Error | null
 }
 

diff --git a/yarn.lock b/yarn.lock
@@ -4106,7 +4106,7 @@ core-js@^1.0.0:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
-core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.1, core-js@^2.5.3, core-js@^2.5.7:
+core-js@^2.4.0, core-js@^2.4.1, core-js@^2.5.0, core-js@^2.5.3, core-js@^2.5.7:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
 
@@ -6530,14 +6530,6 @@ gatsby-plugin-react-helmet@^3.0.0-beta.3:
   dependencies:
     "@babel/runtime" "7.0.0-beta.51"
 
-gatsby-plugin-react-next@next:
-  version "2.0.1-13"
-  resolved "https://registry.yarnpkg.com/gatsby-plugin-react-next/-/gatsby-plugin-react-next-2.0.1-13.tgz#c08a5335c0b3c9e8f016ae5495a17c8ce1422a44"
-  dependencies:
-    "@babel/runtime" "7.0.0-beta.47"
-    core-js "^2.5.1"
-    resolve "^1.5.0"
-
 gatsby-plugin-sharp@^2.0.0-beta.2:
   version "2.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gatsby-plugin-sharp/-/gatsby-plugin-sharp-2.0.0-beta.2.tgz#ea7e42d1ba7adbeebeeffe3ddafc675d6eb2fc33"