chore: Merge branch 'dev'

Author: mydearxym

.babelrc

@@ -18,6 +18,18 @@
         }]
       ]
     },
+    "ci": {
+      "presets": [
+        ["next/babel", {
+          "preset-env": {
+            "targets": {
+              "ie": "11"
+            },
+            "debug": false
+          }
+        }]
+      ]
+    },
     "test": {
       "plugins": ["inline-dotenv"]
     }

.travis.yml

@@ -28,7 +28,9 @@ before_script:
 
 script:
   # - codecov
-  - nvm exec 10.10 npm run test:ci
+  - rm -rf .next
+  - nvm exec 12.4.0 npm run build.ci
+  - nvm exec 12.4.0 npm run test:ci
 
 cache:
   directories:
@@ -40,5 +42,4 @@ cache:
 notifications:
   email:
     on_failure: change
-
 # after_success: 'npm run coveralls'

README.md

@@ -1,14 +1,16 @@
 ![CPS Brand](https://github.com/mydearxym/mastani_server/blob/dev/docs/snapshots/cps_logo_md.png?raw=true)
-=========
+
+
 [![Build Status](https://travis-ci.org/coderplanets/coderplanets_web.svg?branch=dev)](https://travis-ci.org/coderplanets/coderplanets_web)
 [![codecov](https://codecov.io/gh/coderplanets/coderplanets_web/branch/dev/graph/badge.svg)](https://codecov.io/gh/coderplanets/coderplanets_web)
 [![dev status](https://david-dm.org/coderplanets/coderplanets_web.svg)](https://david-dm.org/coderplanets/coderplanets_web)
 [![CodeFactor](https://www.codefactor.io/repository/github/coderplanets/coderplanets_web/badge)](https://www.codefactor.io/repository/github/coderplanets/coderplanets_web)
 [![Powerd by](https://badgen.now.sh/badge/mastani/powered/a871c1)](https://github.com/mastani-stack)
 [![cpsbadge](https://badgen.net/badge/join%20community/on%20coderplanets/9cb77b)](https://coderplanets.com)
 
-
-## As advertising: the author is looking for a job :)
+---
+![cps_intro](https://user-images.githubusercontent.com/6184465/59546312-a1c0ac00-8f5d-11e9-85cc-db681a16ff13.jpg)
+---
 
 English | [中文](https://github.com/coderplanets/coderplanets_web/blob/docs/README.zh-CN.md) 
 

package-docker.json

@@ -4,6 +4,7 @@
   "license": "Apache License 2.0",
   "scripts": {
     "build.prod": "cross-env NODE_ENV=production next build",
+    "build.ci": "cross-env NODE_ENV=ci next build",
     "build.dev": "cross-env NODE_ENV=dev next build",
     "launch.dev": "cross-env NODE_ENV=dev SERVE_PORT=${SERVE_PORT} node server",
     "launch.prod": "cross-env NODE_ENV=production SERVE_PORT=${SERVE_PORT} node server"
@@ -17,6 +18,7 @@
     "next-progressbar": "^1.0.0",
     "@next/bundle-analyzer": "^8.1.0",
     "accepts": "^1.3.4",
+    "acorn": "^6.1.1",
     "antd": "3.8.4",
     "apollo-cache-inmemory": "1.5.1",
     "apollo-client": "2.5.1",
@@ -51,7 +53,7 @@
     "mobx-react-lite": "^1.2.0",
     "mobx-state-tree": "3.10.1",
     "module-alias": "^2.0.1",
-    "next": "8.1.1-canary.47",
+    "next": "8.1.0",
     "next-seo": "^1.9.0",
     "path-match": "^1.2.4",
     "polished": "2.3.0",
@@ -90,7 +92,7 @@
     "uuid": "3.3.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.2",
+    "@babel/core": "7.2.2",
     "@babel/plugin-proposal-decorators": "^7.1.0",
     "babel-eslint": "9.0.0",
     "babel-jest": "^23.6.0",

package.json

@@ -13,6 +13,7 @@
     "build:with18n": "npm run i18n && next build",
     "build.prod": "cross-env NODE_ENV=production next build",
     "build.dev": "cross-env NODE_ENV=dev next build",
+    "build.ci": "cross-env NODE_ENV=ci next build",
     "launch": "cross-env NODE_ENV=production next start -p ${SERVE_PORT}",
     "launch.dev": "cross-env NODE_ENV=dev SERVE_PORT=${SERVE_PORT} node server",
     "launch.prod": "cross-env NODE_ENV=production SERVE_PORT=${SERVE_PORT} node server",
@@ -44,6 +45,7 @@
     "@sentry/node": "^4.6.4",
     "@zeit/next-source-maps": "0.0.4-canary.1",
     "accepts": "^1.3.4",
+    "acorn": "^6.1.1",
     "antd": "3.8.4",
     "apollo-cache-inmemory": "1.5.1",
     "apollo-client": "2.5.1",
@@ -78,7 +80,7 @@
     "mobx-react-lite": "^1.2.0",
     "mobx-state-tree": "3.10.1",
     "module-alias": "^2.0.1",
-    "next": "8.1.1-canary.47",
+    "next": "8.1.0",
     "next-compose-plugins": "^2.2.0",
     "next-offline": "^4.0.2",
     "next-progressbar": "^1.0.0",
@@ -121,7 +123,7 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.2.2",
+    "@babel/core": "7.2.2",
     "@babel/plugin-proposal-decorators": "^7.1.0",
     "@commitlint/cli": "^7.0.0",
     "@commitlint/config-conventional": "^8.0.0",

server.js

@@ -1,4 +1,5 @@
-const dev = process.env.NODE_ENV !== 'production'
+const dev =
+  process.env.NODE_ENV !== 'production' && process.env.NODE_ENV !== 'ci'
 
 const next = require('next')
 const express = require('express')

travis/install_node.sh

@@ -5,9 +5,9 @@ wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh |
 [[ -s $HOME/.nvm/nvm.sh ]] && . $HOME/.nvm/nvm.sh
 echo "> check nvm"
 nvm --version
-echo "> use node 10.10"
-nvm install 10.10.0
-nvm alias default 10.10.0
+echo "> use node 12.4.0"
+nvm install 12.4.0
+nvm alias default 12.4.0
 echo "> install node done"
 node --version
 pwd