update pkg & fix conflict

mydearxym · mydearxym · commit 4808e7a0c007 · 2018-08-11T09:29:16.000+08:00
diff --git a/containers/Comments/store.js b/containers/Comments/store.js
@@ -41,7 +41,7 @@ const CommentsStore = t
     showReplyPreview: t.optional(t.boolean, false),
 
     // current to be delete comment id, use to target the confirm mask
-    tobeDeleteId: t.maybe(t.string),
+    tobeDeleteId: t.maybeNull(t.string),
     // words count for current comment (include reply comment)
     countCurrent: t.optional(t.number, 0),
     // cur filter type of comment list
@@ -67,7 +67,7 @@ const CommentsStore = t
     extractMentions: t.optional(t.array(t.string), []),
 
     // parrent comment of current reply
-    replyToComment: t.maybe(Comment),
+    replyToComment: t.maybeNull(Comment),
 
     // toggle loading for creating comment
     creating: t.optional(t.boolean, false),
diff --git a/containers/CommunitiesBanner/store.js b/containers/CommunitiesBanner/store.js
@@ -14,7 +14,7 @@ const debug = makeDebugger('S:CommunitiesBannerStore')
 
 const CommunitiesBannerStore = t
   .model('CommunitiesBannerStore', {
-    pagedCategories: t.maybe(PagedCategories),
+    pagedCategories: t.maybeNull(PagedCategories),
     activeRaw: t.optional(t.string, 'all'),
   })
   .views(self => ({
diff --git a/containers/CommunitiesContent/store.js b/containers/CommunitiesContent/store.js
@@ -14,12 +14,12 @@ const debug = makeDebugger('S:CommunitiesContentStore')
 
 const CommunitiesContentStore = t
   .model('CommunitiesContentStore', {
-    pagedCommunities: t.maybe(PagedCommunities),
+    pagedCommunities: t.maybeNull(PagedCommunities),
     // cur active category
     /* category: t.optional(t.string, ''), */
     // for UI loading state
     subscribing: t.optional(t.boolean, false),
-    subscribingId: t.maybe(t.string),
+    subscribingId: t.maybeNull(t.string),
   })
   .views(self => ({
     get root() {
diff --git a/containers/Doraemon/store.js b/containers/Doraemon/store.js
@@ -36,10 +36,10 @@ const convertThreadsToMaps = com => {
 
 const Suggestion = t.model('Suggestion', {
   title: t.string,
-  desc: t.maybe(t.string),
+  desc: t.maybeNull(t.string),
   raw: t.string,
-  logo: t.maybe(t.string),
-  cmd: t.maybe(t.enumeration('cmd', ['theme', 'debug'])),
+  logo: t.maybeNull(t.string),
+  cmd: t.maybeNull(t.enumeration('cmd', ['theme', 'debug'])),
   descType: t.optional(
     t.enumeration('descType', ['text', 'component']),
     'text'
@@ -51,12 +51,12 @@ const DoraemonStore = t
     visible: t.optional(t.boolean, false),
     inputValue: t.optional(t.string, ''),
     suggestions: t.optional(t.array(Suggestion), []),
-    activeRaw: t.maybe(t.string),
+    activeRaw: t.maybeNull(t.string),
     // TODO: prefix -> cmdPrefix, and prefix be a getter
     prefix: t.optional(t.string, ''),
     // for debug config, input login/password ... etc
     inputForOtherUse: t.optional(t.boolean, false),
-    cmdChain: t.maybe(t.array(t.string)),
+    cmdChain: t.maybeNull(t.array(t.string)),
   })
   .views(self => ({
     get root() {
diff --git a/containers/JobsThread/store.js b/containers/JobsThread/store.js
@@ -55,10 +55,10 @@ const FilterModel = t.model('FilterModel', {
 
 const JobsThreadStore = t
   .model('JobsThreadStore', {
-    pagedJobs: t.maybe(PagedJobs),
+    pagedJobs: t.maybeNull(PagedJobs),
     filters: t.optional(FilterModel, {}),
     tags: t.optional(t.array(Tag), []),
-    activeTag: t.maybe(Tag),
+    activeTag: t.maybeNull(Tag),
     curView: t.optional(
       t.enumeration('curView', [
         TYPE.RESULT,
diff --git a/containers/PostsThread/store.js b/containers/PostsThread/store.js
@@ -60,7 +60,7 @@ const PostsThreadStore = t
     filters: t.optional(FilterModel, {}),
     /* tags: t.optional(t.map(Tag), {}), */
     tags: t.optional(t.array(Tag), []),
-    activeTag: t.maybe(Tag),
+    activeTag: t.maybeNull(Tag),
     curView: t.optional(
       t.enumeration('curView', [
         TYPE.RESULT,
diff --git a/containers/Preview/store.js b/containers/Preview/store.js
@@ -12,7 +12,7 @@ import { markStates, TYPE, unholdPage } from '../../utils'
 const PreviewStore = t
   .model('PreviewStore', {
     visible: t.optional(t.boolean, false),
-    type: t.maybe(
+    type: t.maybeNull(
       t.enumeration('previewType', [
         TYPE.POST_PREVIEW_VIEW,
         TYPE.PREVIEW_ACCOUNT_VIEW,
diff --git a/containers/ReposThread/store.js b/containers/ReposThread/store.js
@@ -47,7 +47,7 @@ const ReposThread = t
     filters: t.optional(FilterModel, {}),
     /* tags: t.optional(t.map(Tag), {}), */
     tags: t.optional(t.array(Tag), []),
-    activeTag: t.maybe(Tag),
+    activeTag: t.maybeNull(Tag),
     curView: t.optional(
       t.enumeration('curView', [
         TYPE.RESULT,
diff --git a/containers/VideosThread/store.js b/containers/VideosThread/store.js
@@ -45,7 +45,7 @@ const VideosThread = t
     pagedVideos: t.optional(PagedVideos, emptyPagiData),
     filters: t.optional(FilterModel, {}),
     tags: t.optional(t.array(Tag), []),
-    activeTag: t.maybe(Tag),
+    activeTag: t.maybeNull(Tag),
     curView: t.optional(
       t.enumeration('curView', [
         TYPE.RESULT,
diff --git a/cypress/integration/first.spec.js b/cypress/integration/first.spec.js
@@ -1,5 +1,5 @@
 describe('first', () => {
   it('visit the site', () => {
-    cy.visit('http://localhost:3000')
+    cy.visit('http://localhost:3000/javascript/posts')
   })
 })
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
   },
   "dependencies": {
     "accepts": "^1.3.4",
-    "antd": "3.8.0",
+    "antd": "3.1.6",
     "apollo-cache-inmemory": "1.2.6",
     "apollo-client": "2.3.7",
     "apollo-link": "1.2.2",
@@ -69,9 +69,9 @@
     "isomorphic-fetch": "^2.2.1",
     "js-cookie": "^2.2.0",
     "mastani-codehighlight": "0.0.7",
-    "mobx": "5.0.3",
+    "mobx": "4.3.1",
     "mobx-react": "5.2.3",
-    "mobx-state-tree": "3.0.2",
+    "mobx-state-tree": "3.1.1",
     "module-alias": "^2.0.1",
     "next": "6.1.1",
     "next-progressbar": "^1.0.0",
@@ -82,7 +82,7 @@
     "ramda": "0.25.0",
     "randomcolor": "^0.5.3",
     "react": "16.4.2",
-    "react-beautiful-dnd": "8.0.7",
+    "react-beautiful-dnd": "6.0.0",
     "react-calendar-heatmap": "^1.6.3",
     "react-click-outside": "^3.0.1",
     "react-content-loader": "3.1.2",
@@ -100,7 +100,7 @@
     "remarkable-mentions": "^0.1.0",
     "rxjs": "6.2.2",
     "rxjs-compat": "6.2.2",
-    "scroll-into-view-if-needed": "2.2.16",
+    "scroll-into-view-if-needed": "1.5.0",
     "shortid": "^2.2.8",
     "store": "^2.0.12",
     "styled-components": "3.4.1",
@@ -133,15 +133,15 @@
     "eslint-config-prettier": "2.9.0",
     "eslint-plugin-cypress": "^2.0.1",
     "eslint-plugin-import": "2.13.0",
-    "eslint-plugin-jsx-a11y": "6.1.1",
+    "eslint-plugin-jsx-a11y": "6.0.3",
     "eslint-plugin-prettier": "2.6.2",
     "eslint-plugin-react": "7.10.0",
     "eslint-watch": "4.0.2",
     "husky": "^0.14.3",
     "jest": "23.4.2",
     "lint-staged": "7.2.0",
     "npm-run-all": "^4.1.1",
-    "plop": "^2.0.0",
+    "plop": "2.0.0",
     "prettier": "1.14.0",
     "react-test-renderer": "16.4.2",
     "shelljs": "0.8.2",
diff --git a/stores/RootStore/index.js b/stores/RootStore/index.js
@@ -56,7 +56,7 @@ const rootStore = t
   .model({
     // domain stores
     account: t.optional(AccountStore, {}),
-    users: t.maybe(UsersStore),
+    users: t.maybeNull(UsersStore),
     route: t.optional(RouteStore, {}),
     viewing: t.optional(ViewingStore, {}),
     comments: t.optional(CommentsStore, {}),
diff --git a/stores/SharedModel/Article.js b/stores/SharedModel/Article.js
@@ -1,8 +1,8 @@
 import { types as t } from 'mobx-state-tree'
 
 const Article = t.model('Article', {
-  id: t.maybe(t.string),
-  title: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  title: t.maybeNull(t.string),
   desc: t.optional(t.string, ''),
 })
 
diff --git a/stores/SharedModel/Category.js b/stores/SharedModel/Category.js
@@ -4,24 +4,24 @@ import { PAGE_SIZE } from '../../config'
 
 // NOTE: the SimpleXXX version is to avoid circle import issue which cause MST error
 const SimpleCommunity = t.model('SimpleCommunity', {
-  id: t.maybe(t.string),
-  title: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  title: t.maybeNull(t.string),
   desc: t.optional(t.string, ''),
-  raw: t.maybe(t.string),
-  logo: t.maybe(t.string),
+  raw: t.maybeNull(t.string),
+  logo: t.maybeNull(t.string),
 })
 
 const SimpleUser = t.model('SimpleUser', {
-  id: t.maybe(t.string),
-  nickname: t.maybe(t.string),
-  bio: t.maybe(t.string),
-  avatar: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  nickname: t.maybeNull(t.string),
+  bio: t.maybeNull(t.string),
+  avatar: t.maybeNull(t.string),
 })
 
 export const Category = t.model('Category', {
-  id: t.maybe(t.string),
-  title: t.maybe(t.string),
-  raw: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  title: t.maybeNull(t.string),
+  raw: t.maybeNull(t.string),
   communities: t.optional(t.array(SimpleCommunity), []),
   author: t.optional(SimpleUser, {}),
   insertedAt: t.optional(t.string, ''),
diff --git a/stores/SharedModel/Comment.js b/stores/SharedModel/Comment.js
@@ -4,25 +4,25 @@ import { PAGE_SIZE } from '../../config'
 import { User } from './User'
 
 const CommentBrief = t.model('CommentBrief', {
-  id: t.maybe(t.string),
-  body: t.maybe(t.string),
-  floor: t.maybe(t.number),
+  id: t.maybeNull(t.string),
+  body: t.maybeNull(t.string),
+  floor: t.maybeNull(t.number),
   author: t.optional(User, {}),
 })
 
 export const Comment = t.model('Comment', {
-  id: t.maybe(t.string),
-  body: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  body: t.maybeNull(t.string),
   author: t.optional(User, {}),
   floor: t.number,
-  replyTo: t.maybe(CommentBrief),
+  replyTo: t.maybeNull(CommentBrief),
   replies: t.optional(t.array(CommentBrief), []),
   contributesDigest: t.optional(t.array(t.number), []),
   repliesCount: t.optional(t.number, 0),
   likesCount: t.optional(t.number, 0),
   dislikesCount: t.optional(t.number, 0),
-  viewerHasLiked: t.maybe(t.boolean),
-  viewerHasDisliked: t.maybe(t.boolean),
+  viewerHasLiked: t.maybeNull(t.boolean),
+  viewerHasDisliked: t.maybeNull(t.boolean),
   insertedAt: t.optional(t.string, ''),
   updatedAt: t.optional(t.string, ''),
 })
diff --git a/stores/SharedModel/Community.js b/stores/SharedModel/Community.js
@@ -9,22 +9,22 @@ const Thread = t.model('Thread', {
 })
 
 export const SimpleCategory = t.model('Category', {
-  id: t.maybe(t.string),
-  title: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  title: t.maybeNull(t.string),
 })
 
 export const Community = t.model('Community', {
-  id: t.maybe(t.string),
-  title: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  title: t.maybeNull(t.string),
   desc: t.optional(t.string, ''),
-  raw: t.maybe(t.string),
-  logo: t.maybe(t.string),
+  raw: t.maybeNull(t.string),
+  logo: t.maybeNull(t.string),
   categories: t.optional(t.array(SimpleCategory), []),
   contributesDigest: t.optional(t.array(t.number), []),
   subscribersCount: t.optional(t.number, 0),
   editorsCount: t.optional(t.number, 0),
   postsCount: t.optional(t.number, 0),
-  viewerHasSubscribed: t.maybe(t.boolean),
+  viewerHasSubscribed: t.maybeNull(t.boolean),
   threads: t.optional(t.array(Thread), []),
   insertedAt: t.optional(t.string, ''),
   updatedAt: t.optional(t.string, ''),
diff --git a/stores/SharedModel/Job.js b/stores/SharedModel/Job.js
@@ -8,12 +8,12 @@ import { Comment } from './Comment'
 import { Tag } from './Tag'
 
 export const Job = t.model('Job', {
-  id: t.maybe(t.string),
-  title: t.maybe(t.string),
-  body: t.maybe(t.string),
-  digest: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  title: t.maybeNull(t.string),
+  body: t.maybeNull(t.string),
+  digest: t.maybeNull(t.string),
   // author: t.optional(User, {}),
-  author: t.maybe(User),
+  author: t.maybeNull(User),
 
   communities: t.optional(t.array(Community), []),
   tags: t.optional(t.array(Tag), []),
diff --git a/stores/SharedModel/Post.js b/stores/SharedModel/Post.js
@@ -8,12 +8,12 @@ import { Comment } from './Comment'
 import { Tag } from './Tag'
 
 export const Post = t.model('Post', {
-  id: t.maybe(t.string),
-  title: t.maybe(t.string),
-  body: t.maybe(t.string),
-  digest: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  title: t.maybeNull(t.string),
+  body: t.maybeNull(t.string),
+  digest: t.maybeNull(t.string),
   // author: t.optional(User, {}),
-  author: t.maybe(User),
+  author: t.maybeNull(User),
 
   communities: t.optional(t.array(Community), []),
   tags: t.optional(t.array(Tag), []),
diff --git a/stores/SharedModel/Repo.js b/stores/SharedModel/Repo.js
@@ -7,17 +7,17 @@ import { Community } from './Community'
 import { Tag } from './Tag'
 
 export const Repo = t.model('Reop', {
-  id: t.maybe(t.string),
-  repoName: t.maybe(t.string),
-  desc: t.maybe(t.string),
-  readme: t.maybe(t.string),
-  language: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  repoName: t.maybeNull(t.string),
+  desc: t.maybeNull(t.string),
+  readme: t.maybeNull(t.string),
+  language: t.maybeNull(t.string),
 
-  author: t.maybe(User),
+  author: t.maybeNull(User),
 
-  repoLink: t.maybe(t.string),
-  producer: t.maybe(t.string),
-  producerLink: t.maybe(t.string),
+  repoLink: t.maybeNull(t.string),
+  producer: t.maybeNull(t.string),
+  producerLink: t.maybeNull(t.string),
 
   repoStarCount: t.optional(t.number, 0),
   repoForkCount: t.optional(t.number, 0),
diff --git a/stores/SharedModel/Tag.js b/stores/SharedModel/Tag.js
@@ -4,11 +4,11 @@ import { TAG_COLORS, CMS_THREADS, PAGE_SIZE } from '../../config'
 import { Community } from './Community'
 
 export const Tag = t.model('Tag', {
-  id: t.maybe(t.string),
-  title: t.maybe(t.string),
+  id: t.maybeNull(t.string),
+  title: t.maybeNull(t.string),
   color: t.optional(t.enumeration('color', TAG_COLORS), TAG_COLORS[0]),
   thread: t.optional(t.enumeration('thread', CMS_THREADS), CMS_THREADS[0]),
-  community: t.maybe(Community),
+  community: t.maybeNull(Community),
   insertedAt: t.optional(t.string, ''),
   updatedAt: t.optional(t.string, ''),
 })
diff --git a/stores/SharedModel/User.js b/stores/SharedModel/User.js
diff --git a/stores/SharedModel/Video.js b/stores/SharedModel/Video.js
diff --git a/stores/UsersStore/index.js b/stores/UsersStore/index.js
diff --git a/utils/mobx_helper.js b/utils/mobx_helper.js
diff --git a/yarn.lock b/yarn.lock
