Merge branch 'develop' into remove-old-layout-picker

.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/']}] 
+	}
 };

RELEASE-NOTES.txt

@@ -15,6 +15,7 @@ Unreleased
 * [***] 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