Skip to content

Commit fa865da

Browse files
ksjogonicolodavis
andauthored
fixes build in rushjs monorepo context (#550)
Co-authored-by: Nicolo John Davis <[email protected]>
1 parent d8948d3 commit fa865da

4 files changed

Lines changed: 160 additions & 18 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ npm
1212
.idea/
1313
.vscode/*
1414
.rpt2_cache/
15+
.rush/

package-lock.json

Lines changed: 151 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dev": "run-p build:watch dev:server dev:client",
1111
"dev:client": "node scripts/dev-client.js",
1212
"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",
13-
"build": "cross-env BABEL_ENV=rollup rollup --config rollup.config.js",
13+
"build": "cross-env BABEL_ENV=rollup rollup --config rollup.config.js --silent",
1414
"build:watch": "cross-env BABEL_ENV=rollup rollup -w --config rollup.config.js",
1515
"benchmark": "babel-node --extensions .ts,.js --presets @babel/preset-env,@babel/preset-typescript benchmark/index.js",
1616
"docs": "docsify serve docs",
@@ -76,6 +76,7 @@
7676
"@babel/core": "^7.10.3",
7777
"@babel/node": "^7.10.3",
7878
"@babel/plugin-proposal-class-properties": "^7.10.1",
79+
"@babel/plugin-proposal-object-rest-spread": "^7.10.4",
7980
"@babel/plugin-transform-modules-commonjs": "^7.10.1",
8081
"@babel/preset-env": "^7.10.3",
8182
"@babel/preset-react": "^7.10.1",
@@ -86,10 +87,12 @@
8687
"@types/jest": "^24.0.0",
8788
"@types/koa-router": "^7.4.0",
8889
"@types/koa__cors": "^3.0.1",
90+
"@types/node": "^14.0.24",
8991
"@types/react": "^16.9.36",
9092
"@types/react-dom": "^16.9.8",
9193
"@types/shortid": "0.0.29",
9294
"@types/socket.io": "^2.1.4",
95+
"@types/socket.io-client": "^1.4.33",
9396
"ajv": "^6.6.2",
9497
"babel-core": "^7.0.0-bridge.0",
9598
"babel-eslint": "^8.0.0",
@@ -160,6 +163,7 @@
160163
"redux": "^4.0.0",
161164
"shortid": "^2.2.14",
162165
"socket.io": "^2.1.1",
166+
"socket.io-client": "^2.3.0",
163167
"svelte": "^3.24.0",
164168
"ts-toolbelt": "^6.3.6",
165169
"uuid": "3.2.1"

src/client/transport/socketio.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
* https://opensource.org/licenses/MIT.
77
*/
88

9+
import * as ioNamespace from 'socket.io-client';
10+
const io = ioNamespace.default;
11+
912
import * as ActionCreators from '../../core/action-creators';
10-
import io from 'socket.io-client';
1113
import { Transport, TransportOpts, MetadataCallback } from './transport';
1214
import {
1315
CredentialedActionShape,

0 commit comments

Comments
 (0)