Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
vladimiry committed Mar 1, 2023
1 parent bcd3c0f commit 08e5aad
Show file tree
Hide file tree
Showing 9 changed files with 893 additions and 843 deletions.
99 changes: 49 additions & 50 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"start:electron": "electron ./app/electron-main/index.cjs",
"start:electron:dev": "electron --inspect-brk- ./app-dev/electron-main/index.cjs",
"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",
"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",
"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",
"test:e2e": "npm-run-all test:e2e:build-code test:e2e:run",
"scripts/prepare-native-deps": "pnpm run ts-node:shortcut ./scripts/prepare-native-deps.ts",
"scripts/code-generation/electron-main": "pnpm run ts-node:shortcut ./scripts/code-generation/electron-main.ts",
Expand All @@ -99,60 +99,59 @@
"msgpackr": "1.8.1"
},
"devDependencies": {
"@angular-eslint/eslint-plugin": "15.1.0",
"@angular/animations": "15.1.0",
"@angular/cdk": "15.1.0",
"@angular/common": "15.1.0",
"@angular/compiler": "15.1.0",
"@angular/compiler-cli": "15.1.0",
"@angular/core": "15.1.0",
"@angular/forms": "15.1.0",
"@angular/language-service": "15.1.0",
"@angular/platform-browser": "15.1.0",
"@angular/platform-browser-dynamic": "15.1.0",
"@angular/router": "15.1.0",
"@babel/core": "7.20.12",
"@angular-eslint/eslint-plugin": "15.2.1",
"@angular/animations": "15.2.0",
"@angular/cdk": "15.2.0",
"@angular/common": "15.2.0",
"@angular/compiler": "15.2.0",
"@angular/compiler-cli": "15.2.0",
"@angular/core": "15.2.0",
"@angular/forms": "15.2.0",
"@angular/language-service": "15.2.0",
"@angular/platform-browser": "15.2.0",
"@angular/platform-browser-dynamic": "15.2.0",
"@angular/router": "15.2.0",
"@babel/core": "7.21.0",
"@babel/plugin-proposal-async-generator-functions": "7.20.7",
"@babel/plugin-syntax-import-assertions": "7.20.0",
"@babel/plugin-transform-async-to-generator": "7.20.7",
"@babel/plugin-transform-runtime": "7.19.6",
"@babel/runtime": "7.20.7",
"@babel/plugin-transform-runtime": "7.21.0",
"@babel/runtime": "7.21.0",
"@cliqz/url-parser": "1.1.4",
"@electron/rebuild": "3.2.10",
"@expo/spawn-async": "1.7.0",
"@ng-select/ng-select": "10.0.3",
"@ngrx/component": "15.1.0",
"@ngrx/effects": "15.1.0",
"@ngrx/store": "15.1.0",
"@ngtools/webpack": "15.1.1",
"@oneidentity/zstd-js": "1.0.2",
"@playwright/test": "1.29.2",
"@ngrx/component": "15.3.0",
"@ngrx/effects": "15.3.0",
"@ngrx/store": "15.3.0",
"@ngtools/webpack": "15.2.0",
"@oneidentity/zstd-js": "1.0.3",
"@playwright/test": "1.31.1",
"@rgba-image/lanczos": "0.1.1",
"@t-bowersox/cookie": "1.0.0",
"@t-bowersox/cookie": "github:vladimiry-playground/t-bowersox-cookie",
"@types/archiver": "5.3.1",
"@types/byline": "4.2.33",
"@types/dts-generator": "2.1.7",
"@types/fs-extra": "11.0.1",
"@types/node": "^16",
"@types/node": "^18",
"@types/oboe": "2.1.1",
"@types/opentype.js": "1.3.4",
"@types/path-is-inside": "1.0.0",
"@types/randomstring": "1.1.8",
"@types/react": "^17",
"@types/react-router": "5.1.19",
"@types/react-router": "5.1.20",
"@types/readable-stream": "2.3.15",
"@types/rimraf": "3.0.2",
"@types/sanitize-html": "2.8.0",
"@types/semver": "7.3.13",
"@types/sinon": "10.0.13",
"@types/tough-cookie": "4.0.2",
"@types/ts-nameof": "4.2.2",
"@types/turndown": "5.0.1",
"@types/valid-url": "1.0.3",
"@types/validator": "13.7.10",
"@types/webpack-node-externals": "2.5.3",
"@typescript-eslint/eslint-plugin": "5.48.1",
"@typescript-eslint/parser": "5.48.1",
"@types/valid-url": "1.0.4",
"@types/validator": "13.7.12",
"@types/webpack-node-externals": "3.0.0",
"@typescript-eslint/eslint-plugin": "5.54.0",
"@typescript-eslint/parser": "5.54.0",
"app-builder-lib": "23.6.0",
"archiver": "5.3.1",
"asap-es": "1.3.3",
Expand All @@ -169,13 +168,13 @@
"cross-env": "7.0.3",
"css-loader": "6.7.3",
"dts-generator": "3.0.0",
"electron": "22.0.2",
"electron": "23.1.1",
"electron-builder": "23.6.0",
"electron-fetch": "1.9.1",
"electron-log": "4.4.8",
"electron-unhandled": "4.0.1",
"eslint": "8.31.0",
"eslint-plugin-import": "2.27.4",
"eslint": "8.35.0",
"eslint-plugin-import": "2.27.5",
"eslint-plugin-sonarjs": "0.18.0",
"fast-glob": "3.2.12",
"font-awesome": "4.7.0",
Expand All @@ -187,40 +186,40 @@
"html-loader": "4.2.0",
"html-webpack-plugin": "5.5.0",
"husky": "8.0.3",
"immer": "9.0.17",
"immer": "9.0.19",
"imports-loader": "4.0.1",
"js-base64": "3.7.4",
"lint-staged": "13.1.0",
"js-base64": "3.7.5",
"lint-staged": "13.1.2",
"lzutf8": "0.6.3",
"mini-css-extract-plugin": "2.7.2",
"monaco-editor": "0.34.1",
"monaco-editor": "0.36.1",
"mrmime": "1.0.1",
"ndx": "1.0.2",
"ndx-query": "1.0.1",
"ngx-bootstrap": "9.0.0",
"ngx-color-picker": "13.0.0",
"ngx-color-picker": "14.0.0",
"node-libs-browser": "2.2.1",
"node-loader": "2.0.0",
"npm-run-all2": "6.0.4",
"os-locale": "6.0.2",
"otplib": "12.0.1",
"outdent": "0.8.0",
"path-is-inside": "1.0.2",
"playwright": "1.29.2",
"playwright": "1.31.1",
"postcss-loader": "7.0.2",
"postcss-url": "10.1.3",
"pure-uuid": "1.6.2",
"pureimage": "0.3.15",
"quickjs-emscripten": "0.21.1",
"pureimage": "0.3.17",
"quickjs-emscripten": "0.22.0",
"randomstring": "1.2.3",
"rate-limiter-flexible": "2.4.1",
"reflect-metadata": "0.1.13",
"remeda": "1.3.0",
"remeda": "1.8.0",
"resolve-url-loader": "5.0.0",
"rimraf": "4.0.4",
"rimraf": "4.1.2",
"rxjs": "7.8.0",
"sanitize-html": "2.8.1",
"sass": "1.57.1",
"sanitize-html": "2.10.0",
"sass": "1.58.3",
"sass-loader": "13.2.0",
"semver": "7.3.8",
"serialize-error": "11.0.0",
Expand All @@ -237,9 +236,9 @@
"ts-node": "10.9.1",
"ts-patch": "2.1.0",
"ts-transformer-keys": "0.4.4",
"tslib": "2.4.1",
"tslib": "2.5.0",
"turndown": "7.1.1",
"typescript": "4.9.4",
"typescript": "4.9.5",
"typescript-transform-paths": "3.4.6",
"valid-url": "1.0.9",
"webpack": "5.75.0",
Expand All @@ -262,12 +261,12 @@
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"[email protected]": "patches/[email protected]",
"@electron/[email protected]": "patches/@[email protected]"
}
}
Expand Down
16 changes: 15 additions & 1 deletion patches/@[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,18 @@ index ed9243f66d49658e9a03654fa1042cfa1dd06658..98916a395db0a88a10e52e29cd58ce6b
+ CFLAGS: `${process.env.CFLAGS ? process.env.CFLAGS + " ": ""}${cxxflags.join(' ')}`,
CXXFLAGS: `${cxxflags.join(' ')}`
},
args: gypArgs,
args: gypArgs,
diff --git a/lib/src/module-rebuilder.js b/lib/src/module-rebuilder.js
index 0d78dbe1310ebecf16f96e24ab683e3d9e4912a6..49a4111aa26538bc95919e7486006d5c80be5f52 100644
--- a/lib/src/module-rebuilder.js
+++ b/lib/src/module-rebuilder.js
@@ -65,7 +65,8 @@ class ModuleRebuilder {
* Whether a prebuild-install-generated native module exists.
*/
async prebuildInstallNativeModuleExists() {
- return this.prebuildInstall.prebuiltModuleExists();
+ // return this.prebuildInstall.prebuiltModuleExists();
+ return false;
}
/**
* If the native module uses prebuildify, check to see if it comes with a prebuilt module for
7 changes: 3 additions & 4 deletions patches/[email protected] → patches/[email protected]
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
diff --git a/esm/vs/editor/editor.main.js b/esm/vs/editor/editor.main.js
index 97bfc6b8de457c98a5670df6c77510bf172c60ac..56a25a5b007c1b21ebd8fbb740a744b7cedb82a0 100644
index 97bfc6b8de457c98a5670df6c77510bf172c60ac..7c390effdfc88e0496040d661d00e3433804fdd5 100644
--- a/esm/vs/editor/editor.main.js
+++ b/esm/vs/editor/editor.main.js
@@ -1,7 +1,5 @@
@@ -1,7 +1,4 @@
-import '../basic-languages/monaco.contribution';
-import '../language/css/monaco.contribution';
-import '../language/html/monaco.contribution';
-import '../language/json/monaco.contribution';
+import '../basic-languages/javascript/javascript.contribution';
+import '../basic-languages/typescript/typescript.contribution';
+import "../basic-languages/javascript/javascript.contribution.js";
import '../language/typescript/monaco.contribution';

export * from './edcore.main';
2 changes: 1 addition & 1 deletion patches/[email protected]
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ index 967188a6f508e93811b1fa92efc1afd2d5eb7375..6dc29570a61542e8089d4e4dd5633f75
@@ -1 +1 @@
-module.exports = require('node-gyp-build-optional-packages')(__dirname);
\ No newline at end of file
+module.exports = require('./build/Release/msgpackr-extract.node')
+module.exports = require('./build/Release/msgpackr-extract.node')
31 changes: 31 additions & 0 deletions patches/[email protected]
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/binding.gyp b/binding.gyp
index 7ff7a52602e3d6a3d2cd2a2d4ed10e0268358eb5..434fef172f567c5e1011c33c060abc27cc228ee7 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -23,6 +23,18 @@
"sources": [
"src/extract.cpp",
],
+ "msvs_settings": {
+ "VCCLCompilerTool": {
+ "AdditionalOptions": [
+ "-std:c17",
+ ],
+ }
+ },
+ "msbuild_settings": {
+ "ClCompile": {
+ "LanguageStandard": "stdcpp17"
+ }
+ },
"defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ],
"conditions": [
["OS=='linux'", {
diff --git a/index.js b/index.js
index 967188a6f508e93811b1fa92efc1afd2d5eb7375..6dc29570a61542e8089d4e4dd5633f75ba1c9ee7 100644
--- a/index.js
+++ b/index.js
@@ -1 +1 @@
-module.exports = require('node-gyp-build-optional-packages')(__dirname);
\ No newline at end of file
+module.exports = require('./build/Release/msgpackr-extract.node')
Loading

0 comments on commit 08e5aad

Please sign in to comment.