-
Notifications
You must be signed in to change notification settings - Fork 99
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
18 changed files
with
1,251 additions
and
1,274 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1 @@ | ||
| #!/bin/sh | ||
| . "$(dirname "$0")/_/husky.sh" | ||
|
|
||
| npm exec --package=lint-staged -- lint-staged |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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/test/cli.js test --timeout 1200000", | ||
| "test:e2e:run": "cross-env DEBUG=pw:api node ./node_modules/@playwright/test/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", | ||
|
|
@@ -90,43 +90,43 @@ | |
| "scripts/transfer": "pnpm run ts-node:shortcut ./scripts/transfer/index.ts", | ||
| "electron-builder:shortcut": "npm exec --package=electron-builder -- electron-builder", | ||
| "ts-node:shortcut": "cross-env TS_NODE_FILES=true node --loader ts-node/esm", | ||
| "webpack:shortcut": "cross-env TS_NODE_FILES=true TS_NODE_PROJECT=./webpack-configs/tsconfig.json NODE_OPTIONS=\"--import \\\"data:text/javascript,import { register } from 'node:module'; import { pathToFileURL } from 'node:url'; register('ts-node/esm', pathToFileURL('./'));\\\"\" npm exec --package=webpack-cli -- webpack" | ||
| "webpack:shortcut": "cross-env TS_NODE_FILES=true TS_NODE_PROJECT=./webpack-configs/tsconfig.json npm exec --package=webpack-cli --node-options=\"--loader ts-node/esm --experimental-json-modules\" -- webpack" | ||
| }, | ||
| "dependencies": { | ||
| "electron-rpc-api": "10.0.0", | ||
| "fs-json-store-encryption-adapter": "3.0.4", | ||
| "fs-json-store-encryption-adapter": "4.0.0", | ||
| "keytar": "7.9.0", | ||
| "msgpackr": "1.10.2" | ||
| "msgpackr": "1.11.0" | ||
| }, | ||
| "devDependencies": { | ||
| "@angular-eslint/eslint-plugin": "18.0.1", | ||
| "@angular/animations": "18.0.3", | ||
| "@angular/cdk": "18.0.3", | ||
| "@angular/common": "18.0.3", | ||
| "@angular/compiler": "18.0.3", | ||
| "@angular/compiler-cli": "18.0.3", | ||
| "@angular/core": "18.0.3", | ||
| "@angular/forms": "18.0.3", | ||
| "@angular/language-service": "18.0.3", | ||
| "@angular/platform-browser": "18.0.3", | ||
| "@angular/platform-browser-dynamic": "18.0.3", | ||
| "@angular/router": "18.0.3", | ||
| "@babel/core": "7.24.7", | ||
| "@angular-eslint/eslint-plugin": "18.3.0", | ||
| "@angular/animations": "18.2.1", | ||
| "@angular/cdk": "18.2.1", | ||
| "@angular/common": "18.2.1", | ||
| "@angular/compiler": "18.2.1", | ||
| "@angular/compiler-cli": "18.2.1", | ||
| "@angular/core": "18.2.1", | ||
| "@angular/forms": "18.2.1", | ||
| "@angular/language-service": "18.2.1", | ||
| "@angular/platform-browser": "18.2.1", | ||
| "@angular/platform-browser-dynamic": "18.2.1", | ||
| "@angular/router": "18.2.1", | ||
| "@babel/core": "7.25.2", | ||
| "@babel/plugin-syntax-import-assertions": "7.24.7", | ||
| "@babel/plugin-transform-async-generator-functions": "7.24.7", | ||
| "@babel/plugin-transform-async-generator-functions": "7.25.4", | ||
| "@babel/plugin-transform-async-to-generator": "7.24.7", | ||
| "@babel/plugin-transform-runtime": "7.24.7", | ||
| "@babel/runtime": "7.24.7", | ||
| "@babel/plugin-transform-runtime": "7.25.4", | ||
| "@babel/runtime": "7.25.4", | ||
| "@cliqz/url-parser": "1.1.5", | ||
| "@electron/rebuild": "3.6.0", | ||
| "@expo/spawn-async": "1.7.2", | ||
| "@ng-select/ng-select": "13.2.0", | ||
| "@ngrx/component": "18.0.0", | ||
| "@ngrx/effects": "18.0.0", | ||
| "@ngrx/store": "18.0.0", | ||
| "@ngtools/webpack": "18.0.4", | ||
| "@ng-select/ng-select": "13.7.0", | ||
| "@ngrx/component": "18.0.2", | ||
| "@ngrx/effects": "18.0.2", | ||
| "@ngrx/store": "18.0.2", | ||
| "@ngtools/webpack": "18.2.1", | ||
| "@oneidentity/zstd-js": "1.0.3", | ||
| "@playwright/test": "1.44.1", | ||
| "@playwright/test": "1.46.1", | ||
| "@rgba-image/lanczos": "0.1.1", | ||
| "@t-bowersox/cookie": "github:vladimiry-playground/t-bowersox-cookie", | ||
| "@types/archiver": "6.0.2", | ||
|
|
@@ -139,13 +139,13 @@ | |
| "@types/randomstring": "1.3.0", | ||
| "@types/react": "^18", | ||
| "@types/react-router": "5.1.20", | ||
| "@types/readable-stream": "4.0.14", | ||
| "@types/sanitize-html": "2.11.0", | ||
| "@types/readable-stream": "4.0.15", | ||
| "@types/sanitize-html": "2.13.0", | ||
| "@types/semver": "7.5.8", | ||
| "@types/sinon": "17.0.3", | ||
| "@types/tough-cookie": "4.0.5", | ||
| "@types/ts-nameof": "4.2.5", | ||
| "@types/turndown": "5.0.4", | ||
| "@types/turndown": "5.0.5", | ||
| "@types/valid-url": "1.0.7", | ||
| "@types/validator": "13.12.0", | ||
| "@types/webpack-node-externals": "3.0.4", | ||
|
|
@@ -162,16 +162,16 @@ | |
| "class-validator": "0.14.1", | ||
| "color-fns": "0.1.1", | ||
| "combine-errors": "3.0.3", | ||
| "compare-versions": "6.1.0", | ||
| "compare-versions": "6.1.1", | ||
| "cpx2": "7.0.1", | ||
| "cross-env": "7.0.3", | ||
| "css-loader": "7.1.2", | ||
| "dprint": "0.46.2", | ||
| "dprint": "0.47.2", | ||
| "dts-generator": "3.0.0", | ||
| "electron": "31.0.1", | ||
| "electron": "32.0.1", | ||
| "electron-builder": "24.13.3", | ||
| "electron-fetch": "1.9.1", | ||
| "electron-log": "5.1.5", | ||
| "electron-log": "5.1.7", | ||
| "electron-unhandled": "5.0.0", | ||
| "eslint": "8.57.0", | ||
| "eslint-plugin-import": "2.29.1", | ||
|
|
@@ -183,15 +183,15 @@ | |
| "fs-extra": "11.2.0", | ||
| "fs-json-store": "8.0.1", | ||
| "fs-write-stream-atomic": "1.0.10", | ||
| "html-loader": "5.0.0", | ||
| "html-loader": "5.1.0", | ||
| "html-webpack-plugin": "5.6.0", | ||
| "husky": "9.0.11", | ||
| "husky": "9.1.5", | ||
| "immer": "10.1.1", | ||
| "imports-loader": "5.0.0", | ||
| "js-base64": "3.7.7", | ||
| "lint-staged": "15.2.7", | ||
| "lint-staged": "15.2.9", | ||
| "lzutf8": "0.6.3", | ||
| "mini-css-extract-plugin": "2.9.0", | ||
| "mini-css-extract-plugin": "2.9.1", | ||
| "monaco-editor": "0.36.1", | ||
| "mrmime": "2.0.0", | ||
| "ndx": "1.0.2", | ||
|
|
@@ -200,12 +200,12 @@ | |
| "ngx-color-picker": "16.0.0", | ||
| "node-libs-browser": "2.2.1", | ||
| "node-loader": "2.0.0", | ||
| "npm-run-all2": "6.2.0", | ||
| "npm-run-all2": "6.2.2", | ||
| "os-locale": "6.0.2", | ||
| "otplib": "12.0.1", | ||
| "outdent": "0.8.0", | ||
| "path-is-inside": "1.0.2", | ||
| "playwright": "1.44.1", | ||
| "playwright": "1.46.1", | ||
| "postcss-loader": "8.1.1", | ||
| "postcss-url": "10.1.3", | ||
| "pure-uuid": "1.8.1", | ||
|
|
@@ -214,14 +214,14 @@ | |
| "randomstring": "1.3.0", | ||
| "rate-limiter-flexible": "5.0.3", | ||
| "reflect-metadata": "0.2.2", | ||
| "remeda": "2.0.10", | ||
| "remeda": "2.11.0", | ||
| "resolve-url-loader": "5.0.0", | ||
| "rimraf": "5.0.7", | ||
| "rimraf": "6.0.1", | ||
| "rxjs": "7.8.1", | ||
| "sanitize-html": "2.13.0", | ||
| "sass": "1.77.6", | ||
| "sass-loader": "14.2.1", | ||
| "semver": "7.6.2", | ||
| "sass": "1.77.8", | ||
| "sass-loader": "16.0.1", | ||
| "semver": "7.6.3", | ||
| "serialize-error": "11.0.3", | ||
| "sinon": "18.0.0", | ||
| "stream-browserify": "3.0.0", | ||
|
|
@@ -231,30 +231,30 @@ | |
| "tough-cookie-web-storage-store": "1.0.0", | ||
| "truncate-utf8-bytes": "1.0.2", | ||
| "ts-deferred": "1.0.4", | ||
| "ts-essentials": "10.0.0", | ||
| "ts-essentials": "10.0.2", | ||
| "ts-loader": "9.5.1", | ||
| "ts-nameof": "5.0.0", | ||
| "ts-node": "10.9.2", | ||
| "ts-patch": "3.2.0", | ||
| "ts-patch": "3.2.1", | ||
| "ts-transformer-keys": "0.4.4", | ||
| "tslib": "2.6.2", | ||
| "turndown": "7.2.0", | ||
| "typescript": "5.4.5", | ||
| "typescript-transform-paths": "3.4.7", | ||
| "typescript": "5.5.4", | ||
| "typescript-transform-paths": "3.5.0", | ||
| "valid-url": "1.0.9", | ||
| "webpack": "5.90.0", | ||
| "webpack-cli": "5.1.4", | ||
| "webpack-merge": "5.10.0", | ||
| "webpack-merge": "6.0.1", | ||
| "webpack-node-externals": "3.0.0", | ||
| "zone.js": "0.14.7" | ||
| "zone.js": "0.15.0" | ||
| }, | ||
| "resolutions": { | ||
| "@types/react": "^18", | ||
| "app-builder-lib": "24.13.3", | ||
| "builder-util-runtime": "9.2.4", | ||
| "builder-util-runtime": "9.2.5", | ||
| "rxjs": "^7", | ||
| "tslib": "^2", | ||
| "typescript": "^5", | ||
| "typescript": "^5.5.4", | ||
| "webpack": "^5" | ||
| }, | ||
| "pnpm": { | ||
|
|
@@ -268,7 +268,6 @@ | |
| "[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]" | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,42 @@ | ||
| diff --git a/binding.gyp b/binding.gyp | ||
| index 7ff7a52602e3d6a3d2cd2a2d4ed10e0268358eb5..434fef172f567c5e1011c33c060abc27cc228ee7 100644 | ||
| index 7ff7a52602e3d6a3d2cd2a2d4ed10e0268358eb5..f8723b4f46a323e468c80a5a08cef5313c3bc053 100644 | ||
| --- a/binding.gyp | ||
| +++ b/binding.gyp | ||
| @@ -23,6 +23,18 @@ | ||
| @@ -23,6 +23,21 @@ | ||
| "sources": [ | ||
| "src/extract.cpp", | ||
| ], | ||
| + "xcode_settings": { | ||
| + "OTHER_CPLUSPLUSFLAGS": ["-std=c++20"], | ||
| + }, | ||
| + "msvs_settings": { | ||
| + "VCCLCompilerTool": { | ||
| + "AdditionalOptions": [ | ||
| + "-std:c17", | ||
| + "/std:c++20", | ||
| + ], | ||
| + } | ||
| + }, | ||
| + "msbuild_settings": { | ||
| + "ClCompile": { | ||
| + "LanguageStandard": "stdcpp17" | ||
| + "LanguageStandard": "stdcpp20" | ||
| + } | ||
| + }, | ||
| "defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS" ], | ||
| "conditions": [ | ||
| ["OS=='linux'", { | ||
| @@ -30,6 +45,7 @@ | ||
| "gcc_version" : "<!(<(os_linux_compiler) -dumpversion | cut -d '.' -f 1)", | ||
| }, | ||
| "cflags_cc": [ | ||
| + "-std=c++20", | ||
| "-fPIC", | ||
| "-fvisibility=hidden", | ||
| "-fvisibility-inlines-hidden", | ||
| 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') | ||
| +module.exports = require('./build/Release/msgpackr-extract.node') |
Oops, something went wrong.