Skip to content
This repository was archived by the owner on Aug 21, 2024. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
18b0149
Updated all dependencies to latest version.
hanzlamateen Mar 22, 2023
d137eea
Reverted packages causing esm errors
hanzlamateen Mar 22, 2023
e418df0
Fixed formatting
hanzlamateen Mar 22, 2023
d1f9c0b
Fixed esm errors and simplex-noise changes
hanzlamateen Mar 22, 2023
1867183
Reverted ts-matches due to esm errors
hanzlamateen Mar 22, 2023
26a420c
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 23, 2023
d6079cc
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 23, 2023
91195dd
Reverted primus to fix client connection issue.
hanzlamateen Mar 23, 2023
6bc024c
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 23, 2023
c87b8cd
Reverted i18next
hanzlamateen Mar 23, 2023
b61a902
Reverted i18next
hanzlamateen Mar 23, 2023
f24845f
Updated misc errors
hanzlamateen Mar 23, 2023
2993d9a
Reverted date time picker
hanzlamateen Mar 23, 2023
149d079
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 24, 2023
e019c48
Reverted react.quarks
hanzlamateen Mar 24, 2023
3964e1f
Added error callback in agones health check
hanzlamateen Mar 24, 2023
1ba5d53
Updated lerna.json
hanzlamateen Mar 24, 2023
cfece32
Updated lerna.json to "useNx": false
hanzlamateen Mar 24, 2023
9618808
Updated check-error timeout to 30mins
hanzlamateen Mar 24, 2023
2857042
Changed lerna to 5
hanzlamateen Mar 24, 2023
dc77bf4
Reverted lerna to 4
hanzlamateen Mar 24, 2023
48f1b07
Update package.json
hanzlamateen Mar 24, 2023
c6760c6
Update lerna.json
hanzlamateen Mar 24, 2023
7b1f3fb
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 25, 2023
eb18118
Added lerna logging
hanzlamateen Mar 25, 2023
a88bbee
Fixed linting
hanzlamateen Mar 25, 2023
fafd98a
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 27, 2023
f217274
Fixed formatting
hanzlamateen Mar 27, 2023
c899d78
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 27, 2023
c26f4a0
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 27, 2023
27a7999
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 28, 2023
1cfc867
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 30, 2023
661eace
Added default shell bash
hanzlamateen Mar 30, 2023
ca6f835
Removed parallel from check error
hanzlamateen Mar 30, 2023
11ec275
Reverted timeout
hanzlamateen Mar 30, 2023
51f8458
fixed style
hanzlamateen Mar 30, 2023
3a516a2
Merge branch 'dev' into update-dependencies-version
hanzlamateen Mar 31, 2023
ea918bb
Reverted css changes
hanzlamateen Apr 1, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/branch-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jobs:
fi
compile-codebase:
runs-on: ubuntu-latest
defaults:
run:
shell: bash
steps:
- uses: actions/checkout@v3
- name: Use Node.js
Expand Down
9 changes: 4 additions & 5 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
"packages/*",
"packages/projects/projects/*"
],
"version": "1.2.0",
"version": "6.5.1",
"npmClient": "npm",
"useNx": true,
"loglevel": "verbose",
"useWorkspaces": true,
"hoist": true,
"nohoist": [
"@docusaurus/*"
]
"hoist": true
}
67 changes: 33 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"check": "npm run lint && npm run check-errors && npm run test && npm run test:projects && npm run build-client",
"check-db-exists": "cross-env ts-node --swc scripts/check-db-exists.ts",
"check-db-exists-only": "cross-env ts-node --swc scripts/check-db-exists-only.ts",
"check-errors": "lerna run check-errors --parallel",
"check-errors": "lerna run check-errors",
"clean-node-modules": "npx rimraf node_modules && npx rimraf package-lock.json && npx lerna exec npx rimraf node_modules && npx lerna exec npx rimraf package-lock.json",
"cleanup-tests": "node tests/cleanup-tests.js",
"clear-projects-rebuild": "cross-env ts-node --swc scripts/clear-projects-rebuild",
Expand Down Expand Up @@ -109,56 +109,55 @@
]
},
"devDependencies": {
"@ianvs/prettier-plugin-sort-imports": "3.3.1",
"@ianvs/prettier-plugin-sort-imports": "3.7.1",
"@originjs/vite-plugin-commonjs": "^1.0.3",
"@swc/core": "^1.2.210",
"@swc/core": "^1.3.41",
"@types/app-root-path": "1.2.4",
"@types/cli": "0.11.21",
"@types/mocha": "10.0.0",
"@types/pino": "^7.0.5",
"@types/mocha": "10.0.1",
"@types/primus": "^7.3.6",
"@typescript-eslint/eslint-plugin": "5.47.0",
"@typescript-eslint/parser": "5.47.0",
"concurrently": "7.1.0",
"@typescript-eslint/eslint-plugin": "5.56.0",
"@typescript-eslint/parser": "5.56.0",
"concurrently": "7.6.0",
"depcheck": "1.4.3",
"eslint": "8.30.0",
"jsdom": "^20.0.2",
"kill-port": "1.6.1",
"lint-staged": "12.3.7",
"mocha": "10.0.0",
"eslint": "8.36.0",
"jsdom": "^21.1.1",
"kill-port": "2.0.1",
"lint-staged": "13.2.0",
"mocha": "10.2.0",
"no-master-commits": "1.1.1",
"package-json-type": "1.0.3",
"pre-commit": "1.2.2",
"prettier": "2.8.1",
"react-dnd": "16.0.0",
"react-router-dom": "6.8.1",
"rimraf": "^3.0.2",
"stylelint": "^14.6.1",
"stylelint-config-standard-scss": "^3.0.0",
"stylelint-scss": "^4.2.0",
"supertest": "6.2.2"
"prettier": "2.8.6",
"react-dnd": "16.0.1",
"react-router-dom": "6.9.0",
"rimraf": "4.4.0",
"stylelint": "^15.3.0",
"stylelint-config-standard-scss": "^7.0.1",
"stylelint-scss": "^4.5.0",
"supertest": "6.3.3"
},
"dependencies": {
"@feathersjs/commons": "5.0.0",
"@feathersjs/errors": "5.0.0",
"@feathersjs/feathers": "5.0.0",
"app-root-path": "3.0.0",
"@feathersjs/commons": "5.0.1",
"@feathersjs/errors": "5.0.1",
"@feathersjs/feathers": "5.0.1",
"app-root-path": "3.1.0",
"cli": "1.0.1",
"daisyui": "^2.51.4",
"dotenv": "14.3.2",
"dotenv": "16.0.3",
"fix-esm": "^1.0.1",
"lerna": "4.0.0",
"lerna": "6.5.1",
"patch-package": "^6.5.1",
"pino": "^7.10.0",
"pino-pretty": "^7.6.1",
"postcss": "^8.4.16",
"pino": "^8.11.0",
"pino-pretty": "^10.0.0",
"postcss": "^8.4.21",
"qrcode.react": "^3.1.0",
"react-json-view": "^1.21.3",
"tailwindcss": "^3.2.7",
"three": "0.150.1",
"ts-node": "10.8.2",
"typescript": "4.9.5",
"vite-plugin-node": "^1.0.0",
"ws": "8.12.0"
"ts-node": "10.9.1",
"typescript": "5.0.2",
"vite-plugin-node": "^3.0.2",
"ws": "8.13.0"
}
}
72 changes: 36 additions & 36 deletions packages/client-core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,79 +20,79 @@
"test": "mocha --config .mocharc.js"
},
"resolutions": {
"@types/react": "18.0.19",
"@types/react": "18.0.28",
"react": "18.2.0"
},
"peerDependencies": {
"@types/react": "18.0.19",
"@types/react": "18.0.28",
"react": "18.2.0"
},
"dependencies": {
"@digitalcredentials/ed25519-signature-2020": "^3.0.2",
"@etherealengine/common": "^1.2.0",
"@etherealengine/engine": "^1.2.0",
"@etherealengine/hyperflux": "^1.2.0",
"@feathersjs/authentication-client": "5.0.0",
"@feathersjs/client": "5.0.0",
"@feathersjs/authentication-client": "5.0.1",
"@feathersjs/client": "5.0.1",
"@feathersjs/primus-client": "4.5.15",
"@feathersjs/rest-client": "5.0.0",
"@feathersjs/rest-client": "5.0.1",
"@hookstate/core": "4.0.0-rc21",
"@hookstate/localstored": "^4.0.0-rc21",
"@iconify/react": "3.2.0",
"@mui/icons-material": "5.11.0",
"@hookstate/localstored": "4.0.0-rc21",
"@iconify/react": "4.1.0",
"@mui/icons-material": "5.11.11",
"@mui/lab": "5.0.0-alpha.94",
"@mui/material": "5.11.0",
"@mui/styled-engine-sc": "5.11.0",
"@mui/material": "5.11.13",
"@mui/styled-engine-sc": "5.11.11",
"@mui/x-date-pickers": "5.0.0-beta.4",
"apexcharts": "^3.28.3",
"axios": "0.26.1",
"classnames": "2.3.1",
"credential-handler-polyfill": "2.3.0",
"apexcharts": "^3.37.1",
"axios": "1.3.4",
"classnames": "2.3.2",
"credential-handler-polyfill": "^3.2.0",
"cross-env": "7.0.3",
"demolish": "^1.0.2",
"hark": "^1.2.3",
"i18next": "21.6.16",
"image-palette-core": "0.2.2",
"javascript-time-ago": "^2.5.7",
"javascript-time-ago": "^2.5.9",
"jszip": "^3.10.1",
"lodash": "4.17.21",
"material-ui-confirm": "3.0.5",
"mediasoup-client": "3.6.57",
"moment": "2.29.2",
"notistack": "^2.0.5",
"material-ui-confirm": "3.0.9",
"mediasoup-client": "3.6.82",
"moment": "2.29.4",
"notistack": "^3.0.1",
"primus": "^8.0.6",
"primus-client": "^7.3.4",
"react": "18.2.0",
"react-apexcharts": "^1.3.9",
"react-apexcharts": "^1.4.0",
"react-color": "^2.19.3",
"react-ga4": "1.4.1",
"react-ga4": "2.1.0",
"react-i18next": "11.16.6",
"react-joystick-component": "4.0.0",
"react-reflex": "^4.0.9",
"react-router-dom": "6.8.1",
"react-joystick-component": "6.0.0",
"react-reflex": "^4.0.12",
"react-router-dom": "6.9.0",
"recovery": "^0.2.6",
"save-as": "^0.1.8",
"styled-components": "5.3.3",
"styled-components": "5.3.9",
"tick-tock": "^1.0.0",
"typescript": "4.9.5",
"typescript": "5.0.2",
"util": "^0.12.5",
"uuid": "8.3.2"
"uuid": "9.0.0"
},
"devDependencies": {
"@emotion/react": "11.9.0",
"@emotion/styled": "11.8.1",
"@emotion/react": "11.10.6",
"@emotion/styled": "11.10.6",
"@types/hark": "1.2.2",
"@types/node": "18.11.18",
"@types/react": "18.0.19",
"@types/node": "18.15.5",
"@types/react": "18.0.28",
"@types/react-router-dom": "5.3.3",
"@types/styled-components": "5.1.24",
"@types/styled-components": "5.1.26",
"@types/three": "0.149.0",
"css-modules-require-hook": "4.2.3",
"esbuild": "0.16.9",
"mocha": "10.0.0",
"esbuild": "0.17.12",
"mocha": "10.2.0",
"react-dom": "18.2.0",
"rimraf": "3.0.2",
"sass": "^1.52.3",
"rimraf": "4.4.0",
"sass": "1.59.3",
"trace-unhandled": "2.0.1"
},
"license": "MIT",
Expand Down
47 changes: 24 additions & 23 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
"populate-assetlinks": "cross-env APP_ENV=production ts-node --swc scripts/populate-assetlinks.ts"
},
"resolutions": {
"@types/react": "18.0.19",
"@types/react": "18.0.28",
"react": "18.2.0"
},
"peerDependencies": {
"@types/react": "18.0.19",
"@types/react": "18.0.28",
"react": "18.2.0"
},
"dependencies": {
Expand All @@ -43,48 +43,49 @@
"@etherealengine/ui": "^1.2.0",
"@heroicons/react": "^2.0.16",
"@hookstate/core": "4.0.0-rc21",
"@mui/icons-material": "5.11.0",
"@mui/material": "5.11.0",
"@mui/styled-engine-sc": "5.11.0",
"@mui/icons-material": "5.11.11",
"@mui/material": "5.11.13",
"@mui/styled-engine-sc": "5.11.11",
"@originjs/vite-plugin-commonjs": "^1.0.3",
"@swc/core": "^1.2.210",
"app-root-path": "3.0.0",
"@swc/core": "^1.3.41",
"app-root-path": "3.1.0",
"autoprefixer": "^10.4.14",
"classnames": "2.3.1",
"classnames": "2.3.2",
"cli": "1.0.1",
"credential-handler-polyfill": "^2.3.0",
"credential-handler-polyfill": "^3.2.0",
"cross-env": "7.0.3",
"daisyui": "^2.51.5",
"express-static-gzip": "^2.1.7",
"i18next": "21.6.16",
"i18next-browser-languagedetector": "6.1.3",
"lodash": "4.17.21",
"moment": "2.29.2",
"notistack": "^2.0.5",
"moment": "2.29.4",
"notistack": "^3.0.1",
"postcss": "^8.4.21",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-file-drop": "3.1.3",
"react-file-drop": "3.1.6",
"react-full-screen": "1.1.1",
"react-i18next": "11.16.6",
"react-json-tree": "0.15.2",
"react-router-dom": "6.8.1",
"sass": "1.50.0",
"sequelize": "6.21.6",
"ts-node": "10.8.2",
"vite": "4.1.1",
"react-router-dom": "6.9.0",
"sass": "1.59.3",
"sequelize": "6.29.3",
"ts-node": "10.9.1",
"vite": "4.2.1",
"vite-plugin-compression": "0.5.1",
"vite-plugin-html": "3.2.0",
"vite-plugin-package-config": "0.1.1"
},
"devDependencies": {
"@types/node": "18.11.18",
"@types/react": "18.0.19",
"@types/react-dom": "18.0.0",
"app-root-path": "3.0.0",
"@types/node": "18.15.5",
"@types/react": "18.0.28",
"@types/react-dom": "18.0.11",
"app-root-path": "3.1.0",
"autoprefixer": "^10.4.14",
"cli": "1.0.1",
"config": "3.3.7",
"node-fetch": "2.6.7",
"config": "3.3.9",
"node-fetch": "2.6.9",
"trace-unhandled": "2.0.1"
},
"license": "ISC"
Expand Down
8 changes: 4 additions & 4 deletions packages/common/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
"@digitalcredentials/vc": "^4.1.1",
"@interop/did-web-resolver": "^2.2.1",
"cross-fetch": "^3.1.5",
"crypto-ld": "^6.0.0",
"crypto-ld": "^7.0.0",
"deep-object-diff": "^1.1.9",
"lru-cache": "7.14.1"
"lru-cache": "8.0.4"
},
"devDependencies": {
"@types/mocha": "10.0.0",
"@types/mocha": "10.0.1",
"cross-env": "7.0.3",
"rimraf": "3.0.2"
"rimraf": "4.4.0"
},
"gitHead": "2313453697ca7c6b8d36b3b166b5a6445fe1c851"
}
Loading