Skip to content

Commit 05153c8

Browse files
committed
Merge branch 'MichaelDeBoey-overmind/ZenModeIntroductionModal'
2 parents dc1e5f4 + 8b19baf commit 05153c8

File tree

4 files changed

+21
-69
lines changed

4 files changed

+21
-69
lines changed

packages/app/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@
158158
"normalizr": "^3.2.3",
159159
"onigasm": "^2.2.1",
160160
"ot": "^0.0.15",
161-
"overmind": "^20.1.0-1572182984474",
161+
"overmind": "^21.0.0-1575912749783",
162162
"overmind-devtools": "^19.0.0",
163-
"overmind-react": "^21.1.0-1572182984474",
163+
"overmind-react": "^22.0.0-1575912749783",
164164
"phoenix": "^1.4.11",
165165
"postcss": "^6.0.9",
166166
"postcss-selector-parser": "^2.2.3",

packages/app/src/app/pages/Sandbox/ZenModeIntroductionModal/elements.ts

Lines changed: 0 additions & 18 deletions
This file was deleted.

packages/app/src/app/pages/Sandbox/ZenModeIntroductionModal/index.tsx

Lines changed: 0 additions & 30 deletions
This file was deleted.

yarn.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6989,10 +6989,10 @@ [email protected]:
69896989
"@types/node" "^10.5.1"
69906990
tslib "^1.9.3"
69916991

6992-
[email protected]1572182984474:
6993-
version "1.0.2-1572182984474"
6994-
resolved "https://registry.yarnpkg.com/betsy/-/betsy-1.0.2-1572182984474.tgz#38ac89fbf0298e700cb9c837459c706afcf8856c"
6995-
integrity sha512-kcpFwT1SNYf+P0D9tCuNH+mrhEH2Un2cUyn8dwPCRn98FiD97iyIO0f7t3GijThoh1RLzZ5l+pUP0zIy+3mmrQ==
6992+
[email protected]1575912749783:
6993+
version "1.0.2-1575912749783"
6994+
resolved "https://registry.yarnpkg.com/betsy/-/betsy-1.0.2-1575912749783.tgz#490d13a88200edea620bce29d3606ec9389fcd3c"
6995+
integrity sha512-wD9Ev7hmZIi88/y0ti+wqMkQZJgxt4VeYi8Vf4gIB5wV3BRnnInsP6kOHn9SpJA0YGxRtMsyYviVVJnrNymhEg==
69966996

69976997
better-assert@~1.0.0:
69986998
version "1.0.2"
@@ -20460,12 +20460,12 @@ [email protected]:
2046020460
overmind "18.0.1"
2046120461
tslib "^1.9.3"
2046220462

20463-
overmind-react@^21.1.0-1572182984474:
20464-
version "21.1.0-1572182984474"
20465-
resolved "https://registry.yarnpkg.com/overmind-react/-/overmind-react-21.1.0-1572182984474.tgz#25af55b937eb1272ef218c5bc0926df0ff00f125"
20466-
integrity sha512-TK9/KkILjJUTMArRjwnm/1XCk8JhUjI2kC31Qs2F3XnkalhydR8X1YsNoK8X7BpmrZq0hZE2tmNjMFvKsyb6Hw==
20463+
overmind-react@^22.0.0-1575912749783:
20464+
version "22.0.0-1575912749783"
20465+
resolved "https://registry.yarnpkg.com/overmind-react/-/overmind-react-22.0.0-1575912749783.tgz#07c3bb982a4ace5533a9b2f1a260ac4f4af0dac2"
20466+
integrity sha512-BHU3GvfOQcuI8Mf/NaLh0a+k65w2lDdo6otqDvwoE2kagwvi7esnNL6y1fA9/eeTReTkTyRCkqo3L8o43MTEdQ==
2046720467
dependencies:
20468-
overmind "20.1.0-1572182984474"
20468+
overmind "21.0.0-1575912749783"
2046920469

2047020470
overmind-themes@next:
2047120471
version "1.0.2-1562145138120"
@@ -20485,14 +20485,14 @@ [email protected]:
2048520485
proxy-state-tree "4.4.0"
2048620486
tslib "^1.9.3"
2048720487

20488-
overmind@20.1.0-1572182984474, overmind@^20.1.0-1572182984474:
20489-
version "20.1.0-1572182984474"
20490-
resolved "https://registry.yarnpkg.com/overmind/-/overmind-20.1.0-1572182984474.tgz#0d90c89969aa612ed536b742ab0510088437c2e3"
20491-
integrity sha512-GCkGlMthw+WqRbzqUtNexHTHFrTZDQ6smZh4cckyxEkzrv9tshfkZwe72SkzGibSn2/2VuCfhGQ955SjqKh8pg==
20488+
overmind@21.0.0-1575912749783, overmind@^21.0.0-1575912749783:
20489+
version "21.0.0-1575912749783"
20490+
resolved "https://registry.yarnpkg.com/overmind/-/overmind-21.0.0-1575912749783.tgz#911490b517bcbedf9c1dbc50cb1d69597e793ce8"
20491+
integrity sha512-/LQKLJ8kagrQuNEw8LEaZ++gZ13k8SgJrkdXpFBJ3/4t7QFY4nokiIP/fwLnHpcxFykf9o9fFPGw7cSxTJBq3w==
2049220492
dependencies:
20493-
betsy "1.0.2-1572182984474"
20493+
betsy "1.0.2-1575912749783"
2049420494
is-plain-obj "^1.1.0"
20495-
proxy-state-tree "4.6.0-1572182984474"
20495+
proxy-state-tree "4.6.0-1575912749783"
2049620496
tslib "^1.10.0"
2049720497

2049820498
p-cancelable@^0.3.0:
@@ -22730,10 +22730,10 @@ [email protected]:
2273022730
dependencies:
2273122731
is-plain-obj "^1.1.0"
2273222732

22733-
[email protected]1572182984474:
22734-
version "4.6.0-1572182984474"
22735-
resolved "https://registry.yarnpkg.com/proxy-state-tree/-/proxy-state-tree-4.6.0-1572182984474.tgz#738fec6dc07ac792e64639de1b3c41163d2f0685"
22736-
integrity sha512-2dvPw7hHOfbCezyijSlX7vfPyDzzti6sGcfwjug288695PPl24xLegXO96YtNe8XvKJGsagc8JHv2DJ/vhzvdQ==
22733+
[email protected]1575912749783:
22734+
version "4.6.0-1575912749783"
22735+
resolved "https://registry.yarnpkg.com/proxy-state-tree/-/proxy-state-tree-4.6.0-1575912749783.tgz#f1ba65f02d7538cd9f4a051912dfcc3acd5e15eb"
22736+
integrity sha512-0KfTL1GsS5I0W5OS+VmfkYordHpreahRuJPVQ6uVQS/pdS16QHIuX1b6MaJgaqhrYrovaiHQubbHAJFVWBURDw==
2273722737
dependencies:
2273822738
is-plain-obj "^1.1.0"
2273922739

0 commit comments

Comments
 (0)