Skip to content

Commit

Permalink
Upgrade to Cosmos Next (ovidiuch#64)
Browse files Browse the repository at this point in the history
  • Loading branch information
ovidiuch authored Jul 27, 2019
1 parent 776be1a commit a325578
Show file tree
Hide file tree
Showing 221 changed files with 4,598 additions and 37,480 deletions.
4 changes: 1 addition & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ module.exports = {
'jest.config.js',
'jest.framework-setup.js',
'web/next.config.js',
'web/cosmos.config.js',
'web/cosmos.test.js',
'server/**/*.js'
],
env: {
Expand All @@ -50,7 +48,7 @@ module.exports = {
files: [
'web/components/**/*.js',
'web/pages/**/*.js',
'cosmos.proxies.js'
'web/mocks/**/*.js'
],
rules: {
'react/jsx-uses-react': 'error',
Expand Down
1 change: 0 additions & 1 deletion .flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
.*/node_modules/config-chain/test/broken.json
.*/node_modules/npmconf/test/fixtures/package.json
.*/node_modules/grpc/node_modules/protobufjs/src/bower.json
.*/node_modules/react-cosmos-voyager2/src/server/find-fixture-files.js

[include]

Expand Down
5 changes: 5 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
- [ ] "Waiting for permission..." screen
- [ ] "Allow player to join?" screen
- [ ] "Denied" screen
- [ ] End of game screen

BACKLOG

Expand All @@ -192,3 +193,7 @@ CHORES

- [x] Upgrade to Babel7
- [ ] Extract ReduxActions Cosmos proxy

UX

- [ ] Reconnect when focusing idle tab (https://github.com/socketio/socket.io-client/issues/1067)
4 changes: 3 additions & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
const path = require('path');

const alias = {
shared: './shared'
shared: path.join(__dirname, 'shared')
};

module.exports = {
Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
setupTestFrameworkScriptFile: './jest.framework-setup.js',
setupFilesAfterEnv: ['./jest.framework-setup.js'],
setupFiles: ['<rootDir>/jest.setup.js'],
moduleNameMapper: {
'\\.css$': 'identity-obj-proxy'
Expand Down
73 changes: 36 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,68 +12,67 @@
"format": "prettier --write '**/*.{js,css}' '!**/{flow-typed,.next}/**'",
"test": "flow && yarn lint && jest --maxWorkers=4",
"test:watch": "jest --watch",
"cosmos": "cosmos --config web/cosmos.config.js",
"cosmos:export": "cosmos-export --config web/cosmos.config.js",
"cosmos": "cosmos --config web/cosmos.config.json",
"cosmos:export": "cosmos-export --config web/cosmos.config.json",
"dev:client": "babel-node server/start-dev-client.js",
"dev:server": "babel-node server/start-dev-server.js",
"dev:server:watch": "nodemon server/start-dev-server.js --exec babel-node",
"build": "next build web",
"start": "babel-node server/start-prod.js"
},
"dependencies": {
"body-parser": "^1.18.3",
"body-parser": "^1.19.0",
"classnames": "^2.2.6",
"clipboard": "^2.0.4",
"cookie": "^0.3.1",
"cookie-parser": "^1.4.3",
"cookie": "^0.4.0",
"cookie-parser": "^1.4.4",
"crc-32": "^1.2.0",
"express": "^4.16.4",
"firebase-admin": "^6.4.0",
"express": "^4.17.1",
"firebase-admin": "^8.3.0",
"isomorphic-unfetch": "^3.0.0",
"lodash": "^4.17.11",
"lodash": "^4.17.15",
"next": "^7.0.2",
"next-redux-wrapper": "^1.3.5",
"prop-types": "^15.6.2",
"prop-types": "^15.7.2",
"raf": "^3.4.1",
"react": "^16.6.3",
"react-dom": "^16.6.3",
"react-redux": "^5.1.1",
"redux": "^4.0.1",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"react-redux": "^7.1.0",
"redux": "^4.0.4",
"redux-thunk": "^2.3.0",
"rollbar": "^2.5.1",
"rollbar": "^2.9.0",
"socket.io": "^2.2.0",
"socket.io-client": "^2.2.0"
},
"devDependencies": {
"@babel/core": "^7.1.2",
"@babel/node": "^7.2.2",
"@babel/core": "^7.5.5",
"@babel/node": "^7.5.5",
"@babel/preset-flow": "^7.0.0",
"@react-mock/state": "^0.1.8",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^10.0.1",
"babel-jest": "23.6.0",
"babel-loader": "^8.0.4",
"babel-plugin-module-resolver": "^3.1.1",
"css-loader": "^2.0.1",
"eslint": "^5.10.0",
"eslint-import-resolver-babel-module": "^5.0.0-beta.1",
"babel-eslint": "^10.0.2",
"babel-jest": "24.8.0",
"babel-loader": "^8.0.6",
"babel-plugin-module-resolver": "^3.2.0",
"css-loader": "^3.1.0",
"eslint": "^6.1.0",
"eslint-import-resolver-babel-module": "^5.1.0",
"eslint-plugin-babel": "^5.3.0",
"eslint-plugin-flowtype": "^3.2.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^22.1.2",
"eslint-plugin-react": "^7.11.1",
"eslint-plugin-flowtype": "^3.12.1",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-jest": "^22.14.0",
"eslint-plugin-react": "^7.14.3",
"flow-bin": "^0.89.0",
"flow-typed": "^2.5.1",
"flow-typed": "^2.6.0",
"html-webpack-plugin": "^3.2.0",
"identity-obj-proxy": "^3.0.0",
"jest": "23.6.0",
"nodemon": "^1.18.9",
"prettier": "^1.15.3",
"react-cosmos": "^4.7.0-19",
"react-cosmos-fetch-proxy": "^4.6.1",
"react-cosmos-redux-proxy": "^4.6.1",
"react-cosmos-telescope": "^4.6.4",
"react-test-renderer": "^16.6.3",
"redux-devtools-extension": "^2.13.7",
"jest": "24.8.0",
"nodemon": "^1.19.1",
"prettier": "^1.18.2",
"react-cosmos": "^5.0.0-alpha.21",
"react-cosmos-redux": "^1.0.2",
"react-test-renderer": "^16.8.6",
"redux-devtools-extension": "^2.13.8",
"style-loader": "^0.23.1"
}
}
Loading

0 comments on commit a325578

Please sign in to comment.