From dbf83527c6ec6a102df931ebe25511b021462d2b Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 00:31:43 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9Etest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/index.ts              | 23 ++++++----------------
 src/redux/actions/entries.js | 26 ++++++++++++++++++++++++
 src/redux/reduces/entries.js | 35 +++++++++++++++++++++++++++++++++
 src/redux/reduces/index.js   | 12 ++++++++++++
 src/redux/sagas/entries.js   | 16 +++++++++++++++
 src/redux/sagas/index.js     | 12 ++++++++++++
 src/redux/store.js           | 38 ++++++++++++++++++++++++++++++++++++
 7 files changed, 145 insertions(+), 17 deletions(-)
 create mode 100644 src/redux/actions/entries.js
 create mode 100644 src/redux/reduces/entries.js
 create mode 100644 src/redux/reduces/index.js
 create mode 100644 src/redux/sagas/entries.js
 create mode 100644 src/redux/sagas/index.js
 create mode 100644 src/redux/store.js

diff --git a/server/index.ts b/server/index.ts
index 990fe8c..daed4e4 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -13,21 +13,10 @@ const app = next({
 const handle = app.getRequestHandler()
 
 app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    const { pathname, query } = parsedUrl
-
-    if (pathname === '/a') {
-      app.render(req, res, '/a', query)
-    } else if (pathname === '/b') {
-      app.render(req, res, '/b', query)
-    } else {
-      handle(req, res, parsedUrl)
-    }
-  })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
+  .then(() => {
+    createServer(handler)
+      .listen(port, (err) => {
+        if (err) throw err
+        console.log(`> Ready on http://localhost:${port}`)
+      })
   })
