Skip to content

Commit

Permalink
Regenerate patches and bump versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@bigorn0
bigorn0 committed Jun 30, 2024
1 parent 5a1f7f4 commit f508a41
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 90 deletions.
16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,23 @@
"version_format": "<electron major version>.<package major>.<arbitrary patch>",
"nativeModules": {
"@parcel/watcher": {
"version": "31.2.16",
"version": "31.2.17",
"napi": true,
"prebuild_install": false,
"prebuilds_as_npm_packages": true,
"prebuilds_scope": "@parcel",
"to_build": false
},
"couchbase": {
"version": "31.4.16",
"version": "31.4.17",
"napi": true,
"prebuild_install": false,
"prebuilds_as_npm_packages": true,
"prebuilds_scope": "@couchbase",
"to_build": false
},
"desktop-trampoline": {
"version": "31.2.16",
"version": "31.2.17",
"napi": false,
"prebuild_install": true,
"prebuilds_as_npm_packages": false,
Expand All @@ -85,28 +85,28 @@
]
},
"kerberos": {
"version": "31.2.16",
"version": "31.2.17",
"napi": true,
"prebuild_install": true,
"prebuilds_as_npm_packages": false,
"to_build": false
},
"kerberos-plugins": {
"version": "31.1.16",
"version": "31.1.17",
"napi": false,
"prebuild_install": true,
"prebuilds_as_npm_packages": false,
"to_build": true
},
"keytar": {
"version": "31.8.16",
"version": "31.8.17",
"napi": true,
"prebuild_install": true,
"prebuilds_as_npm_packages": false,
"to_build": false
},
"krb5": {
"version": "31.0.16",
"version": "31.0.17",
"napi": true,
"prebuild_install": true,
"prebuilds_as_npm_packages": false,
Expand All @@ -125,7 +125,7 @@
}
},
"mongodb-client-encryption": {
"version": "31.2.16",
"version": "31.2.17",
"prebuild_install": true,
"napi": true,
"prebuilds_as_npm_packages": false,
Expand Down
25 changes: 14 additions & 11 deletions patches/@parcel+watcher+2.4.1.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,26 @@ index d212b93..1ff29bb 100644

A native C++ Node module for querying and subscribing to filesystem events. Used by [Parcel 2](https://github.com/parcel-bundler/parcel).
diff --git a/node_modules/@parcel/watcher/index.js b/node_modules/@parcel/watcher/index.js
index 8afb2b1..c808fc3 100644
index 8afb2b1..bacda8f 100644
--- a/node_modules/@parcel/watcher/index.js
+++ b/node_modules/@parcel/watcher/index.js
@@ -1,6 +1,6 @@
@@ -1,37 +1,12 @@
const {createWrapper} = require('./wrapper');

-let name = `@parcel/watcher-${process.platform}-${process.arch}`;
+let name = `@hackolade/watcher-${process.platform}-${process.arch}`;
if (process.platform === 'linux') {
const { MUSL, family } = require('detect-libc');
if (family === MUSL) {
@@ -12,26 +12,11 @@ if (process.platform === 'linux') {

-if (process.platform === 'linux') {
- const { MUSL, family } = require('detect-libc');
- if (family === MUSL) {
- name += '-musl';
- } else {
- name += '-glibc';
- }
-}
-
let binding;
try {
- binding = require(name);
+ binding = require(/* webpackIgnore: true */ name);
+ binding = require(/* webpackIgnore: true */ `@hackolade/watcher-${process.platform}-${process.arch}`);
} catch (err) {
- handleError(err);
- try {
Expand All @@ -50,9 +53,9 @@ index 8afb2b1..c808fc3 100644
- if (err?.code !== 'MODULE_NOT_FOUND') {
- throw err;
- }
+ console.error('failed to load @parcel/watcher prebuild');
+ console.error('failed to load @hackolade/watcher prebuild');
+ console.error(err);
+ throw new Error(`No prebuild or local build of @parcel/watcher found. Tried ${name}. Please ensure it is installed (don't use --no-optional when installing with npm). Otherwise it is possible we don't support your platform yet. If this is the case, please report an issue to https://github.com/parcel-bundler/watcher.`);
+ throw new Error(`No prebuild or local build of @hackolade/watcher found. Tried ${name}. Please ensure it is installed (don't use --no-optional when installing with npm). Otherwise it is possible we don't support your platform yet. If this is the case, please report an issue to https://github.com/parcel-bundler/watcher.`);
}

const wrapper = createWrapper(binding);
Expand Down
4 changes: 2 additions & 2 deletions patches/couchbase+4.3.1.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1123242,7 +1123242,7 @@ index 7acc7cc..0000000
-
-#endif /* JSONSL_H_ */
diff --git a/node_modules/couchbase/dist/binding.js b/node_modules/couchbase/dist/binding.js
index bd33783..25b24ae 100644
index bd33783..cdf00e6 100644
--- a/node_modules/couchbase/dist/binding.js
+++ b/node_modules/couchbase/dist/binding.js
@@ -156,12 +156,7 @@ var CppTxnFailureType;
Expand All @@ -1123259,7 +1123259,7 @@ index bd33783..25b24ae 100644
- require('../scripts/prebuilds').loadPrebuild(path_1.default.resolve(__dirname, '..'));
+
+const os = require('os');
+const binding = require(/* webpackIgnore: true */ `@hackolade/couchbase-${os.platform()}-${os.arch()}-napi`);
+const binding = require(/* webpackIgnore: true */ `@hackolade/couchbase-${os.platform()}-${os.arch()}`);
exports.default = binding;
diff --git a/node_modules/couchbase/package.json b/node_modules/couchbase/package.json
index 3fa23e5..43ca77e 100644
Expand Down
70 changes: 1 addition & 69 deletions patches/desktop-trampoline+0.9.8.patch
View file
Original file line number Diff line number Diff line change
@@ -1,35 +1,5 @@
diff --git a/node_modules/desktop-trampoline/.npmignore b/node_modules/desktop-trampoline/.npmignore
index 1d0d2df..c8af340 100644
--- a/node_modules/desktop-trampoline/.npmignore
+++ b/node_modules/desktop-trampoline/.npmignore
@@ -15,5 +15,8 @@ build
jest.json
.node-version
.github
-src
-dist/test
+src/
+dist/test/
+prebuilds/
+include/
+binding.gyp
diff --git a/node_modules/desktop-trampoline/README.md b/node_modules/desktop-trampoline/README.md
index f01f067..146f825 100644
--- a/node_modules/desktop-trampoline/README.md
+++ b/node_modules/desktop-trampoline/README.md
@@ -1,3 +1,10 @@
+# Repackaged version of Desktop Trampoline
+
+This is a convenience package that will install all prebuilds for all supported platforms, to the contrary to the upstream package that constraint the installation only to the runtime platform (os/cpu).
+This typically enable cross building an Electron application.
+
+The package is cleaned up to only embbed the necessary.
+
# Desktop Trampoline

A cross-platform no-dependency C executable trampoline which lets GitHub Desktop
diff --git a/node_modules/desktop-trampoline/index.js b/node_modules/desktop-trampoline/index.js
index 0891bae..541c666 100644
index 0891bae..9d1b5a7 100644
--- a/node_modules/desktop-trampoline/index.js
+++ b/node_modules/desktop-trampoline/index.js
@@ -1,12 +1,10 @@
Expand Down Expand Up @@ -58,44 +28,6 @@ index 0891bae..541c666 100644
}

function getSSHWrapperFilename() {
diff --git a/node_modules/desktop-trampoline/package.json b/node_modules/desktop-trampoline/package.json
index 0cc0262..c9cb79b 100644
--- a/node_modules/desktop-trampoline/package.json
+++ b/node_modules/desktop-trampoline/package.json
@@ -10,8 +10,7 @@
},
"types": "./index.d.ts",
"scripts": {
- "build": "node-gyp rebuild",
- "install": "prebuild-install || node-gyp rebuild",
+ "install": "prebuild-install",
"test": "jest",
"lint": "prettier -c **/*.js **/*.md",
"lint:fix": "prettier --write **/*.js **/*.md",
@@ -30,8 +29,7 @@
},
"homepage": "https://github.com/desktop/desktop-trampoline#readme",
"dependencies": {
- "node-addon-api": "^3.1.0",
- "prebuild-install": "^6.0.0"
+ "node-addon-api": "^3.1.0"
},
"devDependencies": {
"jest": "^26.4.2",
@@ -48,5 +46,12 @@
"config": {
"runtime": "napi",
"target": 3
- }
+ },
+ "files": [
+ "index.js",
+ "index.d.ts",
+ "package.json",
+ "README.md",
+ "LICENSE"
+ ]
}
diff --git a/node_modules/desktop-trampoline/prebuilds/darwin-arm64/desktop-trampoline b/node_modules/desktop-trampoline/prebuilds/darwin-arm64/desktop-trampoline
new file mode 100755
index 0000000..c7e3356
Expand Down

0 comments on commit f508a41

Please sign in to comment.