Merge pull request #1627 from Automattic/alpha

Release Dec 15

.circleci/config.yml

@@ -10,7 +10,7 @@ commands:
 jobs:
   build:
     docker:
-      - image: circleci/node:12
+      - image: cimg/node:16.11.1
     steps:
       - checkout_code
       - run:
@@ -24,7 +24,7 @@ jobs:
   # Linting
   lint:
     docker:
-      - image: circleci/node:12
+      - image: cimg/node:16.11.1
     steps:
       - checkout_code
       - run:
@@ -34,7 +34,7 @@ jobs:
   # Release job
   release:
     docker:
-      - image: circleci/node:12
+      - image: cimg/node:16.11.1
     steps:
       - checkout_code
       - run:
@@ -48,7 +48,7 @@ jobs:
   # Reset alpha branch after a release and publish child themes' releases
   post_release:
     docker:
-      - image: circleci/node:12
+      - image: cimg/node:16.11.1
     steps:
       - checkout_code
       - run:

.eslintrc.js

@@ -16,14 +16,12 @@ module.exports = {
 		jQuery: 'readonly',
 		_: 'readonly',
 	},
-  ignorePatterns: [
-    'newspack-*/js/dist'
-  ],
+	ignorePatterns: [ 'newspack-*/js/dist', 'scripts' ],
 	rules: {
-		'camelcase': 'off',
+		camelcase: 'off',
 		// Disallow importing or requiring packages that are not listed in package.json
 		// This prevents us from depending on transitive dependencies, which could break in unexpected ways.
-		'import/no-extraneous-dependencies': ['error'],
+		'import/no-extraneous-dependencies': [ 'error' ],
 		// There's a conflict with prettier here:
 		'react/jsx-curly-spacing': 'off',
 		// Skip prop types validation for now

.github/dependabot.yml

@@ -0,0 +1,27 @@
+# Dependabot config.
+# Keep NPM and Composer packages up-to-date.
+# Let's start out with weekly updates and then drop back to less frequent intervals after everything is up-to-date.
+
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: 'npm'
+    # Look for `package.json` and `lock` files in the `root` directory
+    directory: '/'
+    # Check the npm registry for updates every day (weekdays)
+    schedule:
+      interval: 'weekly'
+    # Add reviewers
+    reviewers:
+      - 'Automattic/newspack-product'
+
+  # Enable version updates for Composer
+  - package-ecosystem: 'composer'
+    # Look for a `composer.lock` in the `root` directory
+    directory: '/'
+    # Check for updates every day (weekdays)
+    schedule:
+      interval: 'weekly'
+    # Add reviewers
+    reviewers:
+      - 'Automattic/newspack-product'

.gitignore

@@ -11,9 +11,9 @@ project.properties
 *.sublime-workspace
 .sublimelinterrc
 
-# Grunt
+# NPM
 /node_modules/
-none
+.cache
 
 # Sass
 .sass-cache/

.stylelintrc

@@ -1,5 +1,5 @@
 {
-  "extends": ["stylelint-config-wordpress/scss", "stylelint-prettier/recommended"],
+  "extends": ["@wordpress/stylelint-config/scss", "stylelint-prettier/recommended"],
   "rules": {
     "rule-empty-line-before": null,
     "at-rule-empty-line-before": null,

CHANGELOG.md

@@ -1,3 +1,16 @@
+## [1.55.2-alpha.1](https://github.com/Automattic/newspack-theme/compare/v1.55.1...v1.55.2-alpha.1) (2021-12-15)
+
+
+### Bug Fixes
+
+* correct issue with Mobile CTA gap ([#1594](https://github.com/Automattic/newspack-theme/issues/1594)) ([0e1bb70](https://github.com/Automattic/newspack-theme/commit/0e1bb703a47cfe8787c79c38bc6cb3b5e58be2c4))
+
+
+### Performance Improvements
+
+* disable lazy load for featured images ([#1616](https://github.com/Automattic/newspack-theme/issues/1616)) ([d1af327](https://github.com/Automattic/newspack-theme/commit/d1af3271d899a5a7183c65c7bd54a3b4060b74eb))
+* load amp-plus.js async ([#1620](https://github.com/Automattic/newspack-theme/issues/1620)) ([0ae63ef](https://github.com/Automattic/newspack-theme/commit/0ae63ef0cf7f8f1c91e10ed0f2aba2c23f5ad9e6))
+
 ## [1.55.1](https://github.com/Automattic/newspack-theme/compare/v1.55.0...v1.55.1) (2021-12-14)
 
 

composer.json

@@ -8,14 +8,14 @@
     "issues": "https://github.com/Automattic/newspack-theme/issues"
   },
   "require-dev": {
-    "composer/installers": "~1.7",
+    "composer/installers": "~2.0",
     "automattic/vipwpcs": "^2.0",
     "wp-coding-standards/wpcs": "^2.1",
     "phpcompatibility/phpcompatibility-wp": "^2.1",
     "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
     "brainmaestro/composer-git-hooks": "^2.8",
     "wptrt/wpthemereview": "*",
-    "phpstan/phpstan-shim": "^0.11.12",
+    "phpstan/phpstan-shim": "^0.12.0",
     "szepeviktor/phpstan-wordpress": "^0.2.0",
     "xwp/wp-dev-lib": "^1.5"
   },