Merge branch 'canary' into 18563-etag

vercel · Nov 10, 2020 · 20ef404 · 20ef404
2 parents 7e13c24 + d5daa06
commit 20ef404
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/examples/with-mobx/.babelrc b/examples/with-mobx/.babelrc
@@ -2,6 +2,6 @@
  "presets": ["next/babel"],
  "plugins": [
  ["@babel/plugin-proposal-decorators", { "legacy": true }],
- ["@babel/plugin-proposal-class-properties", { "loose": true }]
+ ["@babel/plugin-proposal-class-properties", { "loose": false }]
  ]
 }
diff --git a/examples/with-mobx/package.json b/examples/with-mobx/package.json
@@ -7,8 +7,8 @@
  "start": "next start"
  },
  "dependencies": {
- "mobx": "^5.15.4",
- "mobx-react": "^6.2.2",
+ "mobx": "^6.0.1",
+ "mobx-react": "^7.0.0",
  "next": "latest",
  "react": "^16.13.1",
  "react-dom": "^16.13.1"

diff --git a/examples/with-mobx/store.js b/examples/with-mobx/store.js
@@ -1,12 +1,16 @@
-import { action, observable, computed, runInAction } from 'mobx'
-import { useStaticRendering } from 'mobx-react'
+import { action, observable, computed, runInAction, makeObservable } from 'mobx'
+import { enableStaticRendering } from 'mobx-react'
 import { useMemo } from 'react'
 // eslint-disable-next-line react-hooks/rules-of-hooks
-useStaticRendering(typeof window === 'undefined')
+enableStaticRendering(typeof window === 'undefined')
 
 let store
 
 class Store {
+ constructor() {
+ makeObservable(this)
+ }
+
  @observable lastUpdate = 0
  @observable light = false