-})
diff --git a/src/redux/actions/entries.js b/src/redux/actions/entries.js
new file mode 100644
index 0000000..911453a
--- /dev/null
+++ b/src/redux/actions/entries.js
@@ -0,0 +1,26 @@
+export const actionTypes = {
+  SELECT_DESCRIPTION: 'SELECT_DESCRIPTION',
+  REQUEST_INIT: 'REQUEST_INIT',
+  REQUEST_FAILURE: 'REQUEST_FAILURE',
+  RECEIVE_GETS: 'RECEIVE_GETS'
+};
+
+export const selectDescription = descriptionType => ({
+  type: actionTypes.SELECT_DESCRIPTION,
+  descriptionType
+});
+
+export const requestInit = selectedDescription => ({
+  type: actionTypes.REQUEST_INIT,
+  selectedDescription
+});
+
+export const requestFailure = error => ({
+  type: actionTypes.REQUEST_FAILURE,
+  error
+});
+
+export const requestSuccess = result => ({
+  type: actionTypes.RECEIVE_GETS,
+  data: result.data
+});
diff --git a/src/redux/reduces/entries.js b/src/redux/reduces/entries.js
new file mode 100644
index 0000000..6887f5a
--- /dev/null
+++ b/src/redux/reduces/entries.js
@@ -0,0 +1,35 @@
+import { fromJS } from 'immutable';
+
+import { actionTypes } from '../actions/entries';
+import { allDescriptionType } from '../../index.jsx';
+
+const initialStateSelectedDescription = allDescriptionType[0];
+export const selectedDescription = (state = initialStateSelectedDescription, action = {}) => {
+  switch (action.type) {
+    case actionTypes.SELECT_DESCRIPTION:
+      return action.descriptionType;
+    default:
+      return state;
+  }
+};
+
+const initialStateReceiveData = fromJS({
+  description: null,
+  error: null
+});
+
+export const receiveData = (state = initialStateReceiveData, action = {}) => {
+  switch (action.type) {
+    case actionTypes.RECEIVE_GETS:
+      return state.set('description', action.data.description);
+    case actionTypes.REQUEST_FAILURE:
+      return state.set('error', action.error);
+    default:
+      return state;
+  }
+};
+
+export const entriesState = {
+  selectedDescription: initialStateSelectedDescription,
+  receiveData: initialStateReceiveData
+};
diff --git a/src/redux/reduces/index.js b/src/redux/reduces/index.js
new file mode 100644
index 0000000..4d934ab
--- /dev/null
+++ b/src/redux/reduces/index.js
@@ -0,0 +1,12 @@
+import { combineReducers } from 'redux';
+
+import { selectedDescription, receiveData, entriesState } from './entries';
+
+export const rootReducer = combineReducers({
+  selectedDescription,
+  receiveData
+});
+
+export const rootInitialState = {
+  ...entriesState
+};
diff --git a/src/redux/sagas/entries.js b/src/redux/sagas/entries.js
new file mode 100644
index 0000000..8ae3d4b
--- /dev/null
+++ b/src/redux/sagas/entries.js
@@ -0,0 +1,16 @@
+import { put } from 'redux-saga/effects';
+
+import { get } from '../../utilities/fetch';
+import { requestFailure, requestSuccess } from '../actions/entries';
+
+function* requestDataSaga({ selectedDescription }) {
+  try {
+    const res = yield get(selectedDescription);
+    const data = yield res.json();
+    yield put(requestSuccess(data));
+  } catch (err) {
+    yield put(requestFailure(err.message));
+  }
+}
+
+export default requestDataSaga;
diff --git a/src/redux/sagas/index.js b/src/redux/sagas/index.js
new file mode 100644
index 0000000..5877cd2
--- /dev/null
+++ b/src/redux/sagas/index.js
@@ -0,0 +1,12 @@
+import { all, takeLatest } from 'redux-saga/effects';
+
+import requestDataSaga from './entries';
+import { actionTypes } from '../actions/entries';
+
+function* rootSaga() {
+  yield all([
+    takeLatest(actionTypes.REQUEST_INIT, requestDataSaga)
+  ]);
+}
+
+export default rootSaga;
diff --git a/src/redux/store.js b/src/redux/store.js
new file mode 100644
index 0000000..13522c5
--- /dev/null
+++ b/src/redux/store.js
@@ -0,0 +1,38 @@
+import { createStore, applyMiddleware } from 'redux';
+import withRedux from 'next-redux-wrapper';
+import nextReduxSaga from 'next-redux-saga';
+import createSagaMiddleware from 'redux-saga';
+import { fromJS } from 'immutable';
+
+import { rootReducer, rootInitialState } from './reduces/index';
+import rootSaga from './sagas/index';
+
+const sagaMiddleware = createSagaMiddleware();
+
+const bindMiddleware = (middleware) => {
+  if (process.env.NODE_ENV !== 'production') {
+    // eslint-disable-next-line
+    const { composeWithDevTools } = require('redux-devtools-extension');
+    return composeWithDevTools(applyMiddleware(...middleware));
+  }
+  return applyMiddleware(...middleware);
+};
+
+export function configureStore(initialState = rootInitialState) {
+  const immutableInitialState = initialState;
+  Object.keys(initialState).forEach((key) => {
+    immutableInitialState[key] = fromJS(initialState[key]);
+  });
+  const store = createStore(
+    rootReducer,
+    initialState,
+    bindMiddleware([sagaMiddleware])
+  );
+
+  store.sagaTask = sagaMiddleware.run(rootSaga);
+  return store;
+}
+
+export function withReduxSaga(BaseComponent) {
+  return withRedux(configureStore)(nextReduxSaga(BaseComponent));
+}

From ff45193471f752736b188d39910e789fbebb5b24 Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 16:06:15 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E6=94=B9=E5=8A=A8server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.global.js               | 17 ++++++
 server/controllers/mock.controller.ts |  1 +
 server/helpers/log.ts                 | 18 +++++++
 server/index.ts                       | 74 +++++++++++++++++----------
 server/middleware/requestId.ts        | 15 ++++++
 server/middleware/responseHandler.ts  | 22 ++++++++
 server/routes.ts                      | 17 ++++++
 server/test/integration/mock.test.ts  | 20 ++++++++
 tsconfig.json                         |  2 +-
 9 files changed, 159 insertions(+), 27 deletions(-)
 create mode 100644 config/config.global.js
 create mode 100644 server/controllers/mock.controller.ts
 create mode 100644 server/helpers/log.ts
 create mode 100644 server/middleware/requestId.ts
 create mode 100644 server/middleware/responseHandler.ts
 create mode 100644 server/routes.ts
 create mode 100644 server/test/integration/mock.test.ts

