Merge pull request #22687 from atom/electron-upgrade-11.4.7

Electron upgrade 11.4.7
This commit is contained in:
Sadick 2021-12-02 15:59:52 +03:00 committed by GitHub
commit eb6258fd50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 578 additions and 559 deletions

1096
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -12,10 +12,10 @@
"url": "https://github.com/atom/atom/issues"
},
"license": "MIT",
"electronVersion": "9.4.4",
"electronVersion": "11.4.12",
"dependencies": {
"@atom/fuzzy-native": "^1.2.0",
"@atom/nsfw": "^1.0.27",
"@atom/fuzzy-native": "^1.2.1",
"@atom/nsfw": "^1.0.28",
"@atom/source-map-support": "^0.3.4",
"@atom/watcher": "^1.3.5",
"about": "file:packages/about",
@ -23,7 +23,7 @@
"async": "3.2.0",
"atom-dark-syntax": "file:packages/atom-dark-syntax",
"atom-dark-ui": "file:packages/atom-dark-ui",
"atom-keymap": "8.2.14",
"atom-keymap": "8.2.15",
"atom-light-syntax": "file:packages/atom-light-syntax",
"atom-light-ui": "file:packages/atom-light-ui",
"atom-select-list": "^0.8.1",
@ -51,6 +51,7 @@
"deprecation-cop": "file:packages/deprecation-cop",
"dev-live-reload": "file:packages/dev-live-reload",
"devtron": "1.4.0",
"document-register-element": "^1.14.10",
"electron-notarize": "1.0.0",
"electron-osx-sign": "0.5.0",
"encoding-selector": "https://www.atom.io/api/packages/encoding-selector/versions/0.23.9/tarball",
@ -59,7 +60,7 @@
"exception-reporting": "file:packages/exception-reporting",
"find-and-replace": "https://www.atom.io/api/packages/find-and-replace/versions/0.219.8/tarball",
"find-parent-dir": "^0.3.0",
"first-mate": "7.4.1",
"first-mate": "7.4.3",
"focus-trap": "6.3.0",
"fs-admin": "0.15.0",
"fs-plus": "^3.1.1",
@ -68,7 +69,7 @@
"fuzzy-finder": "https://www.atom.io/api/packages/fuzzy-finder/versions/1.14.3/tarball",
"git-diff": "file:packages/git-diff",
"git-utils": "5.7.1",
"github": "https://www.atom.io/api/packages/github/versions/0.36.9/tarball",
"github": "https://www.atom.io/api/packages/github/versions/0.36.10/tarball",
"glob": "^7.1.1",
"go-to-line": "file:packages/go-to-line",
"grammar-selector": "file:packages/grammar-selector",
@ -134,7 +135,7 @@
"one-light-ui": "file:packages/one-light-ui",
"open-on-github": "https://www.atom.io/api/packages/open-on-github/versions/1.3.2/tarball",
"package-generator": "https://www.atom.io/api/packages/package-generator/versions/1.3.0/tarball",
"pathwatcher": "^8.1.1",
"pathwatcher": "^8.1.2",
"postcss": "8.2.10",
"postcss-selector-parser": "6.0.4",
"prebuild-install": "6.0.0",
@ -160,7 +161,7 @@
"temp": "0.9.2",
"text-buffer": "^13.18.5",
"timecop": "https://www.atom.io/api/packages/timecop/versions/0.36.2/tarball",
"tree-sitter": "0.17.1",
"tree-sitter": "git+https://github.com/DeeDeeG/node-tree-sitter.git#bb298eaae66e0c4f11908cb6209f3e141884e88e",
"tree-view": "https://www.atom.io/api/packages/tree-view/versions/0.229.1/tarball",
"typescript-simple": "8.0.6",
"update-package-dependencies": "file:./packages/update-package-dependencies",
@ -204,7 +205,7 @@
"exception-reporting": "file:./packages/exception-reporting",
"find-and-replace": "0.219.8",
"fuzzy-finder": "1.14.3",
"github": "0.36.9",
"github": "0.36.10",
"git-diff": "file:./packages/git-diff",
"go-to-line": "file:./packages/go-to-line",
"grammar-selector": "file:./packages/grammar-selector",

View File

@ -796,6 +796,7 @@ describe('AtomApplication', function() {
app = scenario.getApplication(0);
app.removeWindow(w);
sinon.stub(app, 'promptForPathToOpen');
global.atom = { workspace: { getActiveTextEditor() {} } };
});
it('opens a new file', function() {

View File

@ -53,7 +53,7 @@ jasmine.getEnv().addEqualityTester (a, b) ->
_.isEqual(a, b)
if process.env.CI
jasmine.getEnv().defaultTimeoutInterval = 60000
jasmine.getEnv().defaultTimeoutInterval = 120000
else
jasmine.getEnv().defaultTimeoutInterval = 5000

View File

@ -145,6 +145,25 @@
? snapshotResult.customRequire('../src/crash-reporter-start.js')
: require('../src/crash-reporter-start');
useSnapshot
? snapshotResult.customRequire(
'../node_modules/document-register-element/build/document-register-element.node.js'
)
: require('document-register-element');
const Grim = useSnapshot
? snapshotResult.customRequire('../node_modules/grim/lib/grim.js')
: require('grim');
const documentRegisterElement = document.registerElement;
document.registerElement = (type, options) => {
Grim.deprecate(
'Use `customElements.define` instead of `document.registerElement` see https://javascript.info/custom-elements'
);
return documentRegisterElement(type, options);
};
const { userSettings, appVersion } = getWindowLoadSettings();
const uploadToServer =
userSettings &&