mirror of
https://github.com/Llewellynvdm/nativefier.git
synced 2024-12-22 01:58:54 +00:00
Update to Electron 25.7 (#1566)
This commit is contained in:
parent
64157c3c5d
commit
2e0fe9ea33
14
app/npm-shrinkwrap.json
generated
14
app/npm-shrinkwrap.json
generated
@ -17,7 +17,7 @@
|
|||||||
"source-map-support": "^0.5.21"
|
"source-map-support": "^0.5.21"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^25.5.0"
|
"electron": "^25.7.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@electron/get": {
|
"node_modules/@electron/get": {
|
||||||
@ -93,9 +93,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "18.17.4",
|
"version": "18.17.11",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.4.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.11.tgz",
|
||||||
"integrity": "sha512-ATL4WLgr7/W40+Sp1WnNTSKbgVn6Pvhc/2RHAdt8fl6NsQyp4oPCi2eKcGOvA494bwf1K/W6nGgZ9TwDqvpjdw==",
|
"integrity": "sha512-r3hjHPBu+3LzbGBa8DHnr/KAeTEEOrahkcL+cZc4MaBMTM+mk8LtXR+zw+nqfjuDZZzYTYgTcpHuP+BEQk069g==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"node_modules/@types/responselike": {
|
"node_modules/@types/responselike": {
|
||||||
@ -316,9 +316,9 @@
|
|||||||
"optional": true
|
"optional": true
|
||||||
},
|
},
|
||||||
"node_modules/electron": {
|
"node_modules/electron": {
|
||||||
"version": "25.5.0",
|
"version": "25.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/electron/-/electron-25.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/electron/-/electron-25.7.0.tgz",
|
||||||
"integrity": "sha512-w1DNj1LuAk0Vaas1rQ0pAkTe2gZ5YG75J27mC2m88y0G6Do5b5YoFDaF84fOGQHeQ4j8tC5LngSgWhbwmqDlrw==",
|
"integrity": "sha512-P82EzYZ8k9J21x5syhXV7EkezDmEXwycReXnagfzS0kwepnrlWzq1aDIUWdNvzTdHobky4m/nYcL98qd73mEVA==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"hasInstallScript": true,
|
"hasInstallScript": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -20,6 +20,6 @@
|
|||||||
"source-map-support": "^0.5.21"
|
"source-map-support": "^0.5.21"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"electron": "^25.5.0"
|
"electron": "^25.7.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
1080
npm-shrinkwrap.json
generated
1080
npm-shrinkwrap.json
generated
File diff suppressed because it is too large
Load Diff
18
package.json
18
package.json
@ -41,10 +41,10 @@
|
|||||||
"lint:fix": "cd src && eslint . --ext .ts --fix && cd ../shared && eslint src --ext .ts --fix && cd ../app && eslint src --ext .ts --fix",
|
"lint:fix": "cd src && eslint . --ext .ts --fix && cd ../shared && eslint src --ext .ts --fix && cd ../app && eslint src --ext .ts --fix",
|
||||||
"lint:format": "prettier --write 'src/**/*.ts' 'app/src/**/*.ts' 'shared/src/**/*.ts'",
|
"lint:format": "prettier --write 'src/**/*.ts' 'app/src/**/*.ts' 'shared/src/**/*.ts'",
|
||||||
"lint": "eslint shared app src --ext .ts",
|
"lint": "eslint shared app src --ext .ts",
|
||||||
"list-outdated-deps": "npm out; cd app && npm out; true",
|
"list-outdated-deps": "npm out -l; cd app && npm out -l; true",
|
||||||
"prepare": "cd app && npm ci && cd .. && npm run build",
|
"prepare": "cd app && npm ci && cd .. && npm run build",
|
||||||
"relock:cli": "rm -rf ./node_modules/ ./npm-shrinkwrap.json && npm install --ignore-scripts --package-lock && mv package-lock.json npm-shrinkwrap.json && npm out",
|
"relock:cli": "rm -rf ./node_modules/ ./npm-shrinkwrap.json && npm install --ignore-scripts --package-lock && mv package-lock.json npm-shrinkwrap.json && npm out -l",
|
||||||
"relock:app": "rm -rf ./app/node_modules/ ./app/npm-shrinkwrap.json && cd app && npm install --ignore-scripts --package-lock && mv package-lock.json npm-shrinkwrap.json && npm out",
|
"relock:app": "rm -rf ./app/node_modules/ ./app/npm-shrinkwrap.json && cd app && npm install --ignore-scripts --package-lock && mv package-lock.json npm-shrinkwrap.json && npm out -l",
|
||||||
"relock": "npm run relock:cli; npm run relock:app",
|
"relock": "npm run relock:cli; npm run relock:app",
|
||||||
"test:integration": "jest --testRegex=integration-test",
|
"test:integration": "jest --testRegex=integration-test",
|
||||||
"test:manual": "npm run build && bash .github/manual-test",
|
"test:manual": "npm run build && bash .github/manual-test",
|
||||||
@ -76,17 +76,17 @@
|
|||||||
"@types/debug": "^4.1.8",
|
"@types/debug": "^4.1.8",
|
||||||
"@types/fs-extra": "^11.0.1",
|
"@types/fs-extra": "^11.0.1",
|
||||||
"@types/hasbin": "^1.2.0",
|
"@types/hasbin": "^1.2.0",
|
||||||
"@types/jest": "^29.5.3",
|
"@types/jest": "^29.5.4",
|
||||||
"@types/ncp": "^2.0.5",
|
"@types/ncp": "^2.0.5",
|
||||||
"@types/node": "^20.4.7",
|
"@types/node": "^20.5.6",
|
||||||
"@types/page-icon": "^0.3.4",
|
"@types/page-icon": "^0.3.4",
|
||||||
"@types/tmp": "^0.2.3",
|
"@types/tmp": "^0.2.3",
|
||||||
"@types/yargs": "^17.0.24",
|
"@types/yargs": "^17.0.24",
|
||||||
"@typescript-eslint/eslint-plugin": "^6.2.1",
|
"@typescript-eslint/eslint-plugin": "^6.4.1",
|
||||||
"@typescript-eslint/parser": "^6.2.1",
|
"@typescript-eslint/parser": "^6.4.1",
|
||||||
"electron": "^25.5.0",
|
"electron": "^25.7.0",
|
||||||
"eslint": "^8.46.0",
|
"eslint": "^8.46.0",
|
||||||
"eslint-config-prettier": "^8.10.0",
|
"eslint-config-prettier": "^9.0.0",
|
||||||
"eslint-plugin-prettier": "^5.0.0",
|
"eslint-plugin-prettier": "^5.0.0",
|
||||||
"jest": "^29.6.2",
|
"jest": "^29.6.2",
|
||||||
"playwright": "^1.36.2",
|
"playwright": "^1.36.2",
|
||||||
|
@ -6,14 +6,14 @@ export const DEFAULT_APP_NAME = 'APP';
|
|||||||
// - upgrade app / package.json / "devDependencies" / "electron"
|
// - upgrade app / package.json / "devDependencies" / "electron"
|
||||||
// - upgrade package.json / "devDependencies" / "electron"
|
// - upgrade package.json / "devDependencies" / "electron"
|
||||||
// Doing a *major* upgrade? Read https://github.com/nativefier/nativefier/blob/master/HACKING.md#deps-major-upgrading-electron
|
// Doing a *major* upgrade? Read https://github.com/nativefier/nativefier/blob/master/HACKING.md#deps-major-upgrading-electron
|
||||||
export const DEFAULT_ELECTRON_VERSION = '25.5.0';
|
export const DEFAULT_ELECTRON_VERSION = '25.7.0';
|
||||||
// https://atom.io/download/atom-shell/index.json
|
// https://atom.io/download/atom-shell/index.json
|
||||||
// https://www.electronjs.org/releases/stable
|
// https://www.electronjs.org/releases/stable
|
||||||
export const DEFAULT_CHROME_VERSION = '114.0.5735.289';
|
export const DEFAULT_CHROME_VERSION = '114.0.5735.289';
|
||||||
|
|
||||||
// Update each of these periodically
|
// Update each of these periodically
|
||||||
// https://product-details.mozilla.org/1.0/firefox_versions.json
|
// https://product-details.mozilla.org/1.0/firefox_versions.json
|
||||||
export const DEFAULT_FIREFOX_VERSION = '116.0.1';
|
export const DEFAULT_FIREFOX_VERSION = '116.0.3';
|
||||||
|
|
||||||
// https://en.wikipedia.org/wiki/Safari_version_history
|
// https://en.wikipedia.org/wiki/Safari_version_history
|
||||||
export const DEFAULT_SAFARI_VERSION = {
|
export const DEFAULT_SAFARI_VERSION = {
|
||||||
|
@ -71,9 +71,8 @@ async function edgeUserAgent(
|
|||||||
platform: string,
|
platform: string,
|
||||||
electronVersion: string,
|
electronVersion: string,
|
||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
const chromeVersion = await getChromeVersionForElectronVersion(
|
const chromeVersion =
|
||||||
electronVersion,
|
await getChromeVersionForElectronVersion(electronVersion);
|
||||||
);
|
|
||||||
|
|
||||||
return `Mozilla/5.0 (${platform}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${chromeVersion} Safari/537.36 Edg/${chromeVersion}`;
|
return `Mozilla/5.0 (${platform}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${chromeVersion} Safari/537.36 Edg/${chromeVersion}`;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user