(cordova-cli) branch dependabot/npm_and_yarn/ip-2.0.1 deleted (was 665a90a)
This is an automated email from the ASF dual-hosted git repository. dpogue pushed a change to branch dependabot/npm_and_yarn/ip-2.0.1 in repository https://gitbox.apache.org/repos/asf/cordova-cli.git was 665a90a chore(deps): bump ip from 2.0.0 to 2.0.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-cli) branch master updated: chore(deps): bump ip from 2.0.0 to 2.0.1
This is an automated email from the ASF dual-hosted git repository.
dpogue pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-cli.git
The following commit(s) were added to refs/heads/master by this push:
new fc39528 chore(deps): bump ip from 2.0.0 to 2.0.1
fc39528 is described below
commit fc3952818e9f52692d6393a370c296eb7acc4b3b
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Feb 20 21:11:25 2024 +
chore(deps): bump ip from 2.0.0 to 2.0.1
Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1.
- [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1)
---
updated-dependencies:
- dependency-name: ip
dependency-type: indirect
...
Signed-off-by: dependabot[bot]
---
package-lock.json | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 476e4d1..84a4da7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5036,9 +5036,9 @@
}
},
"node_modules/ip": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.0.tgz;,
- "integrity":
"sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ=="
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/ip/-/ip-2.0.1.tgz;,
+ "integrity":
"sha512-lJUL9imLTNi1ZfXT+DU6rBBdbiKGBuay9B6xGSPVjUeQwaH1RIGqef8RZkUtHioLmSNpPR5M4HVKJGm1j8FWVQ=="
},
"node_modules/ipaddr.js": {
"version": "1.9.1",
-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-cli) branch dependabot/npm_and_yarn/ip-2.0.1 created (now 665a90a)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/ip-2.0.1 in repository https://gitbox.apache.org/repos/asf/cordova-cli.git at 665a90a chore(deps): bump ip from 2.0.0 to 2.0.1 No new revisions were added by this update. - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-electron) branch dependabot/npm_and_yarn/got-and-electron-11.8.6 deleted (was ed354df)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/got-and-electron-11.8.6 in repository https://gitbox.apache.org/repos/asf/cordova-electron.git was ed354df build(deps): bump got and electron The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-electron) branch dependabot/npm_and_yarn/json5-1.0.2 deleted (was 055bba6)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/json5-1.0.2 in repository https://gitbox.apache.org/repos/asf/cordova-electron.git was 055bba6 build(deps): bump json5 from 1.0.1 to 1.0.2 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-electron) branch dependabot/npm_and_yarn/http-cache-semantics-4.1.1 deleted (was 9abbd2c)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/http-cache-semantics-4.1.1 in repository https://gitbox.apache.org/repos/asf/cordova-electron.git was 9abbd2c build(deps): bump http-cache-semantics from 4.1.0 to 4.1.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-electron) branch dependabot/npm_and_yarn/minimatch-and-electron-builder-3.1.2 deleted (was 4585cae)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/minimatch-and-electron-builder-3.1.2 in repository https://gitbox.apache.org/repos/asf/cordova-electron.git was 4585cae build(deps): bump minimatch and electron-builder The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-electron) branch dependabot/npm_and_yarn/semver-6.3.1 deleted (was 9013b58)
This is an automated email from the ASF dual-hosted git repository. github-bot pushed a change to branch dependabot/npm_and_yarn/semver-6.3.1 in repository https://gitbox.apache.org/repos/asf/cordova-electron.git was 9013b58 build(deps): bump semver from 6.3.0 to 6.3.1 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. - To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-electron) branch master updated: ci: add node 20.x & use latest action dependencies (#267)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-electron.git
The following commit(s) were added to refs/heads/master by this push:
new 9bd9c18 ci: add node 20.x & use latest action dependencies (#267)
9bd9c18 is described below
commit 9bd9c189d2a7d8223e8ec672d7743e4dd11678c8
Author: エリス
AuthorDate: Tue Feb 20 23:03:40 2024 +0900
ci: add node 20.x & use latest action dependencies (#267)
---
.github/workflows/ci.yml | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 203a8a5..8409d1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,14 +27,14 @@ jobs:
strategy:
matrix:
-node-version: [18.x]
+node-version: [18.x, 20.x]
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
- - uses: actions/checkout@v3
+ - uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
-uses: actions/setup-node@v3
+uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
@@ -48,6 +48,6 @@ jobs:
env:
CI: true
- - uses: codecov/codecov-action@v3
+ - uses: codecov/codecov-action@v4
with:
fail_ci_if_error: true
-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-electron) branch master updated: fix!: remove extra array wrapper from passed arguments (#266)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-electron.git
The following commit(s) were added to refs/heads/master by this push:
new 40227e1 fix!: remove extra array wrapper from passed arguments (#266)
40227e1 is described below
commit 40227e12ba880a1c5ad808b1ae8171e06e4f6116
Author: エリス
AuthorDate: Tue Feb 20 22:57:03 2024 +0900
fix!: remove extra array wrapper from passed arguments (#266)
---
bin/templates/platform_www/cdv-electron-main.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/templates/platform_www/cdv-electron-main.js
b/bin/templates/platform_www/cdv-electron-main.js
index d256bd5..8a0dd38 100644
--- a/bin/templates/platform_www/cdv-electron-main.js
+++ b/bin/templates/platform_www/cdv-electron-main.js
@@ -169,7 +169,7 @@ ipcMain.handle('cdv-plugin-exec', async (_, serviceName,
action, ...args) => {
const plugin = require(cordova.services[serviceName]);
return plugin[action]
-? plugin[action](args)
+? plugin[action](...args)
: Promise.reject(new Error(`The action "${action}" for the
requested plugin service "${serviceName}" does not exist.`));
} else {
return Promise.reject(new Error(`The requested plugin service
"${serviceName}" does not exist have native support.`));
-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org
(cordova-electron) branch master updated: npm(dep)!: bump other dependencies (#265)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-electron.git
The following commit(s) were added to refs/heads/master by this push:
new 972734e npm(dep)!: bump other dependencies (#265)
972734e is described below
commit 972734e754d8abbe3179e00e3c0252c6d1b4bc22
Author: エリス
AuthorDate: Tue Feb 20 22:35:41 2024 +0900
npm(dep)!: bump other dependencies (#265)
* npm(dep)!: bump rewire@^7.0.0
* npm(dep)!: bump jasmine@^5.1.0
* npm(dep)!: bump cordova-common@^5.0.0
* npm(dep)!: bump @cordova/eslint-config@^5.0.0 w/ lint fixes
---
bin/templates/platform_www/cdv-electron-main.js |2 +-
cordova-js-src/exec.js |2 +-
package-lock.json | 1301 ---
package.json|8 +-
tests/spec/unit/lib/Api.spec.js |2 +-
5 files changed, 670 insertions(+), 645 deletions(-)
diff --git a/bin/templates/platform_www/cdv-electron-main.js
b/bin/templates/platform_www/cdv-electron-main.js
index d31e24f..d256bd5 100644
--- a/bin/templates/platform_www/cdv-electron-main.js
+++ b/bin/templates/platform_www/cdv-electron-main.js
@@ -116,7 +116,7 @@ function configureProtocol () {
// If using Electron 24.x and older
protocol.registerFileProtocol(scheme, (request, cb) => {
const url = request.url.substr(basePath.length + 1);
-cb({ path: path.normalize(path.join(__dirname, url)) }); //
eslint-disable-line node/no-callback-literal
+cb({ path: path.normalize(path.join(__dirname, url)) }); //
eslint-disable-line n/no-callback-literal
});
protocol.interceptFileProtocol('file', (_, cb) => { cb(null); });
} else {
diff --git a/cordova-js-src/exec.js b/cordova-js-src/exec.js
index 835a8c4..5537d10 100644
--- a/cordova-js-src/exec.js
+++ b/cordova-js-src/exec.js
@@ -52,7 +52,7 @@ module.exports = function (success, fail, service, action,
args) {
const callbackId = service + cordova.callbackId++;
if (typeof success === 'function' || typeof fail === 'function') {
-cordova.callbacks[callbackId] = { success: success, fail: fail
};
+cordova.callbacks[callbackId] = { success, fail };
}
try {
// callbackOptions param represents additional optional
parameters command could pass back, like keepCallback or
diff --git a/package-lock.json b/package-lock.json
index 8b5491c..63d27a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
"version": "4.0.0-dev",
"license": "Apache-2.0",
"dependencies": {
-"cordova-common": "^4.0.2",
+"cordova-common": "^5.0.0",
"electron": "^29.0.0",
"electron-builder": "^24.12.0",
"electron-devtools-installer": "^3.2.0",
@@ -17,11 +17,11 @@
"fs-extra": "^10.1.0"
},
"devDependencies": {
-"@cordova/eslint-config": "^4.0.0",
+"@cordova/eslint-config": "^5.0.0",
"cordova-js": "^6.1.0",
-"jasmine": "^4.1.0",
+"jasmine": "^5.1.0",
"nyc": "^15.1.0",
-"rewire": "^6.0.0"
+"rewire": "^7.0.0"
},
"engines": {
"node": ">=18.0.0"
@@ -50,54 +50,6 @@
}
},
"node_modules/@babel/code-frame": {
- "version": "7.12.11",
- "resolved":
"https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz;,
- "integrity":
"sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==",
- "dev": true,
- "dependencies": {
-"@babel/highlight": "^7.10.4"
- }
-},
-"node_modules/@babel/compat-data": {
- "version": "7.23.5",
- "resolved":
"https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz;,
- "integrity":
"sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==",
- "dev": true,
- "engines": {
-"node": ">=6.9.0"
- }
-},
-"node_modules/@babel/core": {
- "version": "7.23.9",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz;,
- "integrity":
"sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==",
- "dev": true,
- "dependencies": {
-"@ampproject/remapping": "^2.2.0",
-"@babel/code-frame": "^7.23.5",
-"@babel/generator": "^7.23.6",
-"@babel/helper-compilation-targets": "^7.23.6",
-"@babel/helper-module-transforms": "^7.23.3",
-"@babel/helpers": "^7.23.9",
-"@babel/parser": "^7.23.9",
-"@babel/template": "^7.23.9",
-"@babel/traverse": "^7.23.9",
-"@babel/types": "^7.23.9",
-"convert-source-map": "^2.0.0",
-"debug":
(cordova-electron) branch master updated: feat!: bump electron@^29.0.0 w/ supporting changes (#263)
This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-electron.git
The following commit(s) were added to refs/heads/master by this push:
new 8fcde3a feat!: bump electron@^29.0.0 w/ supporting changes (#263)
8fcde3a is described below
commit 8fcde3a7db3324bb93b8a582eee32ff2b3723395
Author: エリス
AuthorDate: Tue Feb 20 22:12:37 2024 +0900
feat!: bump electron@^29.0.0 w/ supporting changes (#263)
* npm(dep)!: bump electron@^28.1.4
* feat!: replace deprecated usage registerFileProtocol & drop
interceptFileProtocol
* feat!: disable default sandbox setting
* feat!: improve configureProtocol to support for older electron versions
* npm(dep)!: bump electron@^29.0.0
---
bin/templates/platform_www/cdv-electron-main.js | 32 +-
package-lock.json | 751
package.json| 2 +-
3 files changed, 533 insertions(+), 252 deletions(-)
diff --git a/bin/templates/platform_www/cdv-electron-main.js
b/bin/templates/platform_www/cdv-electron-main.js
index 19b852c..d31e24f 100644
--- a/bin/templates/platform_www/cdv-electron-main.js
+++ b/bin/templates/platform_www/cdv-electron-main.js
@@ -25,7 +25,8 @@ const {
app,
BrowserWindow,
protocol,
-ipcMain
+ipcMain,
+net
} = require('electron');
// Electron settings from .json file.
const cdvElectronSettings = require('./cdv-electron-settings.json');
@@ -74,6 +75,9 @@ function createWindow () {
const browserWindowOpts = Object.assign({},
cdvElectronSettings.browserWindow, { icon: appIcon });
browserWindowOpts.webPreferences.preload = path.join(app.getAppPath(),
'cdv-electron-preload.js');
browserWindowOpts.webPreferences.contextIsolation = true;
+// @todo review if using default "sandbox" is possible. When enabled,
"Unable to load preload script:" error occurs.
+// Other require statements also fails.
+browserWindowOpts.webPreferences.sandbox = false;
mainWindow = new BrowserWindow(browserWindowOpts);
@@ -99,12 +103,26 @@ function createWindow () {
}
function configureProtocol () {
-protocol.registerFileProtocol(scheme, (request, cb) => {
-const url = request.url.substr(basePath.length + 1);
-cb({ path: path.normalize(path.join(__dirname, url)) }); //
eslint-disable-line node/no-callback-literal
-});
-
-protocol.interceptFileProtocol('file', (_, cb) => { cb(null); });
+// `protocol.handle` was added in Electron 25.0 and replaced the deprecated
+// `protocol.{register,intercept}{String,Buffer,Stream,Http,File}Protocol`.
+if (protocol.handle) {
+// If using Electron 25.0+
+protocol.handle(scheme, request => {
+const url = request.url.substr(basePath.length + 1);
+const fileUrl = `file://${path.normalize(path.join(__dirname,
url))}`;
+return net.fetch(fileUrl);
+});
+} else if (protocol.registerFileProtocol) {
+// If using Electron 24.x and older
+protocol.registerFileProtocol(scheme, (request, cb) => {
+const url = request.url.substr(basePath.length + 1);
+cb({ path: path.normalize(path.join(__dirname, url)) }); //
eslint-disable-line node/no-callback-literal
+});
+protocol.interceptFileProtocol('file', (_, cb) => { cb(null); });
+} else {
+// Cant configure if missing `protocol.handle` and
`protocol.registerFileProtocol`...
+console.info('Unable to configure the protocol.');
+}
}
// This method will be called when Electron has finished
diff --git a/package-lock.json b/package-lock.json
index c1a0e92..a013cae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
"license": "Apache-2.0",
"dependencies": {
"cordova-common": "^4.0.2",
-"electron": "^19.0.3",
+"electron": "^29.0.0",
"electron-builder": "^23.0.3",
"electron-devtools-installer": "^3.2.0",
"execa": "^5.1.1",
@@ -478,24 +478,84 @@
}
},
"node_modules/@electron/get": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/@electron/get/-/get-1.14.1.tgz;,
- "integrity":
"sha512-BrZYyL/6m0ZXz/lDxy/nlVhQz+WF+iPS6qXolEU8atw7h6v1aYkjwJZ63m+bJMBTxDE66X+r2tPS4a/8C82sZw==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz;,
+ "integrity":
"sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==",
"dependencies": {
"debug": "^4.1.1",
"env-paths": "^2.2.0",
"fs-extra": "^8.1.0",
-"got": "^9.6.0",
+"got": "^11.8.5",
"progress": "^2.0.3",
"semver": "^6.2.0",
"sumchecker": "^3.0.1"
},
"engines": {
-"node": ">=8.6"
+
