Merge branch 'main' into feature/update-tribe-libs-3.4.8

# Conflicts:
#	changelog.md
#	composer.lock

.github/workflows/ci.yml

@@ -79,9 +79,11 @@ jobs:
         working-directory: dev/docker
 
       - name: Setup node
-        uses: actions/setup-node@v1
+        id: nvm
+        run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)
+      - uses: actions/setup-node@v2
         with:
-          node-version: '14.15.1'
+          node-version: ${{ steps.nvm.outputs.NODE_VERSION }}
 
       - name: Install gulp-cli
         run: npm install gulp-cli -g

.github/workflows/deploy-dev.yml

@@ -45,9 +45,11 @@ jobs:
 
       # Setup node version
       - name: Setup node version
-        uses: actions/setup-node@v1
+        id: nvm
+        run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)
+      - uses: actions/setup-node@v2
         with:
-          node-version: '14.15.1'
+          node-version: ${{ steps.nvm.outputs.NODE_VERSION }}
 
       # Cache node_modules TODO
 

.github/workflows/deploy-prod.yml

@@ -48,9 +48,11 @@ jobs:
 
       # Setup node version
       - name: Setup node version
-        uses: actions/setup-node@v1
+        id: nvm
+        run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)
+      - uses: actions/setup-node@v2
         with:
-          node-version: '14.15.1'
+          node-version: ${{ steps.nvm.outputs.NODE_VERSION }}
 
       # Cache node_modules TODO
 

.github/workflows/deploy-stage.yml

@@ -48,9 +48,11 @@ jobs:
 
       # Setup node version
       - name: Setup node version
-        uses: actions/setup-node@v1
+        id: nvm
+        run: echo ::set-output name=NODE_VERSION::$(cat .nvmrc)
+      - uses: actions/setup-node@v2
         with:
-          node-version: '14.15.1'
+          node-version: ${{ steps.nvm.outputs.NODE_VERSION }}
 
       # Cache node_modules TODO
 

.github/workflows/eslint.yml

@@ -1,9 +1,10 @@
 name: 'ESLint'
 on:
+  push:
+    branches:
+      - main
   pull_request:
-    paths:
-      - 'wp-content/plugins/core/**.js'
-      - 'wp-content/themes/core/**.js'
+
 jobs:
   eslint:
     runs-on: ubuntu-latest

.gitignore

@@ -140,3 +140,7 @@ dev/tests/tests/_support/_generated/
 phpcs.xml
 .phpcs-cache
 
+
+
+# Added by so cli 
+*.local.php

.lefthook/prepare-commit-msg/prefix_with_jira_ticket

@@ -7,8 +7,11 @@
 FILE=$1
 MESSAGE=$(cat $FILE)
 IFS=/ read -a parts <<< $(git rev-parse --abbrev-ref HEAD)
+
+IS_SPECIAL_BRANCH=$(echo ${parts[0]} | grep -i 'release/\|sprint/')
+[[ ! -z "$IS_SPECIAL_BRANCH" ]] || exit 0
+
 TICKET=[$(echo ${parts[1]} | grep -Eo '(\w+[-])?[0-9]+')]
-if [[ $TICKET == "[]" || "$MESSAGE" == "$TICKET"* ]]; then
-  exit 0
-fi
+[[ $TICKET == "[]" || "$MESSAGE" == "$TICKET"* ]] || exit 0
+
 echo "$TICKET $MESSAGE" > $FILE

.nvmrc

@@ -1 +1 @@
-14.15.1
+16.13.1

README.md

@@ -8,11 +8,11 @@ SquareOne is a development framework lovingly maintained by Modern Tribe used fo
 ## Documentation
 
 * [Overview](/docs/README.md)
+    * [Getting Started](/docs/getting-started)
     * [Basics](/docs/basics)
     * [Concepts](/docs/concepts)
     * [Tooling ](/docs/tooling)
     * [Tests](/docs/tests)
-    * [Getting Started](/docs/getting-started)
 
 ## Changelog
 

babel.config.js

@@ -32,6 +32,7 @@ module.exports = {
 		'@babel/plugin-proposal-object-rest-spread',
 		'@babel/plugin-syntax-dynamic-import',
 		'@babel/plugin-transform-regenerator',
+		'@babel/plugin-transform-runtime',
 		'@babel/plugin-proposal-class-properties',
 		'@babel/plugin-transform-object-assign',
 	],

changelog.md

@@ -2,12 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2021.12
+* Fixed: docker compose (v2) support: `WARN[0000] network proxy: network.external.name is deprecated in favor of network.name`
+* Added: Section Nav component & block.
+* Added: generic navigation component.
+* Updated: Node & NPM to latest LTS (v16.13.1), updated node package versions where supported.
+* Fixed: A posible PHP fatal when a anv menu is cached, but empty and the cache layer returns an unexpected boolean instead of an empty string.
+* Fixed: Several minor deprecation warnings in the webpack config.
+* Fixed: prevented preloading of current document when a dependency alias is enqueued in the footer
+* Added: support to preload dependencies of aliases
+
 ## 2021.11
 * Removed: monolog. This dependency will be managed by tribe-libs.
 * Updated: tribe libs to 3.4.8.
+* Fixed: Lefthook - Don't prefix commits for sprint or release branches
 * Updated: docker image to 74-3.0, composer v2 support (requires `so` v5.3.0+)
 * Added: Entrypoint for component scripts to run in the block editor.
 * Added: Slider component JS behaviors in the block editor.
+* Added: check that `theme_location` parameter of `wp_nav_menu()` is populated before adding classes
 
 ## 2021.10
 * Fixed: Misc small repairs to common blocks per QA on other projects.

composer.json

@@ -34,6 +34,10 @@
       "type": "vcs",
       "url": "[email protected]:moderntribe/ACF-Image-Select.git"
     },
+    {
+      "type": "vcs",
+      "url": "[email protected]:msawicki/acf-menu-chooser.git"
+    },
     {
       "type": "vcs",
       "url": "[email protected]:moderntribe/tribe-acf-post-list-field.git"
@@ -88,6 +92,7 @@
     "johnpbloch/wordpress-core": "5.7.3",
     "johnpbloch/wordpress-core-installer": "2.0.*",
     "mailgun/mailgun-php": "^2.8",
+    "msawicki/acf-menu-chooser": "dev-master",
     "moderntribe/acf-image-select": "dev-master",
     "moderntribe/tribe-acf-post-list-field": "^2.0",
     "moderntribe/tribe-libs": "^3.4",