diff --git a/config/config.global.js b/config/config.global.js
new file mode 100644
index 0000000..7e45d86
--- /dev/null
+++ b/config/config.global.js
@@ -0,0 +1,17 @@
+module.exports = {
+  development: {
+    staticUrl: '',
+    host: '127.0.0.1',
+    port: '3000',
+  },
+  test: {
+    staticUrl: '',
+    host: '0.0.0.0',
+    port: '3000',
+  },
+  production: {
+    staticUrl: '',
+    host: '0.0.0.0',
+    port: '3000',
+  }
+};
diff --git a/server/controllers/mock.controller.ts b/server/controllers/mock.controller.ts
new file mode 100644
index 0000000..0b290de
--- /dev/null
+++ b/server/controllers/mock.controller.ts
@@ -0,0 +1 @@
+exports.welcome = ctx => ctx.res.success('Hello!');
diff --git a/server/helpers/log.ts b/server/helpers/log.ts
new file mode 100644
index 0000000..00598e7
--- /dev/null
+++ b/server/helpers/log.ts
@@ -0,0 +1,18 @@
+import chalk from 'chalk';
+import moment from 'moment';
+
+export const log = (color, level) => (message) => {
+  const prefix = `${moment().format()} [${level}] `;
+  if (typeof message === 'object') {
+    return console[level](chalk[color]('%o'), `${prefix}${message}`);
+  }
+  return console[level](chalk[color](`${prefix}${message}`));
+};
+
+export const debug = log('white', 'debug');
+
+export const info = log('white', 'info');
+
+export const warn = log('yellow', 'warn');
+
+export const error = log('red', 'error');
diff --git a/server/index.ts b/server/index.ts
index 990fe8c..3cda8a7 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -1,33 +1,55 @@
-import { createServer } from 'http'
-import { parse } from 'url'
-import * as next from 'next'
-const port = parseInt(process.env.PORT, 10) || 3000
-const dev = process.env.NODE_ENV !== 'production'
+import Koa from 'koa';
+import next from 'next';
+import bodyParser from 'koa-bodyparser';
+import cors from 'kcors';
+import helmet from 'koa-helmet';
+import logger from 'koa-logger';
+
+import * as log from './helpers/log';
+import config from '../config/config.global';
+import requestId from './middleware/requestId';
+import responseHandler from './middleware/responseHandler';
+import * as router from './routes';
+
+const env = process.env.NODE_ENV ? process.env.NODE_ENV : 'development';
+const dev = process.env.NODE_ENV !== 'production';
 const conf = require('../config/next.config.js')
 
-const app = next({
+const nextApp = next({
   dev,
   conf,
   dir:'./src'
-})
-const handle = app.getRequestHandler()
+});
+
+console.log(111, router)
+
+const handle = nextApp.getRequestHandler();
+// router.nextRoute(handle);
+const app = new Koa();
+/*
+app.use(logger());
+app.use(bodyParser());
+app.use(requestId());
+app.use(helmet());
+app.use(cors({
+  exposeHeaders: ['X-Request-Id']
+}));
+app.use(responseHandler());
 
-app.prepare()
-.then(() => {
-  createServer((req, res) => {
-    const parsedUrl = parse(req.url, true)
-    const { pathname, query } = parsedUrl
+if (!module.parent) {
+  nextApp.prepare()
+    .then(() => {
+      app.use(router.routes());
+      app.use(router.allowedMethods());
+      app.listen(config[env].port, config[env].host, () => {
+        log.info(`API server listening on ${config[env].host}:${config[env].port}, in ${env}`);
+      });
+    });
+} else {
+  // test
+  app.use(router.routes());
+  app.use(router.allowedMethods());
+}
+app.on('error', err => log.error(`Unhandled exception occured. message: ${err.message}`));*/
 
