Skip to content

Commit 08e5aad

Browse files
committed
update dependencies
1 parent bcd3c0f commit 08e5aad

File tree

9 files changed

+893
-843
lines changed

9 files changed

+893
-843
lines changed

package.json

Lines changed: 49 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
"start:electron": "electron ./app/electron-main/index.cjs",
8181
"start:electron:dev": "electron --inspect-brk- ./app-dev/electron-main/index.cjs",
8282
"test:e2e:build-code": "cross-env NODE_ENV=e2e npm-run-all build:electron-main build:electron-preload:browser-window build:electron-preload:webview-primary build:electron-preload:webview-calendar",
83-
"test:e2e:run": "cross-env DEBUG=pw:api TS_NODE_PROJECT=./src/e2e/tsconfig.json pnpm run ts-node:shortcut ./node_modules/playwright/cli.js test --global-timeout 600000 --timeout 600000",
83+
"test:e2e:run": "cross-env DEBUG=pw:api TS_NODE_PROJECT=./src/e2e/tsconfig.json pnpm run ts-node:shortcut ./node_modules/playwright/cli.js test --timeout 1200000",
8484
"test:e2e": "npm-run-all test:e2e:build-code test:e2e:run",
8585
"scripts/prepare-native-deps": "pnpm run ts-node:shortcut ./scripts/prepare-native-deps.ts",
8686
"scripts/code-generation/electron-main": "pnpm run ts-node:shortcut ./scripts/code-generation/electron-main.ts",
@@ -99,60 +99,59 @@
9999
"msgpackr": "1.8.1"
100100
},
101101
"devDependencies": {
102-
"@angular-eslint/eslint-plugin": "15.1.0",
103-
"@angular/animations": "15.1.0",
104-
"@angular/cdk": "15.1.0",
105-
"@angular/common": "15.1.0",
106-
"@angular/compiler": "15.1.0",
107-
"@angular/compiler-cli": "15.1.0",
108-
"@angular/core": "15.1.0",
109-
"@angular/forms": "15.1.0",
110-
"@angular/language-service": "15.1.0",
111-
"@angular/platform-browser": "15.1.0",
112-
"@angular/platform-browser-dynamic": "15.1.0",
113-
"@angular/router": "15.1.0",
114-
"@babel/core": "7.20.12",
102+
"@angular-eslint/eslint-plugin": "15.2.1",
103+
"@angular/animations": "15.2.0",
104+
"@angular/cdk": "15.2.0",
105+
"@angular/common": "15.2.0",
106+
"@angular/compiler": "15.2.0",
107+
"@angular/compiler-cli": "15.2.0",
108+
"@angular/core": "15.2.0",
109+
"@angular/forms": "15.2.0",
110+
"@angular/language-service": "15.2.0",
111+
"@angular/platform-browser": "15.2.0",
112+
"@angular/platform-browser-dynamic": "15.2.0",
113+
"@angular/router": "15.2.0",
114+
"@babel/core": "7.21.0",
115115
"@babel/plugin-proposal-async-generator-functions": "7.20.7",
116116
"@babel/plugin-syntax-import-assertions": "7.20.0",
117117
"@babel/plugin-transform-async-to-generator": "7.20.7",
118-
"@babel/plugin-transform-runtime": "7.19.6",
119-
"@babel/runtime": "7.20.7",
118+
"@babel/plugin-transform-runtime": "7.21.0",
119+
"@babel/runtime": "7.21.0",
120120
"@cliqz/url-parser": "1.1.4",
121121
"@electron/rebuild": "3.2.10",
122122
"@expo/spawn-async": "1.7.0",
123123
"@ng-select/ng-select": "10.0.3",
124-
"@ngrx/component": "15.1.0",
125-
"@ngrx/effects": "15.1.0",
126-
"@ngrx/store": "15.1.0",
127-
"@ngtools/webpack": "15.1.1",
128-
"@oneidentity/zstd-js": "1.0.2",
129-
"@playwright/test": "1.29.2",
124+
"@ngrx/component": "15.3.0",
125+
"@ngrx/effects": "15.3.0",
126+
"@ngrx/store": "15.3.0",
127+
"@ngtools/webpack": "15.2.0",
128+
"@oneidentity/zstd-js": "1.0.3",
129+
"@playwright/test": "1.31.1",
130130
"@rgba-image/lanczos": "0.1.1",
131-
"@t-bowersox/cookie": "1.0.0",
131+
"@t-bowersox/cookie": "github:vladimiry-playground/t-bowersox-cookie",
132132
"@types/archiver": "5.3.1",
133133
"@types/byline": "4.2.33",
134134
"@types/dts-generator": "2.1.7",
135135
"@types/fs-extra": "11.0.1",
136-
"@types/node": "^16",
136+
"@types/node": "^18",
137137
"@types/oboe": "2.1.1",
138138
"@types/opentype.js": "1.3.4",
139139
"@types/path-is-inside": "1.0.0",
140140
"@types/randomstring": "1.1.8",
141141
"@types/react": "^17",
142-
"@types/react-router": "5.1.19",
142+
"@types/react-router": "5.1.20",
143143
"@types/readable-stream": "2.3.15",
144-
"@types/rimraf": "3.0.2",
145144
"@types/sanitize-html": "2.8.0",
146145
"@types/semver": "7.3.13",
147146
"@types/sinon": "10.0.13",
148147
"@types/tough-cookie": "4.0.2",
149148
"@types/ts-nameof": "4.2.2",
150149
"@types/turndown": "5.0.1",
151-
"@types/valid-url": "1.0.3",
152-
"@types/validator": "13.7.10",
153-
"@types/webpack-node-externals": "2.5.3",
154-
"@typescript-eslint/eslint-plugin": "5.48.1",
155-
"@typescript-eslint/parser": "5.48.1",
150+
"@types/valid-url": "1.0.4",
151+
"@types/validator": "13.7.12",
152+
"@types/webpack-node-externals": "3.0.0",
153+
"@typescript-eslint/eslint-plugin": "5.54.0",
154+
"@typescript-eslint/parser": "5.54.0",
156155
"app-builder-lib": "23.6.0",
157156
"archiver": "5.3.1",
158157
"asap-es": "1.3.3",
@@ -169,13 +168,13 @@
169168
"cross-env": "7.0.3",
170169
"css-loader": "6.7.3",
171170
"dts-generator": "3.0.0",
172-
"electron": "22.0.2",
171+
"electron": "23.1.1",
173172
"electron-builder": "23.6.0",
174173
"electron-fetch": "1.9.1",
175174
"electron-log": "4.4.8",
176175
"electron-unhandled": "4.0.1",
177-
"eslint": "8.31.0",
178-
"eslint-plugin-import": "2.27.4",
176+
"eslint": "8.35.0",
177+
"eslint-plugin-import": "2.27.5",
179178
"eslint-plugin-sonarjs": "0.18.0",
180179
"fast-glob": "3.2.12",
181180
"font-awesome": "4.7.0",
@@ -187,40 +186,40 @@
187186
"html-loader": "4.2.0",
188187
"html-webpack-plugin": "5.5.0",
189188
"husky": "8.0.3",
190-
"immer": "9.0.17",
189+
"immer": "9.0.19",
191190
"imports-loader": "4.0.1",
192-
"js-base64": "3.7.4",
193-
"lint-staged": "13.1.0",
191+
"js-base64": "3.7.5",
192+
"lint-staged": "13.1.2",
194193
"lzutf8": "0.6.3",
195194
"mini-css-extract-plugin": "2.7.2",
196-
"monaco-editor": "0.34.1",
195+
"monaco-editor": "0.36.1",
197196
"mrmime": "1.0.1",
198197
"ndx": "1.0.2",
199198
"ndx-query": "1.0.1",
200199
"ngx-bootstrap": "9.0.0",
201-
"ngx-color-picker": "13.0.0",
200+
"ngx-color-picker": "14.0.0",
202201
"node-libs-browser": "2.2.1",
203202
"node-loader": "2.0.0",
204203
"npm-run-all2": "6.0.4",
205204
"os-locale": "6.0.2",
206205
"otplib": "12.0.1",
207206
"outdent": "0.8.0",
208207
"path-is-inside": "1.0.2",
209-
"playwright": "1.29.2",
208+
"playwright": "1.31.1",
210209
"postcss-loader": "7.0.2",
211210
"postcss-url": "10.1.3",
212211
"pure-uuid": "1.6.2",
213-
"pureimage": "0.3.15",
214-
"quickjs-emscripten": "0.21.1",
212+
"pureimage": "0.3.17",
213+
"quickjs-emscripten": "0.22.0",
215214
"randomstring": "1.2.3",
216215
"rate-limiter-flexible": "2.4.1",
217216
"reflect-metadata": "0.1.13",
218-
"remeda": "1.3.0",
217+
"remeda": "1.8.0",
219218
"resolve-url-loader": "5.0.0",
220-
"rimraf": "4.0.4",
219+
"rimraf": "4.1.2",
221220
"rxjs": "7.8.0",
222-
"sanitize-html": "2.8.1",
223-
"sass": "1.57.1",
221+
"sanitize-html": "2.10.0",
222+
"sass": "1.58.3",
224223
"sass-loader": "13.2.0",
225224
"semver": "7.3.8",
226225
"serialize-error": "11.0.0",
@@ -237,9 +236,9 @@
237236
"ts-node": "10.9.1",
238237
"ts-patch": "2.1.0",
239238
"ts-transformer-keys": "0.4.4",
240-
"tslib": "2.4.1",
239+
"tslib": "2.5.0",
241240
"turndown": "7.1.1",
242-
"typescript": "4.9.4",
241+
"typescript": "4.9.5",
243242
"typescript-transform-paths": "3.4.6",
244243
"valid-url": "1.0.9",
245244
"webpack": "5.75.0",
@@ -262,12 +261,12 @@
262261
263262
264263
265-
266264
267265
268266
269267
270-
268+
269+
271270
"@electron/[email protected]": "patches/@[email protected]"
272271
}
273272
}

