Merge branch 'develop' into merge_release_1.44.1_to_develop

.circleci/config.yml

@@ -50,6 +50,10 @@ parameters:
     type: string
     # Hash points to previous version with node 12. When everything works with node 14 it can be removed
     default: "circleci/android:api-29-node@sha256:71d61d6c21b29948d57120f476a83cc322a280979bce355c5a0ad771293ca380" 
+  linux-machine-image:
+    type: string
+    # Latest supported ubuntu image from https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
+    default: "ubuntu-2004:202010-01" 
 
 jobs:
   checks:
@@ -63,11 +67,19 @@ jobs:
       check-correctness:
         type: boolean
         default: false
-    docker:
-      - image: circleci/node:14
+    machine:
+      image: << pipeline.parameters.linux-machine-image >>
     steps:
       - checkout
       - checkout-submodules
+      - run:
+          name: Install newer nvm
+          command: curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.37.2/install.sh | bash
+      - run:
+          name: Install newer node using nvm
+          command: |
+            cd gutenberg
+            nvm install --latest-npm
       - when:
           condition: <<parameters.check-correctness>>
           steps:
@@ -100,7 +112,7 @@ jobs:
         type: string
         default: ""
     machine:
-      image: ubuntu-2004:202010-01 # Latest supported ubuntu image from https://circleci.com/docs/2.0/configuration-reference/#available-machine-images
+      image: << pipeline.parameters.linux-machine-image >>
     steps:
       - checkout
       - checkout-submodules

.eslintrc.js

@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-const { map } = require( 'lodash' );
-
 module.exports = {
 	parser: "babel-eslint",
 	env: {
@@ -19,5 +14,17 @@ module.exports = {
 	],
 	extends: [
 		"plugin:@wordpress/eslint-plugin/recommended",
-	]
+	],
+	settings: {
+		'import/resolver': {
+			'node': {
+				'moduleDirectory': ['node_modules', 'gutenberg/node_modules']
+			}
+		},
+	},
+	rules: {
+		// do not throw an error if imported dependencies are 
+		// declared in `package.json` or `gutenberg/package.json`
+		"import/no-extraneous-dependencies": ["error", {"packageDir": ['.', './gutenberg/']}] 
+	}
 };

.github/PULL_REQUEST_TEMPLATE.md

@@ -5,4 +5,4 @@ To test:
 PR submission checklist:
 
 - [ ] I have considered adding unit tests where possible.
