Merge branch 'master' of https://github.com/atom/atom

README.md

@@ -76,9 +76,10 @@ repeat these steps to upgrade to future releases.
 
 ## Discussion
 
-* Discuss Atom on our [forums](https://discuss.atom.io/)
+* Discuss Atom on our [forums](https://discuss.atom.io/) or on [GitHub Discussions](https://github.com/atom/atom/discussions)
 * Chat about Atom on our Slack team -- [instructions for joining](https://discuss.atom.io/t/join-us-on-slack/16638?source_topic_id=25406)
 
+
 ## License
 
 [MIT](https://github.com/atom/atom/blob/master/LICENSE.md)

package.json

@@ -18,7 +18,6 @@
     "@atom/nsfw": "^1.0.27",
     "@atom/source-map-support": "^0.3.4",
     "@atom/watcher": "^1.3.5",
-    "@hyurl/structured-clone": "^0.3.0",
     "about": "file:packages/about",
     "archive-view": "https://www.atom.io/api/packages/archive-view/versions/0.65.2/tarball",
     "async": "3.2.0",

spec/menu-sort-helpers-spec.js

@@ -15,7 +15,7 @@ describe('contextMenu', () => {
       expect(sortMenuItems(items)).toEqual(expected);
     });
 
-    it('preserves separators at the begining of set two', () => {
+    it('preserves separators at the beginning of set two', () => {
       const items = [
         { command: 'core:one' },
         { type: 'separator' },

src/main-process/atom-window.js

@@ -9,7 +9,6 @@ const getAppName = require('../get-app-name');
 const path = require('path');
 const url = require('url');
 const { EventEmitter } = require('events');
-const { compose } = require('@hyurl/structured-clone');
 const StartupTime = require('../startup-time');
 
 const ICON_PATH = path.resolve(__dirname, '..', '..', 'resources', 'atom.png');
@@ -375,7 +374,7 @@ module.exports = class AtomWindow extends EventEmitter {
   sendCommandToBrowserWindow(command, ...args) {
     const action =
       args[0] && args[0].contextCommand ? 'context-command' : 'command';
-    this.browserWindow.webContents.send(action, command, compose(...args));
+    this.browserWindow.webContents.send(action, command, ...args);
   }
 
   getDimensions() {

src/main-process/context-menu.js

@@ -16,7 +16,6 @@ module.exports = class ContextMenu {
       if (item.command) {
         if (!item.commandDetail) item.commandDetail = {};
         item.commandDetail.contextCommand = true;
-        item.commandDetail.atomWindow = this.atomWindow;
         item.click = () => {
           global.atomApplication.sendCommandToWindow(
             item.command,

static/core-ui/utils.less

@@ -1,6 +1,6 @@
 
 // CSS containment variables.
-// The words after `but` explicitly show the excluded/incompatible values.
+// The words after `except` explicitly show the excluded/incompatible values.
 @contain_all: layout size paint style;
 @contain_except_layout: size paint style;
 @contain_except_size: layout paint style;