-    if (pathname === '/a') {
-      app.render(req, res, '/a', query)
-    } else if (pathname === '/b') {
-      app.render(req, res, '/b', query)
-    } else {
-      handle(req, res, parsedUrl)
-    }
-  })
-  .listen(port, (err) => {
-    if (err) throw err
-    console.log(`> Ready on http://localhost:${port}`)
-  })
-})
+export default app;
diff --git a/server/middleware/requestId.ts b/server/middleware/requestId.ts
new file mode 100644
index 0000000..d8c3f79
--- /dev/null
+++ b/server/middleware/requestId.ts
@@ -0,0 +1,15 @@
+import { v4 as uuidV4 } from 'uuid';
+
+const requestId = (options = {}) => (ctx, next) => {
+  const {
+    header = 'X-Request-Id',
+    propertyName = 'reqId',
+    generator = uuidV4
+  } = options;
+  const reqId = ctx.request.get(header) || generator();
+  ctx[propertyName] = reqId;
+  ctx.set(header, reqId);
+  return next();
+};
+
+export default requestId;
diff --git a/server/middleware/responseHandler.ts b/server/middleware/responseHandler.ts
new file mode 100644
index 0000000..9b790b8
--- /dev/null
+++ b/server/middleware/responseHandler.ts
@@ -0,0 +1,22 @@
+import httpStatus from 'http-status';
+
+const responseHandler = () => async (ctx, next) => {
+  ctx.res.success = (data = null) => {
+    ctx.body = {
+      success: true,
+      code: httpStatus.OK,
+      data
+    };
+  };
+  ctx.res.failure = (code = null) => (message = null) => {
+    ctx.body = {
+      success: false,
+      code,
+      message
+    };
+  };
+  ctx.res.serverError = ctx.res.failure(httpStatus.INTERNAL_SERVER_ERROR);
+  await next();
+};
+
+export default responseHandler;
diff --git a/server/routes.ts b/server/routes.ts
new file mode 100644
index 0000000..e155dcf
--- /dev/null
+++ b/server/routes.ts
@@ -0,0 +1,17 @@
+import Router from 'koa-router';
+
+// import mockController from './controllers/mock.controller';
+
+const router = new Router();
+// router.get('/api/get-welcome', mockController.welcome);
+
+router.nextRoute = (handle) => {
+  router.get(/^(?!\/api)/, async (ctx) => {
+    await handle(ctx.req, ctx.res);
+    ctx.respond = false;
+  });
+};
+
+console.log(router)
+
+export default router;
diff --git a/server/test/integration/mock.test.ts b/server/test/integration/mock.test.ts
new file mode 100644
index 0000000..b79656d
--- /dev/null
+++ b/server/test/integration/mock.test.ts
@@ -0,0 +1,20 @@
+import supertest from 'supertest';
+import httpStatus from 'http-status';
+import app from '../../index';
+
+describe('## Mock', () => {
+  const request = supertest(app.listen());
+
+  describe('# GET /api/get-welcome', () => {
+    it('should always return welcome string', async () => {
+      const res = await request
+        .get('/api/get-welcome')
+        .expect(httpStatus.OK);
+
+      const { success, code, data } = res.body;
+      expect(success).toBe(true);
+      expect(code).toBe(httpStatus.OK);
+      expect(data).toBe('Hello, OLAF!');
+    });
+  });
+});
diff --git a/tsconfig.json b/tsconfig.json
index 41a1f0a..f28319c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,7 +7,7 @@
     "allowJs": true,
     "moduleResolution": "node",
     "allowSyntheticDefaultImports": true,
-    "noUnusedLocals": true,
+    "esModuleInterop": true,
     "noUnusedParameters": true,
     "removeComments": false,
     "preserveConstEnums": true,

From 238f7884dab4509aa2b65803141923bdfc5cec33 Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 17:51:23 +0800
Subject: [PATCH 03/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0server?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                   |  2 ++
 server/index.ts                |  7 +++----
 server/middleware/requestId.ts | 15 ---------------
 server/routes.ts               |  4 ++--
 tsconfig.json                  |  2 +-
 5 files changed, 8 insertions(+), 22 deletions(-)
 delete mode 100644 server/middleware/requestId.ts

diff --git a/package.json b/package.json
index 2ffbdc4..a900e10 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,8 @@
     "file-loader": "^1.1.11",
     "jest": "22.0.1",
     "jest-transform-stub": "^1.0.0",
+    "koa-requestid": "^2.0.1",
+    "koa-router": "^7.4.0",
     "nodemon": "^1.18.3",
     "open-browser-webpack-plugin": "^0.0.5",
     "postcss-import": "^11.1.0",
diff --git a/server/index.ts b/server/index.ts
index 3904abd..a0b01f3 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -7,9 +7,10 @@ import logger from 'koa-logger';
 
 import * as log from './helpers/log';
 import config from '../config/config.global';
-import requestId from './middleware/requestId';
+// import requestId from './middleware/requestId';
+import requestId from 'koa-requestid';
 import responseHandler from './middleware/responseHandler';
-import * as router from './routes';
+import router from './routes';
 
 const env = process.env.NODE_ENV ? process.env.NODE_ENV : 'development';
 const dev = process.env.NODE_ENV !== 'production';
@@ -21,8 +22,6 @@ const nextApp = next({
   dir:'./src'
 });
 
-console.log(111, router)
-
 const handle = nextApp.getRequestHandler();
 router.nextRoute(handle);
 const app = new Koa();
diff --git a/server/middleware/requestId.ts b/server/middleware/requestId.ts
deleted file mode 100644
index d8c3f79..0000000
--- a/server/middleware/requestId.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { v4 as uuidV4 } from 'uuid';
-
-const requestId = (options = {}) => (ctx, next) => {
-  const {
-    header = 'X-Request-Id',
-    propertyName = 'reqId',
-    generator = uuidV4
-  } = options;
-  const reqId = ctx.request.get(header) || generator();
-  ctx[propertyName] = reqId;
-  ctx.set(header, reqId);
-  return next();
-};
-
-export default requestId;
diff --git a/server/routes.ts b/server/routes.ts
index e155dcf..235baa2 100644
--- a/server/routes.ts
+++ b/server/routes.ts
@@ -12,6 +12,6 @@ router.nextRoute = (handle) => {
   });
 };
 