-- [ ] I have considered if this change warrants user-facing release notes [more info](https://github.com/wordpress-mobile/gutenberg-mobile/blob/develop/docs/Release-notes.md) and have added them to [RELEASE-NOTES.txt](https://github.com/wordpress-mobile/gutenberg-mobile/blob/develop/RELEASE-NOTES.txt) if necessary.
+- [ ] I have considered if this change warrants user-facing release notes [more info](https://github.com/wordpress-mobile/gutenberg-mobile/blob/develop/Release-notes.md) and have added them to [RELEASE-NOTES.txt](https://github.com/wordpress-mobile/gutenberg-mobile/blob/develop/RELEASE-NOTES.txt) if necessary.

RELEASE-NOTES.txt

@@ -22,6 +22,11 @@ Unreleased
 1.42.2
 ------
 * [**] Fix issue where removing blocks some blocks would crash the editor.
+* [***] Full-width and wide alignment support for Columns
+* [***] New Block: File [https://github.com/wordpress-mobile/gutenberg-mobile/pull/2835]
+* [**] Image block - Add link picker to the block settings and enhance link settings with auto-hide options [https://github.com/WordPress/gutenberg/pull/27292]
+* [*] Fix button link setting, rel link will not be overwritten if modified by the user.
+* [*] Fix minor bug affecting link picker search results [https://github.com/WordPress/gutenberg/pull/27867]
 
 1.42.0
 ------

bin/ci-checks-js.sh

@@ -31,6 +31,13 @@ fi
 
 if [ "$CHECK_CORRECTNESS" = true ] ; then
   checkDiff
+
+  # Need to build gutenberg packages before linting so that eslint-plugin-import can resolve those.
+  # See https://github.com/WordPress/gutenberg/pull/22088 for more information.
+  cd gutenberg
+  npm run build:packages || pFail
+  cd ..
+
   npm run lint || pFail
 fi
 

bundle/ios/GutenbergNativeTranslations.swift

@@ -2,16 +2,10 @@ import Foundation
 
 private func dummy() {
     _ = NSLocalizedString("'%s' is not fully-supported", comment: "translators: Missing block alert title. %s: The localized block name")
-    _ = NSLocalizedString("(555)555-1234", comment: "translators: sample content for \"Contact\" page template")
     _ = NSLocalizedString("%1$s. Current value is %2$s", comment: "translators: accessibility text. Inform about current value. %1$s: Control label %2$s: Current value.")
     _ = NSLocalizedString("%s block options", comment: "translators: %s: block title e.g: \"Paragraph\".")
     _ = NSLocalizedString("%s block. Empty", comment: "translators: accessibility text for the media block empty state. %s: media type")
     _ = NSLocalizedString("%s block. This block has invalid content", comment: "translators: accessibility text for blocks with invalid content. %d: localized block title")
-    _ = NSLocalizedString("<a href=\"mailto:[email protected]\">[email protected]</a>", comment: "translators: sample content for \"Contact\" page template")
-    _ = NSLocalizedString("10 Street Road", comment: "translators: sample content for \"Contact\" page template")
-    _ = NSLocalizedString("A description of the project and the works presented.", comment: "translators: sample content for \"Portfolio\" page template")
-    _ = NSLocalizedString("A short bio with personal history, key achievements, or an interesting fact.", comment: "translators: sample content for \"Team\" page template")
-    _ = NSLocalizedString("A short description of the services you offer.", comment: "translators: sample content for \"Services\" page template")
     _ = NSLocalizedString("Add a description", comment: "")
     _ = NSLocalizedString("Add a shortcode…", comment: "")
     _ = NSLocalizedString("Add annotation", comment: "")
@@ -37,15 +31,13 @@ private func dummy() {
     _ = NSLocalizedString("Block pasted", comment: "translators: displayed right after the block is pasted.")
     _ = NSLocalizedString("Block removed", comment: "translators: displayed right after the block is removed.")
     _ = NSLocalizedString("Block settings", comment: "")
-    _ = NSLocalizedString("Blog", comment: "translators: title for \"Blog\" page template")
     _ = NSLocalizedString("CHOOSE A FILE", comment: "")
     _ = NSLocalizedString("Choose file", comment: "")
     _ = NSLocalizedString("Choose from device", comment: "")
     _ = NSLocalizedString("Choose image", comment: "")
     _ = NSLocalizedString("Choose image or video", comment: "")
     _ = NSLocalizedString("Choose images", comment: "")
     _ = NSLocalizedString("Choose video", comment: "")
-    _ = NSLocalizedString("City, 10100", comment: "translators: sample content for \"Contact\" page template")
     _ = NSLocalizedString("Content…", comment: "")
     _ = NSLocalizedString("Copied block", comment: "")
     _ = NSLocalizedString("Copy block", comment: "")
@@ -55,7 +47,6 @@ private func dummy() {
     _ = NSLocalizedString("Customize Gradient", comment: "")
     _ = NSLocalizedString("Cut block", comment: "")
     _ = NSLocalizedString("Dismiss", comment: "")
-    _ = NSLocalizedString("Don’t cry because it’s over, smile because it happened.", comment: "translators: sample content for \"About\" page template")
     _ = NSLocalizedString("Double tap to add a block", comment: "")
     _ = NSLocalizedString("Double tap to change the value using slider", comment: "translators: accessibility text (hint for focusing a slider)")
     _ = NSLocalizedString("Double tap to edit this value", comment: "translators: accessibility text")
@@ -70,16 +61,13 @@ private func dummy() {
     _ = NSLocalizedString("Double tap to select", comment: "")
     _ = NSLocalizedString("Double tap to select a video", comment: "")
     _ = NSLocalizedString("Double tap to select an image", comment: "")
-    _ = NSLocalizedString("Double tap to select layout", comment: "")
     _ = NSLocalizedString("Double tap to select the option", comment: "translators: accessibility text (hint for selecting option)")
     _ = NSLocalizedString("Double tap to toggle setting", comment: "translators: accessibility text (hint for switches)")
     _ = NSLocalizedString("Double tap to undo last change", comment: "")
-    _ = NSLocalizedString("Dr. Seuss", comment: "translators: sample content for \"About\" page template")
     _ = NSLocalizedString("Duplicate block", comment: "")
     _ = NSLocalizedString("Edit file", comment: "")
     _ = NSLocalizedString("Edit using web editor", comment: "")
     _ = NSLocalizedString("Edit video", comment: "")
-    _ = NSLocalizedString("Email me: <a href=\"mailto:[email protected]\">[email protected]</a>", comment: "translators: sample content for \"Team\" page template")
     _ = NSLocalizedString("Error", comment: "")
     _ = NSLocalizedString("Excerpt length (words)", comment: "")
     _ = NSLocalizedString("Failed to insert media.\nPlease tap for options.", comment: "")
@@ -88,21 +76,13 @@ private func dummy() {
     _ = NSLocalizedString("File block settings", comment: "")
     _ = NSLocalizedString("File name", comment: "")
     _ = NSLocalizedString("Gallery caption. %s", comment: "translators: accessibility text. %s: gallery caption.")
-    _ = NSLocalizedString("Get in Touch", comment: "translators: sample content for \"About\" page template\ntranslators: sample content for \"Contact\" page template\ntranslators: sample content for \"Portfolio\" page template\ntranslators: sample content for \"Services\" page template\ntranslators: sample content for \"Team\" page template")
     _ = NSLocalizedString("Gradient Type", comment: "")
     _ = NSLocalizedString("Help button", comment: "")
     _ = NSLocalizedString("Help icon", comment: "")
     _ = NSLocalizedString("Here is the panel content!", comment: "")
     _ = NSLocalizedString("Hide keyboard", comment: "")
     _ = NSLocalizedString("Image caption. %s", comment: "translators: accessibility text. %s: image caption.")
     _ = NSLocalizedString("Image Link URL", comment: "")
-    _ = NSLocalizedString("Inspiration", comment: "translators: sample content for \"Services\" page template")
-    _ = NSLocalizedString("It is our choices, Harry, that show what we truly are, far more than our abilities.", comment: "translators: sample content for \"About\" page template")
-    _ = NSLocalizedString("J.K. Rowling", comment: "translators: sample content for \"About\" page template")
-    _ = NSLocalizedString("Juan Pérez", comment: "translators: sample content for \"Team\" page template")
-    _ = NSLocalizedString("Let's build something together!", comment: "translators: sample content for \"Portfolio\" page template")
-    _ = NSLocalizedString("Let's talk 👋 Don't hesitate to reach out with the contact information below, or send a message using the form.", comment: "translators: sample content for \"Contact\" page template")
-    _ = NSLocalizedString("Let’s build something together!", comment: "translators: sample content for \"About\" page template\ntranslators: sample content for \"Services\" page template")
     _ = NSLocalizedString("Link Settings", comment: "")
     _ = NSLocalizedString("Link To", comment: "")
     _ = NSLocalizedString("Move block down", comment: "")
@@ -119,7 +99,6 @@ private func dummy() {
     _ = NSLocalizedString("Move to bottom", comment: "")
     _ = NSLocalizedString("Move to top", comment: "")
     _ = NSLocalizedString("My Document Setting Panel", comment: "")
-    _ = NSLocalizedString("My portfolio showcases various projects created throughout my career. See my contact information below and get in touch.", comment: "translators: sample content for \"Portfolio\" page template")
     _ = NSLocalizedString("My post publish panel", comment: "")
     _ = NSLocalizedString("My post status info", comment: "")
     _ = NSLocalizedString("My pre publish panel", comment: "")
@@ -137,57 +116,38 @@ private func dummy() {
     _ = NSLocalizedString("Page title. Empty", comment: "translators: accessibility text. empty page title.")
     _ = NSLocalizedString("Paste block after", comment: "")
     _ = NSLocalizedString("Paste URL", comment: "")
-    _ = NSLocalizedString("Portfolio", comment: "translators: title for \"Portfolio\" page template")
-    _ = NSLocalizedString("Position or Job Title", comment: "translators: sample content for \"Team\" page template")
     _ = NSLocalizedString("Post title. %s", comment: "translators: accessibility text. %s: text content of the post title.")
     _ = NSLocalizedString("Post title. Empty", comment: "translators: accessibility text. empty post title.")
     _ = NSLocalizedString("Problem displaying block", comment: "")
     _ = NSLocalizedString("Problem opening the video", comment: "")
-    _ = NSLocalizedString("Project Name", comment: "translators: sample content for \"Portfolio\" page template")
     _ = NSLocalizedString("Remove annotations", comment: "")
     _ = NSLocalizedString("Replace Current Block", comment: "")
     _ = NSLocalizedString("Replace image or video", comment: "")
     _ = NSLocalizedString("Replace video", comment: "")
     _ = NSLocalizedString("Reset Block", comment: "")
-    _ = NSLocalizedString("Sally Smith", comment: "translators: sample content for \"Team\" page template")
-    _ = NSLocalizedString("Samuel the Dog", comment: "translators: sample content for \"Team\" page template")
     _ = NSLocalizedString("Scrollable block menu closed.", comment: "")
     _ = NSLocalizedString("Scrollable block menu opened. Select a block.", comment: "")
     _ = NSLocalizedString("Search or type URL", comment: "")
     _ = NSLocalizedString("Select a color", comment: "")
     _ = NSLocalizedString("Select a layout", comment: "")
     _ = NSLocalizedString("Select item", comment: "")
-    _ = NSLocalizedString("Services", comment: "translators: title for \"Services\" page template")
     _ = NSLocalizedString("Show post content", comment: "")
     _ = NSLocalizedString("Show section", comment: "translators: Checkbox toggle label")
     _ = NSLocalizedString("Sidebar title plugin", comment: "")
     _ = NSLocalizedString("Start writing…", comment: "")
-    _ = NSLocalizedString("Strategy", comment: "translators: sample content for \"Services\" page template")
     _ = NSLocalizedString("Success Message", comment: "")
     _ = NSLocalizedString("Take a Photo", comment: "")
     _ = NSLocalizedString("Take a Photo or Video", comment: "")
     _ = NSLocalizedString("Take a Video", comment: "")
     _ = NSLocalizedString("Tap here to show help", comment: "")
     _ = NSLocalizedString("Tap to hide the keyboard", comment: "")
-    _ = NSLocalizedString("Team", comment: "translators: title for \"Team\" page template")
-    _ = NSLocalizedString("Template Preview", comment: "")
-    _ = NSLocalizedString("The way to get started is to quit talking and begin doing.", comment: "translators: sample content for \"About\" page template")
-    _ = NSLocalizedString("This is sample content, included with the template to illustrate its features. Remove or replace it with your own words and media.", comment: "translators: sample content for \"About\" page template")
     _ = NSLocalizedString("Title:", comment: "")
     _ = NSLocalizedString("Translate", comment: "")
-    _ = NSLocalizedString("Try a starter layout", comment: "")
     _ = NSLocalizedString("Ungroup", comment: "")
+    _ = NSLocalizedString("Unsupported", comment: "")
     _ = NSLocalizedString("Updates the title.", comment: "")
-    _ = NSLocalizedString("USA", comment: "translators: sample content for \"Contact\" page template")
     _ = NSLocalizedString("Video caption. %s", comment: "translators: accessibility text. %s: video caption.")
     _ = NSLocalizedString("Video caption. Empty", comment: "translators: accessibility text. Empty video caption.")
-    _ = NSLocalizedString("Visitors will want to know who is on the other side of the page. Use this space to write about yourself, your site, your business, or anything you want. Use the testimonials below to quote others, talking about the same thing – in their own words.", comment: "translators: sample content for \"About\" page template")
-    _ = NSLocalizedString("Walt Disney", comment: "translators: sample content for \"About\" page template")
-    _ = NSLocalizedString("Want to work with us?", comment: "translators: sample content for \"Team\" page template")
     _ = NSLocalizedString("Warning Message", comment: "")
-    _ = NSLocalizedString("We are a small team of talented professionals with a wide range of skills and experience. We love what we do, and we do it with passion. We look forward to working with you.", comment: "translators: sample content for \"Team\" page template")
     _ = NSLocalizedString("We are working hard to add more blocks with each release.", comment: "")
-    _ = NSLocalizedString("We offer a range of services to help you achieve the results you're after. Not sure what you need, or what it costs? We can explain what services are right for you and tell you more about our fees. Get in touch below.", comment: "translators: sample content for \"Services\" page template")
-    _ = NSLocalizedString("Welcome to our new blog", comment: "translators: sample content for \"Blog\" page template")
-    _ = NSLocalizedString("What People Say", comment: "translators: sample content for \"About\" page template")
     _ = NSLocalizedString("WordPress Media Library", comment: "")

bundle/ios/assets/jetpack/extensions/index.json → bundle/ios/assets/jetpack/projects/plugins/jetpack/extensions/index.json

@@ -38,7 +38,7 @@
 		"videopress",
 		"wordads"
 	],
-	"beta": [ "amazon" ],
+	"beta": [ "amazon", "anchor-fm", "conversation", "dialogue" ],
 	"experimental": [ "seo" ],
 	"no-post-editor": [
 		"business-hours",