Skip to content

Commit

Permalink
build: update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@pyphilia
pyphilia committed Mar 30, 2021
1 parent 9353bb9 commit 844a5a8
Show file tree
Hide file tree
Showing 14 changed files with 2,623 additions and 2,290 deletions.
3 changes: 3 additions & 0 deletions .gitignore
View file
Expand Up @@ -70,3 +70,6 @@ dev-app-update.yml

# exclude eslint cache
.eslintcache

# husky
.husky
88 changes: 44 additions & 44 deletions package.json
View file
Expand Up @@ -71,97 +71,97 @@
"mocha": "mkdirp test/tmp && concurrently \"env-cmd -f ./.env.test react-scripts start\" \"wait-on http://localhost:3000 && yarn mocha:run\""
},
"dependencies": {
"@material-ui/core": "4.11.2",
"@material-ui/core": "4.11.3",
"@material-ui/icons": "4.11.2",
"@sentry/browser": "6.0.0",
"@sentry/electron": "2.1.0",
"about-window": "1.13.4",
"archiver": "5.2.0",
"bson-objectid": "1.3.1",
"chai": "4.2.0",
"@sentry/browser": "6.2.3",
"@sentry/electron": "2.4.0",
"about-window": "1.14.0",
"archiver": "5.3.0",
"bson-objectid": "2.0.1",
"chai": "4.3.4",
"cheerio": "1.0.0-rc.5",
"classnames": "2.2.6",
"clsx": "1.1.1",
"connected-react-router": "6.8.0",
"connected-react-router": "6.9.1",
"download": "8.0.0",
"electron-devtools-installer": "3.1.1",
"electron-is-dev": "1.2.0",
"electron-log": "4.3.1",
"electron-is-dev": "2.0.0",
"electron-log": "4.3.2",
"electron-publisher-s3": "20.17.2",
"electron-updater": "4.3.5",
"electron-updater": "4.3.8",
"enzyme": "3.11.0",
"enzyme-adapter-react-16": "1.15.6",
"extract-zip": "2.0.1",
"fs-extra": "9.1.0",
"history": "5.0.0",
"i18next": "19.8.4",
"i18next": "20.1.0",
"immutable": "4.0.0-rc.12",
"is-online": "9.0.0",
"katex": "0.12.0",
"lodash": "4.17.20",
"katex": "0.13.0",
"lodash": "4.17.21",
"lowdb": "1.0.0",
"md5": "2.3.0",
"mime-types": "2.1.28",
"mime-types": "2.1.29",
"mkdirp": "1.0.4",
"mocha": "8.2.1",
"mocha": "8.3.2",
"node-machine-id": "1.1.12",
"prop-types": "15.7.2",
"qs": "6.9.6",
"qs": "6.10.1",
"re-resizable": "6.9.0",
"react": "17.0.1",
"react": "17.0.2",
"react-countup": "4.3.3",
"react-detect-offline": "2.4.1",
"react-dev-utils": "11.0.1",
"react-detect-offline": "2.4.3",
"react-dev-utils": "11.0.4",
"react-diff-viewer": "3.1.1",
"react-dom": "17.0.1",
"react-i18next": "11.8.5",
"react-dom": "17.0.2",
"react-i18next": "11.8.12",
"react-immutable-proptypes": "2.2.0",
"react-joyride": "2.3.0",
"react-json-view": "1.20.2",
"react-json-view": "1.21.3",
"react-loading": "2.0.3",
"react-quill": "1.3.5",
"react-redux": "7.2.2",
"react-redux": "7.2.3",
"react-redux-toastr": "7.6.5",
"react-router": "5.2.0",
"react-router-dom": "5.2.0",
"react-select": "3.2.0",
"react-select": "4.3.0",
"react-split-pane": "0.1.92",
"recharts": "2.0.3",
"recharts": "2.0.9",
"redux": "4.0.5",
"redux-devtools-extension": "2.13.8",
"redux-devtools-extension": "2.13.9",
"redux-promise": "0.6.0",
"redux-thunk": "2.3.0",
"request-promise": "4.2.6",
"rimraf": "3.0.2",
"universal-analytics": "0.4.23"
},
"devDependencies": {
"@babel/cli": "7.12.10",
"@babel/core": "7.12.10",
"@babel/plugin-transform-runtime": "7.12.10",
"@babel/preset-env": "7.12.11",
"@babel/register": "7.12.10",
"@commitlint/cli": "11.0.0",
"@commitlint/config-conventional": "11.0.0",
"@babel/cli": "7.13.14",
"@babel/core": "7.13.14",
"@babel/plugin-transform-runtime": "7.13.10",
"@babel/preset-env": "7.13.12",
"@babel/register": "7.13.14",
"@commitlint/cli": "12.0.1",
"@commitlint/config-conventional": "12.0.1",
"codacy-coverage": "3.4.0",
"concurrently": "5.3.0",
"concurrently": "6.0.0",
"cross-env": "7.0.3",
"electron": "11.2.0",
"electron-builder": "22.9.1",
"electron": "12.0.2",
"electron-builder": "22.10.5",
"env-cmd": "10.1.0",
"enzyme-to-json": "3.6.1",
"eslint-config-airbnb": "18.2.1",
"eslint-config-prettier": "7.2.0",
"eslint-plugin-mocha": "8.0.0",
"husky": "4.3.8",
"eslint-config-prettier": "8.1.0",
"eslint-plugin-mocha": "8.1.0",
"husky": "6.0.0",
"npm-run-all": "4.1.5",
"prettier": "2.2.1",
"pretty-quick": "3.1.0",
"react-scripts": "4.0.1",
"react-scripts": "4.0.3",
"redux-mock-store": "1.5.4",
"spectron": "13.0.0",
"standard-version": "9.1.0",
"wait-on": "5.2.1"
"spectron": "14.0.0",
"standard-version": "9.1.1",
"wait-on": "5.3.0"
},
"build": {
"appId": "com.graasp",
Expand Down
2 changes: 1 addition & 1 deletion public/app/config/config.js
View file
Expand Up @@ -101,7 +101,7 @@ const DEFAULT_TOURS_ENABLED = true;

const buildFilePath = ({ userId, spaceId, name }) => {
// add generated id to handle duplicate files
const generatedId = ObjectId().str;
const generatedId = ObjectId().toHexString();
return `${VAR_FOLDER}/${spaceId}/files/${userId}/${generatedId}_${name}`;
};

Expand Down
7 changes: 2 additions & 5 deletions public/app/listeners/addClassroom.js
View file
Expand Up @@ -39,8 +39,7 @@ const addClassroom = (mainWindow, db) => async (event, { name, userId }) => {
}

// create new classroom
const id = ObjectId().str;

const id = ObjectId().toHexString();
// create directory where resources will be stored
createClassroomDirectory({ id });

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

db.get(CLASSROOMS_COLLECTION)
.push(newClassroom)
.write();
db.get(CLASSROOMS_COLLECTION).push(newClassroom).write();

return mainWindow.webContents.send(ADD_CLASSROOM_CHANNEL, newClassroom);
} catch (err) {
Expand Down
3 changes: 1 addition & 2 deletions public/app/listeners/loadSpace.js
View file
Expand Up @@ -57,8 +57,7 @@ const extractFileToLoadSpace = (mainWindow) => async (
event,
{ fileLocation }
) => {
const tmpId = ObjectId().str;

const tmpId = ObjectId().toHexString();
// make temporary folder hidden
const extractPath = `${VAR_FOLDER}/.${tmpId}`;
try {
Expand Down
2 changes: 1 addition & 1 deletion public/app/listeners/postAction.js
View file
Expand Up @@ -33,7 +33,7 @@ const postAction = (mainWindow, db) => (event, payload = {}) => {
geolocation, // todo: remove
visibility,
user: userId,
id: ObjectId().str,
id: ObjectId().toHexString(),
};

// write the action to the database
Expand Down
2 changes: 1 addition & 1 deletion public/app/listeners/postAppInstanceResource.js
View file
Expand Up @@ -28,7 +28,7 @@ const postAppInstanceResource = (mainWindow, db) => (event, payload = {}) => {
type,
visibility,
user: userId,
id: ObjectId().str,
id: ObjectId().toHexString(),
};

// write the resource to the database
Expand Down
2 changes: 1 addition & 1 deletion public/app/listeners/signIn.js
View file
Expand Up @@ -14,7 +14,7 @@ const createNewUser = (
lang = DEFAULT_LANG,
anonymous = false
) => {
const id = ObjectId().str;
const id = ObjectId().toHexString();

return {
id,
Expand Down
2 changes: 2 additions & 0 deletions public/electron.js
View file
Expand Up @@ -194,6 +194,8 @@ const createWindow = () => {
nodeIntegration: false,
preload: `${__dirname}/app/preload.js`,
webSecurity: false,
// contextIsolation should be false to allow preload to affect the browser window
contextIsolation: false,
},
height: 860,
width: 1280,
Expand Down
3 changes: 2 additions & 1 deletion src/components/developer/__snapshots__/DatabaseEditor.test.js.snap
View file
Expand Up @@ -7,10 +7,11 @@ exports[`<DatabaseEditor /> <DatabaseEditor /> renders renders correctly 1`] = `
>
Manually Edit the Database
</WithStyles(ForwardRef(Typography))>
<t
<n
collapseStringsAfterLength={false}
collapsed={true}
defaultValue={null}
displayArrayKey={true}
displayDataTypes={true}
displayObjectSize={true}
enableClipboard={true}
Expand Down

0 comments on commit 844a5a8

Please sign in to comment.