Skip to content

Commit

Permalink
fixes build in rushjs monorepo context (#550)
Browse files Browse the repository at this point in the history
Co-authored-by: Nicolo John Davis <nicolodavis@gmail.com>
  • Loading branch information
ksjogo and nicolodavis authored Aug 14, 2020
1 parent d8948d3 commit fa865da
Show file tree
Hide file tree
Showing 4 changed files with 160 additions and 18 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ npm
.idea/
.vscode/*
.rpt2_cache/
.rush/
167 changes: 151 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dev": "run-p build:watch dev:server dev:client",
"dev:client": "node scripts/dev-client.js",
"dev:server": "cross-env NODE_ENV=development nodemon -w src -w examples -e js,ts --exec babel-node --extensions \".ts,.js\" --ignore \"src/**/*.test.ts\" --presets @babel/preset-env examples/react-web/server.js",
"build": "cross-env BABEL_ENV=rollup rollup --config rollup.config.js",
"build": "cross-env BABEL_ENV=rollup rollup --config rollup.config.js --silent",
"build:watch": "cross-env BABEL_ENV=rollup rollup -w --config rollup.config.js",
"benchmark": "babel-node --extensions .ts,.js --presets @babel/preset-env,@babel/preset-typescript benchmark/index.js",
"docs": "docsify serve docs",
Expand Down Expand Up @@ -76,6 +76,7 @@
"@babel/core": "^7.10.3",
"@babel/node": "^7.10.3",
"@babel/plugin-proposal-class-properties": "^7.10.1",
"@babel/plugin-proposal-object-rest-spread": "^7.10.4",
"@babel/plugin-transform-modules-commonjs": "^7.10.1",
"@babel/preset-env": "^7.10.3",
"@babel/preset-react": "^7.10.1",
Expand All @@ -86,10 +87,12 @@
"@types/jest": "^24.0.0",
"@types/koa-router": "^7.4.0",
"@types/koa__cors": "^3.0.1",
"@types/node": "^14.0.24",
"@types/react": "^16.9.36",
"@types/react-dom": "^16.9.8",
"@types/shortid": "0.0.29",
"@types/socket.io": "^2.1.4",
"@types/socket.io-client": "^1.4.33",
"ajv": "^6.6.2",
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^8.0.0",
Expand Down Expand Up @@ -160,6 +163,7 @@
"redux": "^4.0.0",
"shortid": "^2.2.14",
"socket.io": "^2.1.1",
"socket.io-client": "^2.3.0",
"svelte": "^3.24.0",
"ts-toolbelt": "^6.3.6",
"uuid": "3.2.1"
Expand Down
4 changes: 3 additions & 1 deletion src/client/transport/socketio.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
* https://opensource.org/licenses/MIT.
*/

import * as ioNamespace from 'socket.io-client';
const io = ioNamespace.default;

import * as ActionCreators from '../../core/action-creators';
import io from 'socket.io-client';
import { Transport, TransportOpts, MetadataCallback } from './transport';
import {
CredentialedActionShape,
Expand Down

0 comments on commit fa865da

Please sign in to comment.