Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release #3344

Merged
merged 10 commits into from
May 27, 2024
Merged

Release #3344

Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
14
147,386 changes: 147,386 additions & 0 deletions .yarn/releases/yarn-1.22.1.js

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .yarnrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


yarn-path ".yarn/releases/yarn-1.22.1.js"
37 changes: 28 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@
},
"proxy": "http://localhost:3001",
"nodemonConfig": {
"watch": ["server/"],
"watch": [
"server/"
],
"ignore": [
".git",
"./src/*",
Expand All @@ -80,8 +82,12 @@
"last 1 safari version"
],
"lint-staged": {
"*.{js,jsx,ts,tsx}": ["eslint"],
"*.{css,scss}": ["stylelint"],
"*.{js,jsx,ts,tsx}": [
"eslint"
],
"*.{css,scss}": [
"stylelint"
],
"**/*.+(js|jsx|json|yml|yaml|css|less|scss|ts|tsx|md|mdx|graphql|vue)": [
"prettier --write"
]
Expand All @@ -98,7 +104,9 @@
"directories": {
"output": "./packages"
},
"publish": { "provider": "github" },
"publish": {
"provider": "github"
},
"files": [
"electron/**/*",
"!**/node_modules/**/*",
Expand Down Expand Up @@ -127,10 +135,15 @@
]
},
"win": {
"target": ["zip", "portable"],
"target": [
"zip",
"portable"
],
"icon": "./public/icon.ico"
},
"linux": { "category": "Utility" }
"linux": {
"category": "Utility"
}
},
"bin": "./server/index.js",
"pkg": {
Expand All @@ -150,7 +163,9 @@
]
},
"release": {
"branches": ["main"],
"branches": [
"main"
],
"tagFormat": "${version}",
"plugins": [
"@semantic-release/commit-analyzer",
Expand Down Expand Up @@ -204,6 +219,7 @@
"errorhandler": "^1.5.1",
"escape-string-regexp": "^4.0.0",
"express": "^4.17.1",
"firebase-admin": "^12.1.0",
"fuse.js": "^6.0.0",
"gl-matrix": "^3.2.1",
"googleapis": "^51.0.0",
Expand Down Expand Up @@ -373,7 +389,7 @@
"ts-jest": "^26.0.0",
"ts-node-dev": "^1.0.0-pre.44",
"tsconfig-paths-webpack-plugin": "^3.2.0",
"typescript": "^3.6.4",
"typescript": "^5.4.0",
"typescript-plugin-tw-template": "^2.0.1",
"wait-on": "^5.0.0",
"webgl-mock-threejs": "^0.0.1",
Expand All @@ -384,5 +400,8 @@
"param-case": "3.0.3",
"@babel/preset-env": "^7.8.7"
},
"volta": { "node": "14.21.3" }
"volta": {
"node": "14.21.3"
},
"packageManager": "[email protected]"
}
10 changes: 10 additions & 0 deletions server/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import heap from "./helpers/heap";
import handleTrigger from "./helpers/handleTrigger";
import Motu from "motu-control";
import {setAutoFreeze} from "immer";
import fs from 'fs';

setAutoFreeze(false);

Expand Down Expand Up @@ -101,6 +102,7 @@ class Events extends EventEmitter {
snapshotVersion = 0;
version = 0;
timestamp: Date = new Date();
firebaseManager?: ClassesImport.FirebaseManager;
[index: string]: any;

init() {
Expand All @@ -110,6 +112,14 @@ class Events extends EventEmitter {
if (process.env.PORT && !isNaN(parseInt(process.env.PORT, 10)))
this.port = parseInt(process.env.PORT, 10);
this.httpOnly = process.env.HTTP_ONLY === "true";
fs.readFile(paths.userData + "/firebase.json", (err, data) => {
if (err) {
return;
}
else {
this.firebaseManager = new ClassesImport.FirebaseManager({ firebaseServiceConfig: JSON.parse(data.toString()) });
}
})
}
merge(snapshot: any) {
// Initialize the snapshot with the object constructors
Expand Down
4 changes: 2 additions & 2 deletions server/bootstrap/apollo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function responseForOperation(requestContext) {
// the built-in mutation resolver
return null;
}
return new Promise(resolve => {
return new Promise<any>(resolve => {
// Execute the old legacy event handler system.
let timeout = null;
App.handleEvent(
Expand All @@ -118,7 +118,7 @@ function responseForOperation(requestContext) {
opName,
requestContext.context,
);
timeout = setTimeout(() => resolve(), 500);
timeout = setTimeout(() => resolve({error: "fail"}), 500);
});
}

Expand Down
Loading
Loading