Skip to content

Commit

Permalink
Updated examples
Browse files Browse the repository at this point in the history
  • Loading branch information
@mweststrate
mweststrate committed Jun 12, 2017
1 parent a7e7e34 commit 2143880
Show file tree
Hide file tree
Showing 13 changed files with 94 additions and 148 deletions.
4 changes: 2 additions & 2 deletions examples/bookshop/package.json
View file
Expand Up @@ -6,10 +6,10 @@
"react-scripts": "0.9.0"
},
"dependencies": {
"mobx": "^3.1.12",
"mobx": "3.1.15",
"mobx-react": "^4.1.7",
"mobx-react-devtools": "^4.2.11",
"mobx-state-tree": "^0.6.2",
"mobx-state-tree": "^0.7.1",
"mobx-utils": "^2.0.1",
"path-match": "^1.2.4",
"react": "^15.5.0",
Expand Down
2 changes: 1 addition & 1 deletion examples/bookshop/src/stores/CartStore.js
View file
Expand Up @@ -4,7 +4,7 @@ import { Book } from "./BookStore"

const CartEntry = types.model("CartEntry", {
quantity: 0,
book: types.reference(Book, "../../../bookStore/books"),
book: types.reference(Book),
get price() {
return this.book.price * this.quantity
},
Expand Down
102 changes: 22 additions & 80 deletions examples/bookshop/yarn.lock
View file
Expand Up @@ -225,7 +225,7 @@ babel-code-frame@^6.11.0, babel-code-frame@^6.16.0, babel-code-frame@^6.22.0:
esutils "^2.0.2"
js-tokens "^3.0.0"

babel-core@6.22.1, babel-core@^6.22.0:
babel-core@6.22.1, babel-core@^6.0.0, babel-core@^6.22.0:
version "6.22.1"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.22.1.tgz#9c5fd658ba1772d28d721f6d25d968fc7ae21648"
dependencies:
Expand All @@ -249,32 +249,6 @@ babel-core@6.22.1, babel-core@^6.22.0:
slash "^1.0.0"
source-map "^0.5.0"

babel-core@^6.0.0:
version "6.17.0"
resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.17.0.tgz#6c4576447df479e241e58c807e4bc7da4db7f425"
dependencies:
babel-code-frame "^6.16.0"
babel-generator "^6.17.0"
babel-helpers "^6.16.0"
babel-messages "^6.8.0"
babel-register "^6.16.0"
babel-runtime "^6.9.1"
babel-template "^6.16.0"
babel-traverse "^6.16.0"
babel-types "^6.16.0"
babylon "^6.11.0"
convert-source-map "^1.1.0"
debug "^2.1.1"
json5 "^0.4.0"
lodash "^4.2.0"
minimatch "^3.0.2"
path-exists "^1.0.0"
path-is-absolute "^1.0.0"
private "^0.1.6"
shebang-regex "^1.0.0"
slash "^1.0.0"
source-map "^0.5.0"

babel-eslint@7.1.1:
version "7.1.1"
resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-7.1.1.tgz#8a6a884f085aa7060af69cfc77341c2f99370fb2"
Expand All @@ -285,7 +259,7 @@ babel-eslint@7.1.1:
babylon "^6.13.0"
lodash.pickby "^4.6.0"

babel-generator@^6.17.0, babel-generator@^6.18.0, babel-generator@^6.22.0:
babel-generator@^6.18.0, babel-generator@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.22.0.tgz#d642bf4961911a8adc7c692b0c9297f325cda805"
dependencies:
Expand Down Expand Up @@ -400,7 +374,7 @@ babel-helper-replace-supers@^6.22.0:
babel-traverse "^6.22.0"
babel-types "^6.22.0"

babel-helpers@^6.16.0, babel-helpers@^6.22.0:
babel-helpers@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-helpers/-/babel-helpers-6.22.0.tgz#d275f55f2252b8101bff07bc0c556deda657392c"
dependencies:
Expand All @@ -424,7 +398,7 @@ babel-loader@6.2.10:
mkdirp "^0.5.1"
object-assign "^4.0.1"

babel-messages@^6.22.0, babel-messages@^6.8.0:
babel-messages@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-messages/-/babel-messages-6.22.0.tgz#36066a214f1217e4ed4164867669ecb39e3ea575"
dependencies:
Expand Down Expand Up @@ -806,7 +780,7 @@ babel-preset-react@6.22.0:
babel-plugin-transform-react-jsx-self "^6.22.0"
babel-plugin-transform-react-jsx-source "^6.22.0"

babel-register@^6.16.0, babel-register@^6.22.0:
babel-register@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-register/-/babel-register-6.22.0.tgz#a61dd83975f9ca4a9e7d6eff3059494cd5ea4c63"
dependencies:
Expand All @@ -818,7 +792,7 @@ babel-register@^6.16.0, babel-register@^6.22.0:
mkdirp "^0.5.1"
source-map-support "^0.4.2"

babel-runtime@6.22.0, babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0, babel-runtime@^6.9.1:
babel-runtime@6.22.0, babel-runtime@^6.18.0, babel-runtime@^6.20.0, babel-runtime@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.22.0.tgz#1cf8b4ac67c77a4ddb0db2ae1f74de52ac4ca611"
dependencies:
Expand All @@ -835,7 +809,7 @@ babel-template@^6.16.0, babel-template@^6.22.0:
babylon "^6.11.0"
lodash "^4.2.0"

babel-traverse@^6.15.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.22.1:
babel-traverse@^6.15.0, babel-traverse@^6.18.0, babel-traverse@^6.22.0, babel-traverse@^6.22.1:
version "6.22.1"
resolved "https://registry.yarnpkg.com/babel-traverse/-/babel-traverse-6.22.1.tgz#3b95cd6b7427d6f1f757704908f2fc9748a5f59f"
dependencies:
Expand All @@ -849,7 +823,7 @@ babel-traverse@^6.15.0, babel-traverse@^6.16.0, babel-traverse@^6.18.0, babel-tr
invariant "^2.2.0"
lodash "^4.2.0"

babel-types@^6.15.0, babel-types@^6.16.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0:
babel-types@^6.15.0, babel-types@^6.18.0, babel-types@^6.19.0, babel-types@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-types/-/babel-types-6.22.0.tgz#2a447e8d0ea25d2512409e4175479fd78cc8b1db"
dependencies:
Expand Down Expand Up @@ -2142,20 +2116,13 @@ fs.realpath@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"

fsevents@1.0.17:
fsevents@1.0.17, fsevents@^1.0.0:
version "1.0.17"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.17.tgz#8537f3f12272678765b4fd6528c0f1f66f8f4558"
dependencies:
nan "^2.3.0"
node-pre-gyp "^0.6.29"

fsevents@^1.0.0:
version "1.0.14"
resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.0.14.tgz#558e8cc38643d8ef40fe45158486d0d25758eee4"
dependencies:
nan "^2.3.0"
node-pre-gyp "^0.6.29"

fstream-ignore@~1.0.5:
version "1.0.5"
resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105"
Expand Down Expand Up @@ -2400,7 +2367,7 @@ http-errors@~1.5.0, http-errors@~1.5.1:
setprototypeof "1.0.2"
statuses ">= 1.3.1 < 2"

http-proxy-middleware@0.17.3:
http-proxy-middleware@0.17.3, http-proxy-middleware@~0.17.1:
version "0.17.3"
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz#940382147149b856084f5534752d5b5a8168cd1d"
dependencies:
Expand All @@ -2409,16 +2376,7 @@ http-proxy-middleware@0.17.3:
lodash "^4.17.2"
micromatch "^2.3.11"

http-proxy-middleware@~0.17.1:
version "0.17.2"
resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.17.2.tgz#572d517a6d2fb1063a469de294eed96066352007"
dependencies:
http-proxy "^1.15.1"
is-glob "^3.0.0"
lodash "^4.16.2"
micromatch "^2.3.11"

http-proxy@^1.15.1, http-proxy@^1.16.2:
http-proxy@^1.16.2:
version "1.16.2"
resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742"
dependencies:
Expand Down Expand Up @@ -2594,7 +2552,7 @@ is-glob@^2.0.0, is-glob@^2.0.1:
dependencies:
is-extglob "^1.0.0"

is-glob@^3.0.0, is-glob@^3.1.0:
is-glob@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
dependencies:
Expand Down Expand Up @@ -3032,10 +2990,6 @@ json3@^3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.2.tgz#3c0434743df93e2f5c42aee7b19bcb483575f4e1"

json5@^0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.4.0.tgz#054352e4c4c80c86c0923877d449de176a732c8d"

json5@^0.5.0:
version "0.5.1"
resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
Expand Down Expand Up @@ -3205,7 +3159,7 @@ lodash.uniq@^4.3.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"

"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.2, lodash@^4.16.4, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.3.0:
"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.2, lodash@^4.2.0, lodash@^4.3.0:
version "4.17.4"
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"

Expand Down Expand Up @@ -3364,17 +3318,17 @@ mobx-react@^4.1.7:
dependencies:
hoist-non-react-statics "^1.2.0"

mobx-state-tree@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/mobx-state-tree/-/mobx-state-tree-0.6.2.tgz#aef2fdc2c71731c963c418525cfdc52e8031c9c7"
mobx-state-tree@^0.7.1:
version "0.7.1"
resolved "https://registry.yarnpkg.com/mobx-state-tree/-/mobx-state-tree-0.7.1.tgz#660bdafaea83f630aa94b63625302e6650568473"

mobx-utils@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/mobx-utils/-/mobx-utils-2.0.1.tgz#6460d6436f991b2d3250d51995cbcae2c5707b67"

mobx@^3.1.9:
version "3.1.9"
resolved "https://registry.yarnpkg.com/mobx/-/mobx-3.1.9.tgz#ed4af9d874ff6032c7af91fc1b87d9d33122a557"
mobx@3.1.15:
version "3.1.15"
resolved "https://registry.yarnpkg.com/mobx/-/mobx-3.1.15.tgz#b2c8831725de2f6f1b8d136e589b674b5b75c35d"

ms@0.7.1:
version "0.7.1"
Expand Down Expand Up @@ -3546,11 +3500,11 @@ oauth-sign@~0.8.1:
version "0.8.2"
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"

object-assign@4.1.1:
object-assign@4.1.1, object-assign@^4.0.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"

object-assign@^4.0.1, object-assign@^4.1.0:
object-assign@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.0.tgz#7a3b3d0e98063d43f4c03f2e8ae6cd51a86883a0"

Expand Down Expand Up @@ -3677,10 +3631,6 @@ path-browserify@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"

path-exists@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-1.0.0.tgz#d5a8998eb71ef37a74c34eb0d9eba6e878eea081"

path-exists@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
Expand Down Expand Up @@ -4596,10 +4546,6 @@ sha.js@2.2.6:
version "2.2.6"
resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.2.6.tgz#17ddeddc5f722fb66501658895461977867315ba"

shebang-regex@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"

shelljs@^0.6.0:
version "0.6.1"
resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.6.1.tgz#ec6211bed1920442088fe0f70b2837232ed2c8a8"
Expand Down Expand Up @@ -5195,14 +5141,10 @@ whatwg-encoding@^1.0.1:
dependencies:
iconv-lite "0.4.13"

whatwg-fetch@2.0.2:
whatwg-fetch@2.0.2, whatwg-fetch@>=0.10.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.2.tgz#fe294d1d89e36c5be8b3195057f2e4bc74fc980e"

whatwg-fetch@>=0.10.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-1.0.0.tgz#01c2ac4df40e236aaa18480e3be74bd5c8eb798e"

whatwg-url@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-4.3.0.tgz#92aaee21f4f2a642074357d70ef8500a7cbb171a"
Expand Down
5 changes: 3 additions & 2 deletions examples/boxes/package.json
View file
Expand Up @@ -36,14 +36,15 @@
"webpack-dev-server": "^1.8.2"
},
"dependencies": {
"mobx": "^3.1.12",
"mobx": "3.1.15",
"mobx-react": "^4.1.3",
"mobx-react-devtools": "^4.2.11",
"mobx-state-tree": "^0.5.0",
"mobx-state-tree": "^0.7.1",
"node-uuid": "^1.4.3",
"react": "^15.0.0",
"react-dom": "^15.0.0",
"react-draggable": "^1.0.1",
"remotedev": "^0.2.7",
"ws": "^1.1.1"
}
}
3 changes: 3 additions & 0 deletions examples/boxes/src/components/sidebar.js
View file
Expand Up @@ -6,6 +6,9 @@ class Sidebar extends Component {
const {selection} = this.props.store;
return selection
? <div className="sidebar sidebar-open">
<small>(control click the canvas to create new boxes)</small>
<hr/>
Caption:
<input onChange={this.onChange} value={selection.name} />
</div>
: <div className="sidebar" />;
Expand Down
2 changes: 1 addition & 1 deletion examples/boxes/src/index.js
View file
Expand Up @@ -24,7 +24,7 @@ ReactDOM.render(

function prepareStore(newStore) {
storeInstance.set(newStore)
connectReduxDevtools(newStore)
connectReduxDevtools(require("remotedev"), newStore)
syncStoreWithBackend(socket, newStore)
}

Expand Down
8 changes: 4 additions & 4 deletions examples/boxes/src/stores/domain-state.js
View file
Expand Up @@ -28,14 +28,14 @@ export const Box = types.model("Box", {

export const Arrow = types.model("Arrow", {
id: types.identifier(),
from: types.reference(Box, "../../boxes"),
to: types.reference(Box, "../../boxes")
from: types.reference(Box),
to: types.reference(Box)
})

export const Store = types.model("Store", {
boxes: types.map(Box),
arrows: types.array(Arrow),
selection: types.reference(Box, "./boxes")
selection: types.maybe(types.reference(Box))
}, {
addBox(name, x, y) {
const box = Box.create({ name, x, y, id: randomUuid() })
Expand Down Expand Up @@ -67,7 +67,7 @@ const store = Store.create({
"arrows":[
{"id":"7b5d33c1-5e12-4278-b1c5-e4ae05c036bd","from":"ce9131ee-f528-4952-a012-543780c5e66d","to":"14194d76-aa31-45c5-a00c-104cc550430f"}
],
"selection":""
"selection":null
})

export default store;
Expand Down
17 changes: 10 additions & 7 deletions examples/boxes/src/stores/domain-state.spec.js
View file
@@ -1,5 +1,5 @@
import {
getSnapshot, applyAction, clone, testActions
getSnapshot, applyActions, clone, testActions
} from "mobx-state-tree"
import {Box} from "./domain-state"

Expand All @@ -14,10 +14,13 @@ test("it should be able to move boxes - 1", () => {
})

test("it should be able to move boxes - 2", () => {
expect(testActions(
Box,
{ x: 100, y: 100, id: "1", name: "test" },
{ name: "move", args: [ 5, 5 ]},
{ name: "move", args: [ 3, 2 ]}
)).toMatchSnapshot()
const box = Box.create({ x: 100, y: 100, id: "1", name: "test" })
applyActions(
box,
[
{ name: "move", args: [ 5, 5 ]},
{ name: "move", args: [ 3, 2 ]}
]
)
expect(box.toJSON()).toMatchSnapshot()
})

0 comments on commit 2143880

Please sign in to comment.