Skip to content

Commit 844a5a8

Browse files
committed
build: update dependencies
1 parent 9353bb9 commit 844a5a8

File tree

14 files changed

+2623
-2290
lines changed

14 files changed

+2623
-2290
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,6 @@ dev-app-update.yml
7070

7171
# exclude eslint cache
7272
.eslintcache
73+
74+
# husky
75+
.husky

package.json

+44-44
Original file line numberDiff line numberDiff line change
@@ -71,97 +71,97 @@
7171
"mocha": "mkdirp test/tmp && concurrently \"env-cmd -f ./.env.test react-scripts start\" \"wait-on http://localhost:3000 && yarn mocha:run\""
7272
},
7373
"dependencies": {
74-
"@material-ui/core": "4.11.2",
74+
"@material-ui/core": "4.11.3",
7575
"@material-ui/icons": "4.11.2",
76-
"@sentry/browser": "6.0.0",
77-
"@sentry/electron": "2.1.0",
78-
"about-window": "1.13.4",
79-
"archiver": "5.2.0",
80-
"bson-objectid": "1.3.1",
81-
"chai": "4.2.0",
76+
"@sentry/browser": "6.2.3",
77+
"@sentry/electron": "2.4.0",
78+
"about-window": "1.14.0",
79+
"archiver": "5.3.0",
80+
"bson-objectid": "2.0.1",
81+
"chai": "4.3.4",
8282
"cheerio": "1.0.0-rc.5",
8383
"classnames": "2.2.6",
8484
"clsx": "1.1.1",
85-
"connected-react-router": "6.8.0",
85+
"connected-react-router": "6.9.1",
8686
"download": "8.0.0",
8787
"electron-devtools-installer": "3.1.1",
88-
"electron-is-dev": "1.2.0",
89-
"electron-log": "4.3.1",
88+
"electron-is-dev": "2.0.0",
89+
"electron-log": "4.3.2",
9090
"electron-publisher-s3": "20.17.2",
91-
"electron-updater": "4.3.5",
91+
"electron-updater": "4.3.8",
9292
"enzyme": "3.11.0",
9393
"enzyme-adapter-react-16": "1.15.6",
9494
"extract-zip": "2.0.1",
9595
"fs-extra": "9.1.0",
9696
"history": "5.0.0",
97-
"i18next": "19.8.4",
97+
"i18next": "20.1.0",
9898
"immutable": "4.0.0-rc.12",
9999
"is-online": "9.0.0",
100-
"katex": "0.12.0",
101-
"lodash": "4.17.20",
100+
"katex": "0.13.0",
101+
"lodash": "4.17.21",
102102
"lowdb": "1.0.0",
103103
"md5": "2.3.0",
104-
"mime-types": "2.1.28",
104+
"mime-types": "2.1.29",
105105
"mkdirp": "1.0.4",
106-
"mocha": "8.2.1",
106+
"mocha": "8.3.2",
107107
"node-machine-id": "1.1.12",
108108
"prop-types": "15.7.2",
109-
"qs": "6.9.6",
109+
"qs": "6.10.1",
110110
"re-resizable": "6.9.0",
111-
"react": "17.0.1",
111+
"react": "17.0.2",
112112
"react-countup": "4.3.3",
113-
"react-detect-offline": "2.4.1",
114-
"react-dev-utils": "11.0.1",
113+
"react-detect-offline": "2.4.3",
114+
"react-dev-utils": "11.0.4",
115115
"react-diff-viewer": "3.1.1",
116-
"react-dom": "17.0.1",
117-
"react-i18next": "11.8.5",
116+
"react-dom": "17.0.2",
117+
"react-i18next": "11.8.12",
118118
"react-immutable-proptypes": "2.2.0",
119119
"react-joyride": "2.3.0",
120-
"react-json-view": "1.20.2",
120+
"react-json-view": "1.21.3",
121121
"react-loading": "2.0.3",
122122
"react-quill": "1.3.5",
123-
"react-redux": "7.2.2",
123+
"react-redux": "7.2.3",
124124
"react-redux-toastr": "7.6.5",
125125
"react-router": "5.2.0",
126126
"react-router-dom": "5.2.0",
127-
"react-select": "3.2.0",
127+
"react-select": "4.3.0",
128128
"react-split-pane": "0.1.92",
129-
"recharts": "2.0.3",
129+
"recharts": "2.0.9",
130130
"redux": "4.0.5",
131-
"redux-devtools-extension": "2.13.8",
131+
"redux-devtools-extension": "2.13.9",
132132
"redux-promise": "0.6.0",
133133
"redux-thunk": "2.3.0",
134134
"request-promise": "4.2.6",
135135
"rimraf": "3.0.2",
136136
"universal-analytics": "0.4.23"
137137
},
138138
"devDependencies": {
139-
"@babel/cli": "7.12.10",
140-
"@babel/core": "7.12.10",
141-
"@babel/plugin-transform-runtime": "7.12.10",
142-
"@babel/preset-env": "7.12.11",
143-
"@babel/register": "7.12.10",
144-
"@commitlint/cli": "11.0.0",
145-
"@commitlint/config-conventional": "11.0.0",
139+
"@babel/cli": "7.13.14",
140+
"@babel/core": "7.13.14",
141+
"@babel/plugin-transform-runtime": "7.13.10",
142+
"@babel/preset-env": "7.13.12",
143+
"@babel/register": "7.13.14",
144+
"@commitlint/cli": "12.0.1",
145+
"@commitlint/config-conventional": "12.0.1",
146146
"codacy-coverage": "3.4.0",
147-
"concurrently": "5.3.0",
147+
"concurrently": "6.0.0",
148148
"cross-env": "7.0.3",
149-
"electron": "11.2.0",
150-
"electron-builder": "22.9.1",
149+
"electron": "12.0.2",
150+
"electron-builder": "22.10.5",
151151
"env-cmd": "10.1.0",
152152
"enzyme-to-json": "3.6.1",
153153
"eslint-config-airbnb": "18.2.1",
154-
"eslint-config-prettier": "7.2.0",
155-
"eslint-plugin-mocha": "8.0.0",
156-
"husky": "4.3.8",
154+
"eslint-config-prettier": "8.1.0",
155+
"eslint-plugin-mocha": "8.1.0",
156+
"husky": "6.0.0",
157157
"npm-run-all": "4.1.5",
158158
"prettier": "2.2.1",
159159
"pretty-quick": "3.1.0",
160-
"react-scripts": "4.0.1",
160+
"react-scripts": "4.0.3",
161161
"redux-mock-store": "1.5.4",
162-
"spectron": "13.0.0",
163-
"standard-version": "9.1.0",
164-
"wait-on": "5.2.1"
162+
"spectron": "14.0.0",
163+
"standard-version": "9.1.1",
164+
"wait-on": "5.3.0"
165165
},
166166
"build": {
167167
"appId": "com.graasp",

public/app/config/config.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ const DEFAULT_TOURS_ENABLED = true;
101101

102102
const buildFilePath = ({ userId, spaceId, name }) => {
103103
// add generated id to handle duplicate files
104-
const generatedId = ObjectId().str;
104+
const generatedId = ObjectId().toHexString();
105105
return `${VAR_FOLDER}/${spaceId}/files/${userId}/${generatedId}_${name}`;
106106
};
107107

public/app/listeners/addClassroom.js

+2-5
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ const addClassroom = (mainWindow, db) => async (event, { name, userId }) => {
3939
}
4040

4141
// create new classroom
42-
const id = ObjectId().str;
43-
42+
const id = ObjectId().toHexString();
4443
// create directory where resources will be stored
4544
createClassroomDirectory({ id });
4645

@@ -54,9 +53,7 @@ const addClassroom = (mainWindow, db) => async (event, { name, userId }) => {
5453
teacherId: userId,
5554
};
5655

57-
db.get(CLASSROOMS_COLLECTION)
58-
.push(newClassroom)
59-
.write();
56+
db.get(CLASSROOMS_COLLECTION).push(newClassroom).write();
6057

6158
return mainWindow.webContents.send(ADD_CLASSROOM_CHANNEL, newClassroom);
6259
} catch (err) {

public/app/listeners/loadSpace.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ const extractFileToLoadSpace = (mainWindow) => async (
5757
event,
5858
{ fileLocation }
5959
) => {
60-
const tmpId = ObjectId().str;
61-
60+
const tmpId = ObjectId().toHexString();
6261
// make temporary folder hidden
6362
const extractPath = `${VAR_FOLDER}/.${tmpId}`;
6463
try {

public/app/listeners/postAction.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const postAction = (mainWindow, db) => (event, payload = {}) => {
3333
geolocation, // todo: remove
3434
visibility,
3535
user: userId,
36-
id: ObjectId().str,
36+
id: ObjectId().toHexString(),
3737
};
3838

3939
// write the action to the database

public/app/listeners/postAppInstanceResource.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const postAppInstanceResource = (mainWindow, db) => (event, payload = {}) => {
2828
type,
2929
visibility,
3030
user: userId,
31-
id: ObjectId().str,
31+
id: ObjectId().toHexString(),
3232
};
3333

3434
// write the resource to the database

public/app/listeners/signIn.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const createNewUser = (
1414
lang = DEFAULT_LANG,
1515
anonymous = false
1616
) => {
17-
const id = ObjectId().str;
17+
const id = ObjectId().toHexString();
1818

1919
return {
2020
id,

public/electron.js

+2
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,8 @@ const createWindow = () => {
194194
nodeIntegration: false,
195195
preload: `${__dirname}/app/preload.js`,
196196
webSecurity: false,
197+
// contextIsolation should be false to allow preload to affect the browser window
198+
contextIsolation: false,
197199
},
198200
height: 860,
199201
width: 1280,

src/components/developer/__snapshots__/DatabaseEditor.test.js.snap

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ exports[`<DatabaseEditor /> <DatabaseEditor /> renders renders correctly 1`] = `
77
>
88
Manually Edit the Database
99
</WithStyles(ForwardRef(Typography))>
10-
<t
10+
<n
1111
collapseStringsAfterLength={false}
1212
collapsed={true}
1313
defaultValue={null}
14+
displayArrayKey={true}
1415
displayDataTypes={true}
1516
displayObjectSize={true}
1617
enableClipboard={true}

0 commit comments

Comments
 (0)