Merge 2.22.2 release branch back into trunk (#3266)

Co-authored-by: Gio Lodi <[email protected]>
Co-authored-by: Dan Roundhill <[email protected]>

Author: 3 people

RELEASE-NOTES.md

@@ -1,10 +1,27 @@
 # Changelog
 
+## [v2.22.2]
+
+### Enhancements
+
+- Added "magic link" login [#3246](https://github.com/Automattic/simplenote-electron/pull/3246)
+- Added a link to log in with a password from the initial login screen [#3256](https://github.com/Automattic/simplenote-electron/pull/3256)
+
+### Fixes
+
+- Disabled "sticky scrolling" option [#3254](https://github.com/Automattic/simplenote-electron/pull/3254)
+
+### Other Changes
+
+- Removed gconf2 dependency [#3244](https://github.com/Automattic/simplenote-electron/pull/3244)
+
 ## [v2.22.1]
 
 ### Fixes
 
 - The final release build of v2.22.0 was not correctly packaged, causing a crash on startup. Affected users will need to manually download this version, which properly includes a necessary configuration file during the build process [#3232](https://github.com/Automattic/simplenote-electron/pull/3232)
+- Disabled the menu item to check for updates in the development environment [#3214](https://github.com/Automattic/simplenote-electron/pull/3214)
+- Don't indent lines following an indent (hanging indent support) [#3216](https://github.com/Automattic/simplenote-electron/pull/3216)
 
 ## [v2.22.0]
 

lib/auth/index.tsx

@@ -38,7 +38,7 @@ export class Auth extends Component<Props> {
     isCreatingAccount: false,
     passwordErrorMessage: null,
     onLine: window.navigator.onLine,
-    usePassword: isDev, // Magic link login doesn't work in dev mode
+    usePassword: false,
     emailForPasswordForm: null,
   };
 
@@ -357,6 +357,22 @@ export class Auth extends Component<Props> {
             )}
           </button>
 
+          {!isCreatingAccount && !usePassword && (
+            <Fragment>
+              <div className="terms">
+                We&rsquo;ll email you a code to log in, or you can
+                <a
+                  href="#"
+                  rel="noopener noreferrer"
+                  onClick={this.togglePassword}
+                >
+                  log in manually
+                </a>
+                .
+              </div>
+            </Fragment>
+          )}
+
           {usePassword && (
             <Fragment>
               <a

lib/note-content-editor.tsx

@@ -1277,6 +1277,7 @@ class NoteContentEditor extends Component<Props> {
               scrollBeyondLastLine: false,
               selectionHighlight: false,
               showFoldingControls: 'never',
+              stickyScroll: { enabled: false },
               suggestOnTriggerCharacters: true,
               unicodeHighlight: {
                 ambiguousCharacters: false,

package-lock.json

@@ -6,7 +6,7 @@
     "email": "[email protected]"
   },
   "productName": "Simplenote",
-  "version": "2.22.2-beta.4",
+  "version": "2.22.2",
   "main": "desktop/index.js",
   "license": "GPL-2.0",
   "homepage": "https://simplenote.com",

package.json

@@ -129,12 +129,17 @@ module.exports = () => {
       }),
       new MonacoWebpackPlugin({
         languages: [],
+        // don't include features we disable. these generally correspond to the options
+        // passed to editor initialization in note-content-editor.tsx
+        // @see https://github.com/microsoft/monaco-editor/blob/main/webpack-plugin/README.md#options
         features: [
           '!bracketMatching',
           '!codeAction',
           '!codelens',
-          '!colorDetector',
+          '!colorPicker',
           '!comment',
+          '!diffEditor',
+          '!diffEditorBreadcrumbs',
           '!folding',
           '!gotoError',
           '!gotoLine',
@@ -144,12 +149,15 @@ module.exports = () => {
           '!multicursor',
           '!parameterHints',
           '!quickCommand',
+          '!quickHelp',
           '!quickOutline',
           '!referenceSearch',
           '!rename',
-          '!snippets',
+          '!snippet',
+          '!stickyScroll',
           '!suggest',
           '!toggleHighContrast',
+          '!unicodeHighlighter',
         ],
       }),
       new webpack.DefinePlugin({