Merge branch 'master' into feature/permissions

This commit is contained in:
Nathanael Anderson
2024-04-11 13:03:42 -06:00
8 changed files with 583 additions and 658 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ jobs:
fetch-depth: 1 fetch-depth: 1
- uses: actions/setup-node@v2 - uses: actions/setup-node@v2
with: with:
node-version: '16.14.2' node-version: '20.11.1'
- uses: actions/setup-python@v4 - uses: actions/setup-python@v4
with: with:
python-version: '3.10' python-version: '3.10'
+2
View File
@@ -0,0 +1,2 @@
#!/usr/bin/env sh
git update-index -g
+2
View File
@@ -0,0 +1,2 @@
#!/usr/bin/env sh
yarn pretty-quick
+2 -1
View File
@@ -14,7 +14,8 @@ exports.default = async function notarizing(context) {
appPath: `${appOutDir}/${appName}.app`, appPath: `${appOutDir}/${appName}.app`,
appleId: process.env.APPLE_ID, appleId: process.env.APPLE_ID,
appleIdPassword: process.env.APPLE_ID_PASS, appleIdPassword: process.env.APPLE_ID_PASS,
ascProvider: process.env.APPLE_ID_TEAM, teamId: process.env.APPLE_ID_TEAM,
ascProvider: process.env.APPLE_ID_TEAM
}); });
} else { } else {
console.warn('NOTICE: Did not notarize application due to missing environment variables.'); console.warn('NOTICE: Did not notarize application due to missing environment variables.');
+2 -1
View File
@@ -245,7 +245,8 @@
} }
}, },
"cli": { "cli": {
"packageManager": "yarn" "packageManager": "yarn",
"analytics": false
}, },
"schematics": { "schematics": {
"@schematics/angular:component": { "@schematics/angular:component": {
+1 -1
View File
@@ -438,7 +438,7 @@ class ADB {
} }
readdir(serial, path, cb, ecb) { readdir(serial, path, cb, ecb) {
this._clientSetup.promise.then(() => { this._clientSetup.promise.then(() => {
if (!this.client) return ecb('Not connected.'); if (!this.client) return ecb('Not connected.');
const device = this.client.getDevice(serial); const device = this.client.getDevice(serial);
device device
.readdir(path) .readdir(path)
+5 -4
View File
@@ -32,13 +32,14 @@
"electron-dev:test2": "yarn platform-tools && cross-env NODE_ENV=dev SQ_ENV_CFG=test2 electron .", "electron-dev:test2": "yarn platform-tools && cross-env NODE_ENV=dev SQ_ENV_CFG=test2 electron .",
"electron-dev:local": "yarn platform-tools && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .", "electron-dev:local": "yarn platform-tools && cross-env NODE_ENV=dev SQ_ENV_CFG=local electron .",
"electron": "yarn electron-build && yarn electron-dev", "electron": "yarn electron-build && yarn electron-dev",
"app-build": "cd desktop-app && ng build --prod --aot && cd ..", "app-build": "cd desktop-app && ng build -c production --aot && cd ..",
"app-build-test": "cd desktop-app && ng build -c test --aot && cd ..", "app-build-test": "cd desktop-app && ng build -c test --aot && cd ..",
"app-build-fried": "cd desktop-app && ng build -c fried --aot && cd ..", "app-build-fried": "cd desktop-app && ng build -c fried --aot && cd ..",
"app-build-localhost": "cd desktop-app && ng build -c localhost --aot && cd ..", "app-build-localhost": "cd desktop-app && ng build -c localhost --aot && cd ..",
"platform-tools": "node build-electron/platform-tools.js", "platform-tools": "node build-electron/platform-tools.js",
"electron-build": "tsc", "electron-build": "tsc",
"reset": "rm -rf node_modules && rm -rf desktop-app/node_modules && yarn install && cd desktop-app && yarn install" "reset": "rm -rf node_modules && rm -rf desktop-app/node_modules && yarn install && cd desktop-app && yarn install",
"pretty-quick": "pretty-quick --staged --pattern \"**/*.*(js|jsx|ts|tsx)\""
}, },
"build": { "build": {
"productName": "SideQuest", "productName": "SideQuest",
@@ -93,7 +94,7 @@
], ],
"afterSign": "build/notarize.js" "afterSign": "build/notarize.js"
}, },
"husky": { "husky": {
"hooks": { "hooks": {
"pre-commit": "pretty-quick --staged --pattern \"**/*.*(js|jsx|ts|tsx)\"", "pre-commit": "pretty-quick --staged --pattern \"**/*.*(js|jsx|ts|tsx)\"",
"post-commit": "git update-index -g", "post-commit": "git update-index -g",
@@ -131,7 +132,7 @@
"request-progress": "^3.0.0", "request-progress": "^3.0.0",
"semver": "^7.6.0", "semver": "^7.6.0",
"targz": "^1.0.1", "targz": "^1.0.1",
"usb-detection2": "../node-usb-detection", "usb-detection2": "https://github.com/SideQuestVR/node-usb-detection",
"wait-on": "^7.2.0", "wait-on": "^7.2.0",
"yauzl": "^3.1.0" "yauzl": "^3.1.0"
}, },
+568 -650
View File
File diff suppressed because it is too large Load Diff