patches/@[email protected]

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,18 @@ index ed9243f66d49658e9a03654fa1042cfa1dd06658..98916a395db0a88a10e52e29cd58ce6b
1010
+ CFLAGS: `${process.env.CFLAGS ? process.env.CFLAGS + " ": ""}${cxxflags.join(' ')}`,
1111
CXXFLAGS: `${cxxflags.join(' ')}`
1212
},
13-
args: gypArgs,
13+
args: gypArgs,
14+
diff --git a/lib/src/module-rebuilder.js b/lib/src/module-rebuilder.js
15+
index 0d78dbe1310ebecf16f96e24ab683e3d9e4912a6..49a4111aa26538bc95919e7486006d5c80be5f52 100644
16+
--- a/lib/src/module-rebuilder.js
17+
+++ b/lib/src/module-rebuilder.js
18+
@@ -65,7 +65,8 @@ class ModuleRebuilder {
19+
* Whether a prebuild-install-generated native module exists.
20+
*/
21+
async prebuildInstallNativeModuleExists() {
22+
- return this.prebuildInstall.prebuiltModuleExists();
23+
+ // return this.prebuildInstall.prebuiltModuleExists();
24+
+ return false;
25+
}
26+
/**
27+
* If the native module uses prebuildify, check to see if it comes with a prebuilt module for
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
diff --git a/esm/vs/editor/editor.main.js b/esm/vs/editor/editor.main.js
2-
index 97bfc6b8de457c98a5670df6c77510bf172c60ac..56a25a5b007c1b21ebd8fbb740a744b7cedb82a0 100644
2+
index 97bfc6b8de457c98a5670df6c77510bf172c60ac..7c390effdfc88e0496040d661d00e3433804fdd5 100644
33
--- a/esm/vs/editor/editor.main.js
44
+++ b/esm/vs/editor/editor.main.js
5-
@@ -1,7 +1,5 @@
5+
@@ -1,7 +1,4 @@
66
-import '../basic-languages/monaco.contribution';
77
-import '../language/css/monaco.contribution';
88
-import '../language/html/monaco.contribution';
99
-import '../language/json/monaco.contribution';
10-
+import '../basic-languages/javascript/javascript.contribution';
11-
+import '../basic-languages/typescript/typescript.contribution';
10+
+import "../basic-languages/javascript/javascript.contribution.js";
1211
import '../language/typescript/monaco.contribution';
1312

1413
export * from './edcore.main';

patches/[email protected]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ index 967188a6f508e93811b1fa92efc1afd2d5eb7375..6dc29570a61542e8089d4e4dd5633f75
2828
@@ -1 +1 @@
2929
-module.exports = require('node-gyp-build-optional-packages')(__dirname);
3030
\ No newline at end of file
31-
+module.exports = require('./build/Release/msgpackr-extract.node')
31+
+module.exports = require('./build/Release/msgpackr-extract.node')

patches/[email protected]

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --git a/binding.gyp b/binding.gyp
2+
index 7ff7a52602e3d6a3d2cd2a2d4ed10e0268358eb5..434fef172f567c5e1011c33c060abc27cc228ee7 100644
3+
--- a/binding.gyp
4+
+++ b/binding.gyp
5+
@@ -23,6 +23,18 @@
6+
"sources": [
7+
"src/extract.cpp",
8+
],
9+
+ "msvs_settings": {
10+
+ "VCCLCompilerTool": {
11+
+ "AdditionalOptions": [
12+
+ "-std:c17",
13+
+ ],
14+
+ }
15+
+ },
16+
+ "msbuild_settings": {
17+
+ "ClCompile": {
18+
+ "LanguageStandard": "stdcpp17"
19+
+ }
20+
+ },
21+
"defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
22+
"conditions": [
23+
["OS=='linux'", {
24+
diff --git a/index.js b/index.js
25+
index 967188a6f508e93811b1fa92efc1afd2d5eb7375..6dc29570a61542e8089d4e4dd5633f75ba1c9ee7 100644
26+
--- a/index.js
27+
+++ b/index.js
28+
@@ -1 +1 @@
29+
-module.exports = require('node-gyp-build-optional-packages')(__dirname);
30+
\ No newline at end of file
31+
+module.exports = require('./build/Release/msgpackr-extract.node')

0 commit comments

Comments
 (0)