-console.log(router)
 
-export default router;
+export default router
+// module.exports = router;
diff --git a/tsconfig.json b/tsconfig.json
index f28319c..f25581b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
-    "target": "esnext",
+    "target": "es5",
     "module": "esnext",
     "jsx": "preserve",
     "allowJs": true,

From bab05caaf7349de5e3b014e39791956bc21ed998 Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 17:55:52 +0800
Subject: [PATCH 04/10] update

---
 server/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/index.ts b/server/index.ts
index a0b01f3..7f6153d 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -11,10 +11,11 @@ import config from '../config/config.global';
 import requestId from 'koa-requestid';
 import responseHandler from './middleware/responseHandler';
 import router from './routes';
+import conf from '../config/next.config.js';
 
 const env = process.env.NODE_ENV ? process.env.NODE_ENV : 'development';
 const dev = process.env.NODE_ENV !== 'production';
-const conf = require('../config/next.config.js')
+
 
 const nextApp = next({
   dev,

From 07fca6babd627e5dfcc0464716a24476dffbc95f Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 18:31:43 +0800
Subject: [PATCH 05/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 __tests__/index.test.js                   | 2 +-
 package.json                              | 4 ++--
 src/components/{Footer.jsx => Footer.tsx} | 0
 src/components/{Header.jsx => Header.tsx} | 0
 src/{index.jsx => index.tsx}              | 0
 src/pages/{about.jsx => about.tsx}        | 2 +-
 src/pages/{index.jsx => index.tsx}        | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename src/components/{Footer.jsx => Footer.tsx} (100%)
 rename src/components/{Header.jsx => Header.tsx} (100%)
 rename src/{index.jsx => index.tsx} (100%)
 rename src/pages/{about.jsx => about.tsx} (97%)
 rename src/pages/{index.jsx => index.tsx} (99%)

diff --git a/__tests__/index.test.js b/__tests__/index.test.js
index a9ea282..c346705 100644
--- a/__tests__/index.test.js
+++ b/__tests__/index.test.js
@@ -4,7 +4,7 @@ import { shallow } from 'enzyme'
 import React from 'react'
 import renderer from 'react-test-renderer'
 
-import App from '../src/pages/index.jsx'
+import App from '../src/pages/index.tsx'
 
 describe('Home', () => {
   it('App Home', () => {
diff --git a/package.json b/package.json
index a900e10..99fc222 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "start": "next start src",
     "analyze:bundles": "cross-env ANALYZE=BUNDLES next build src",
     "analyze:size": "cross-env ANALYZE=SIZE next build src",
-    "eslint": "eslint --fix --ext .jsx src/",
-    "lint:watch": "esw -w --fix --ext .js,.jsx,.tsx src/pages src/components",
+    "eslint": "eslint --fix --ext .jsx,.tsx src/",
+    "lint:watch": "esw -w --fix --ext .jsx,.tsx src/",
     "test": "jest"
   },
   "keywords": [],
diff --git a/src/components/Footer.jsx b/src/components/Footer.tsx
similarity index 100%
rename from src/components/Footer.jsx
rename to src/components/Footer.tsx
diff --git a/src/components/Header.jsx b/src/components/Header.tsx
similarity index 100%
rename from src/components/Header.jsx
rename to src/components/Header.tsx
diff --git a/src/index.jsx b/src/index.tsx
similarity index 100%
rename from src/index.jsx
rename to src/index.tsx
diff --git a/src/pages/about.jsx b/src/pages/about.tsx
similarity index 97%
rename from src/pages/about.jsx
rename to src/pages/about.tsx
index 2833030..86cd302 100644
--- a/src/pages/about.jsx
+++ b/src/pages/about.tsx
@@ -1,4 +1,4 @@
-import Layout from '../index.jsx'
+import Layout from '../index'
 
 export default () => (
   <Layout title="关于我们">
diff --git a/src/pages/index.jsx b/src/pages/index.tsx
similarity index 99%
rename from src/pages/index.jsx
rename to src/pages/index.tsx
index dfd0785..d652a5f 100644
--- a/src/pages/index.jsx
+++ b/src/pages/index.tsx
@@ -1,6 +1,6 @@
 // This is the Link API
 import React, { Component } from 'react'
-import Layout from '../index.jsx'
+import Layout from '../index'
 
 class Index extends Component {
   constructor (props) {

From da7a0229adedfd628b39799cd866cdf70f708bae Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 18:35:40 +0800
Subject: [PATCH 06/10] update

---
 src/redux/reduces/entries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/redux/reduces/entries.js b/src/redux/reduces/entries.js
index 6887f5a..6064a13 100644
--- a/src/redux/reduces/entries.js
+++ b/src/redux/reduces/entries.js
@@ -1,7 +1,7 @@
 import { fromJS } from 'immutable';
 
 import { actionTypes } from '../actions/entries';
-import { allDescriptionType } from '../../index.jsx';
+import { allDescriptionType } from '../../index.tsx';
 
 const initialStateSelectedDescription = allDescriptionType[0];
 export const selectedDescription = (state = initialStateSelectedDescription, action = {}) => {

From 9872c9951d89a004b51a7e9b5a22a97f089b4a0e Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 19:01:16 +0800
Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                         | 7 ++++---
 server/test/integration/mock.test.ts | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 99fc222..36eb0ab 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,9 @@
   "main": "index.js",
   "scripts": {
     "dev": "nodemon server/index.ts",
-    "dev:test": "nodemon server/index.ts",
     "dev:eslint": "cross-env ANALYZE=ESLINT next src",
-    "build": "next build src",
-    "start": "next start src",
+    "build": "next build src && tsc --project tsconfig.server.json",
+    "start": "cross-env NODE_ENV=production node build/production-server/index.js",
     "analyze:bundles": "cross-env ANALYZE=BUNDLES next build src",
     "analyze:size": "cross-env ANALYZE=SIZE next build src",
     "eslint": "eslint --fix --ext .jsx,.tsx src/",
@@ -55,6 +54,7 @@
     "eslint-plugin-standard": "^3.1.0",
     "eslint-watch": "^4.0.1",
     "file-loader": "^1.1.11",
+    "http-status": "^1.2.0",
     "jest": "22.0.1",
     "jest-transform-stub": "^1.0.0",
     "koa-requestid": "^2.0.1",
@@ -67,6 +67,7 @@
     "react-test-renderer": "16.2.0",
     "styled-jsx-plugin-sass": "^0.2.4",
     "styled-jsx-postcss": "^0.2.0",
+    "supertest": "^3.1.0",
     "ts-node": "^7.0.0",
     "typescript": "^2.9.2",
     "typescript-babel-jest": "^1.0.5",
diff --git a/server/test/integration/mock.test.ts b/server/test/integration/mock.test.ts
index b79656d..f2f17a3 100644
--- a/server/test/integration/mock.test.ts
+++ b/server/test/integration/mock.test.ts
@@ -2,7 +2,7 @@ import supertest from 'supertest';
 import httpStatus from 'http-status';
 import app from '../../index';
 
-describe('## Mock', () => {
+/*describe("## Mock", () => {
   const request = supertest(app.listen());
 
   describe('# GET /api/get-welcome', () => {
@@ -17,4 +17,4 @@ describe('## Mock', () => {
       expect(data).toBe('Hello, OLAF!');
     });
   });
-});
+});*/

From 007292cbfb08f89ceac819a7bd211be0f29d2cf4 Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 19:22:49 +0800
Subject: [PATCH 08/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .babelrc     | 14 ++++++++++----
 package.json |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.babelrc b/.babelrc
index a994b66..ceb7fa7 100644
--- a/.babelrc
+++ b/.babelrc
@@ -10,8 +10,14 @@
    "transform-decorators-legacy"
  ],
  "env": {
-   "test": {
-     "presets": [["next/babel", { "preset-env": { "modules": "commonjs" } }]]
-   }
- }
+    "development": {
+      "presets": ["next/babel", "@zeit/next-typescript/babel"]
+    },
+    "production": {
+      "presets": ["next/babel", "@zeit/next-typescript/babel"]
+    },
+    "test": {
+      "presets": [["next/babel", { "preset-env": { "modules": "commonjs" } }], "@zeit/next-typescript/babel"]
+    }
+  }
 }
diff --git a/package.json b/package.json
index 36eb0ab..cc7a48e 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "dev": "nodemon server/index.ts",
     "dev:eslint": "cross-env ANALYZE=ESLINT next src",
     "build": "next build src && tsc --project tsconfig.server.json",
-    "start": "cross-env NODE_ENV=production node build/production-server/index.js",
+    "start": "cross-env NODE_ENV=production node build/production-server/server/index.js",
     "analyze:bundles": "cross-env ANALYZE=BUNDLES next build src",
     "analyze:size": "cross-env ANALYZE=SIZE next build src",
     "eslint": "eslint --fix --ext .jsx,.tsx src/",

From 66f1195a12eebffc110d7c8bd3d6fb2129b08f5a Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 19:34:14 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/index.ts                | 3 +--
 {config => src}/next.config.js | 0
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename {config => src}/next.config.js (100%)

diff --git a/server/index.ts b/server/index.ts
index 7f6153d..0316969 100644
--- a/server/index.ts
+++ b/server/index.ts
@@ -11,7 +11,7 @@ import config from '../config/config.global';
 import requestId from 'koa-requestid';
 import responseHandler from './middleware/responseHandler';
 import router from './routes';
-import conf from '../config/next.config.js';
+// import conf from '../config/next.config.js';
 
 const env = process.env.NODE_ENV ? process.env.NODE_ENV : 'development';
 const dev = process.env.NODE_ENV !== 'production';
@@ -19,7 +19,6 @@ const dev = process.env.NODE_ENV !== 'production';
 
 const nextApp = next({
   dev,
-  conf,
   dir:'./src'
 });
 
diff --git a/config/next.config.js b/src/next.config.js
similarity index 100%
rename from config/next.config.js
rename to src/next.config.js

From d7c83e75fdc5a76a153a8c1de71c9c0aa0aead53 Mon Sep 17 00:00:00 2001
From: Baiang <973366510@qq.com>
Date: Fri, 20 Jul 2018 19:38:17 +0800
Subject: [PATCH 10/10] update

---
 src/redux/actions/{entries.js => entries.tsx} | 0
 src/redux/reduces/{entries.js => entries.tsx} | 0
 src/redux/reduces/{index.js => index.tsx}     | 0
 src/redux/sagas/{entries.js => entries.tsx}   | 0
 src/redux/sagas/{index.js => index.tsx}       | 0
 src/redux/{store.js => store.tsx}             | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename src/redux/actions/{entries.js => entries.tsx} (100%)
 rename src/redux/reduces/{entries.js => entries.tsx} (100%)
 rename src/redux/reduces/{index.js => index.tsx} (100%)
 rename src/redux/sagas/{entries.js => entries.tsx} (100%)
 rename src/redux/sagas/{index.js => index.tsx} (100%)
 rename src/redux/{store.js => store.tsx} (100%)

diff --git a/src/redux/actions/entries.js b/src/redux/actions/entries.tsx
similarity index 100%
rename from src/redux/actions/entries.js
rename to src/redux/actions/entries.tsx
diff --git a/src/redux/reduces/entries.js b/src/redux/reduces/entries.tsx
similarity index 100%
rename from src/redux/reduces/entries.js
rename to src/redux/reduces/entries.tsx
diff --git a/src/redux/reduces/index.js b/src/redux/reduces/index.tsx
similarity index 100%
rename from src/redux/reduces/index.js
rename to src/redux/reduces/index.tsx
diff --git a/src/redux/sagas/entries.js b/src/redux/sagas/entries.tsx
similarity index 100%
rename from src/redux/sagas/entries.js
rename to src/redux/sagas/entries.tsx
diff --git a/src/redux/sagas/index.js b/src/redux/sagas/index.tsx
similarity index 100%
rename from src/redux/sagas/index.js
rename to src/redux/sagas/index.tsx
diff --git a/src/redux/store.js b/src/redux/store.tsx
similarity index 100%
rename from src/redux/store.js
rename to src/redux/store.tsx