Merge branch 'master' into dependabot/npm_and_yarn/follow-redirects-1…

….15.6

.github/workflows/html.yml

@@ -1,7 +1,3 @@
-# @Author: Roni Laukkarinen
-# @Date:   2023-02-15 17:39:07
-# @Last Modified by:   Roni Laukkarinen
-# @Last Modified time: 2023-02-15 19:52:58
 name: HTML/a11y
 
 on: push

.github/workflows/js.yml

@@ -1,7 +1,3 @@
-# @Author: Roni Laukkarinen
-# @Date:   2023-02-15 17:39:37
-# @Last Modified by:   Roni Laukkarinen
-# @Last Modified time: 2023-03-03 20:00:35
 name: JS
 
 on: [push, pull_request]
@@ -24,21 +20,14 @@ jobs:
       with:
         node-version: '${{ steps.nvm.outputs.NVMRC }}'
 
-    - name: Install packages
+    - name: Install packages and test JS
       run: |
         rm package.json
         wget https://raw.githubusercontent.com/digitoimistodude/devpackages/master/package.json
         sed -i 's/PROJECTNAME/air-light/g' package.json
-        npm i
-
-    - name: Install air-light related packages
-      run: |
         npm i airbnb-browser-shims@^3.3.0 --save
         npm i moveto@^1.8.2 --save
         npm i reframe.js@^4.0.0 --save
-
-    - name: Run eslint
-      run: |
-        npm ci
-        npm link eslint --ignore-scripts
-        npx eslint .
+        npm i
+        npm i eslint@8.18.0 --save-dev
+        npx eslint -c .eslintrc.js js/src/

.github/workflows/php.yml

@@ -1,7 +1,3 @@
-# @Author: Roni Laukkarinen
-# @Date:   2023-02-15 17:39:37
-# @Last Modified by:   Roni Laukkarinen
-# @Last Modified time: 2024-02-14 17:15:37
 name: PHP
 
 on: [push, pull_request]

.github/workflows/php8.3.yml

@@ -1,7 +1,3 @@
-# @Author: Roni Laukkarinen
-# @Date:   2023-02-15 17:39:37
-# @Last Modified by:   Roni Laukkarinen
-# @Last Modified time: 2024-02-14 17:15:37
 name: PHP 8.3 compatibility
 
 on: [push, pull_request]

.github/workflows/styles.yml

@@ -1,7 +1,3 @@
-# @Author: Roni Laukkarinen
-# @Date:   2023-02-15 17:39:37
-# @Last Modified by:   Roni Laukkarinen
-# @Last Modified time: 2023-03-03 20:01:10
 name: CSS
 
 on: [push, pull_request]
@@ -41,7 +37,6 @@ jobs:
         stylelint-config-recommended-scss@^9.0.0 \
         stylelint-config-standard@^30.0.1 \
         stylelint-config-standard-scss@^7.0.0 \
-        stylelint-file-max-lines@^1.0.0 \
         stylelint-order@^6.0.2 \
         stylelint-rem-over-px@^0.0.4 \
         stylelint-scss@^4.4.0 \
@@ -52,3 +47,30 @@ jobs:
     - name: Run stylelint
       run: |
         npx stylelint . --max-warnings 0 --config .stylelintrc
+
+    - name: Run gulp task devstyles in this project
+      if:
+      run: |
+        wget https://raw.githubusercontent.com/digitoimistodude/air-light/master/package.json
+        npm install
+
+        # Make the command visible
+        echo "Running npx gulp devstyles..."
+        npx gulp devstyles
+
+        # Capture the output
+        output=$(npx gulp devstyles 2>&1)
+
+        # Save it to a temporary file
+        echo "$output" > output.txt
+
+        # Check if the output contains the string "DEPRECATED" or "ERROR" or "WARNING"
+        if grep -q "DEPRECATED" output.txt || grep -q "ERROR" output.txt || grep -q "WARNING" output.txt; then
+          echo "Error found in output, failing build..."
+          exit 1
+        else
+          echo "No errors found in output."
+        fi
+
+        # Remove the temporary file
+        rm output.txt

.nvmrc

@@ -1 +1 @@
-v17.0.0
+v20.17.0

.stylelintrc

@@ -5,7 +5,6 @@
     "@ronilaukkarinen/stylelint-value-no-unknown-custom-properties",
     "@ronilaukkarinen/stylelint-declaration-strict-value",
     "stylelint-order",
-    "stylelint-file-max-lines",
     "stylelint-rem-over-px"
   ],
   "extends": [
@@ -59,7 +58,6 @@
         ]
       }
     ],
-    "plugin/file-max-lines": 200,
     "declaration-property-value-no-unknown": null,
     "scss/at-mixin-argumentless-call-parentheses": null,
     "scss/double-slash-comment-empty-line-before": null,
@@ -172,24 +170,6 @@
         ]
       }
     ],
-    "declaration-property-unit-allowed-list": [
-      {
-        "font-size": [
-          "rem",
-          "em",
-          "px"
-        ],
-        "/^animation/": [
-          "ms",
-          "s"
-        ],
-        "line-height": [
-          "px",
-          "%",
-          ""
-        ]
-      }
-    ],
     "a11y/font-size-is-readable": [
       true,
       {

CHANGELOG.md

@@ -1,6 +1,52 @@
-### 9.4.1rc: 2024-03-13
+### Unreleased
+
+* Demo: Prevent spaces in theme-info link
+* Fix newtheme-popos.sh script location detection
+* Check if pll_translatable is set
+
+### 9.4.5: 2024-10-25
+
+* Add global variable for current block during `render_acf_block`, T-17629
+* Add default styles for 404.scss
+* Make navigation to wrap automatically if there are too many links, T-20918
+* Add default column-gap to header, T-20918
+* Rewrite: allowed_block_types - Change logic for allowed blocks: 'none', 'all', 'all-core-blocks', 'all-acf-blocks', Fixes #226 (thanks @villekujansuu)
+* Allow options + specific blocks for allowed blocks
+* Prepare for air-blocks-buildtool
+* Remove stylelint-file-max-lines, T-20765
+* Add more breakpoints like $container-desktop, T-20758
+* Fix burger navigation sometimes not being centered vertically, T-20918
+* Change to new dev.docs.dude.fi way of naming conventions, combine font partials under variables to one _typography.scss file, T-20761
+* Move font-face include under _typography.scss, T-20761
+* Change typography variables to headings, T-20761
+
+### 9.4.4: 2024-09-13
+
+* Add unit tests for gulp devstyles
+* Fix nesting deprecation, fix build
+* Remove from sanitize scss: `overflow-wrap: break-word;`
+* Bump tested WordPress version to 6.6.2
+
+### 9.4.3: 2024-09-06
+
+* Fix navigation rules leaking to other navs, Fixes T-1644
+* Remove obsolete fileheader information from all files for consistency, Fixes T-13958
+* Fix phpcs errors
+* Exclude vendor dir in gulp-phpcs
+* Bump tested WordPress version to 6.6.1
+* Upgrade to node v20.17.0
+
+### 9.4.2: 2024-06-13
+
+* Fix typos #216 (thanks @szepeviktor!)
+* Add is-external-link helper class to external links
+* Bump tested WordPress version to 6.5.4
+
+### 9.4.1: 2024-04-18
 
 * Clarify sticky nav functionality presented in 7.9.1, Fixes #213 (thanks @semidivine!)
+* Release version 1.1.4 of the `newtheme` starting script: Use phpcs.xml from devpackages 2.5.6 (2024-04-18)
+* Bump tested WordPress version to 6.5.2
 
 ### 9.4.0: 2024-02-26
 
@@ -37,7 +83,7 @@
 * Merge pull request #211 from digitoimistodude/dependabot/npm_and_yarn/axios-and-browser-sync--removed
 * Remove deprecated number-leading-zero rule
 * Add reset for img
-* Fix a regression with anchors not working when target not found, use in all hashs not just with js-trigger class
+* Fix a regression with anchors not working when target not found, use in all hashes not just with js-trigger class
 * Bump WordPress to 6.4.2
 
 ### 9.3.5: 2023-09-12
@@ -182,7 +228,7 @@
 
 * Fix incorrect textdomain in external-link JS module
 * Simplify CPT and taxonomy registration by using the class name also as a slug (Merge pull request #158 from digitoimistodude/cpt-tax-register-simplification, kudos to @timiwahalahti)
-* Remove what-input depenency, use :focus and :focus-within instead, remove forced focus outline-color
+* Remove what-input dependency, use :focus and :focus-within instead, remove forced focus outline-color
 * Bump tested up WordPress version to 6.1
 
 ### 9.2.1: 2022-10-28
@@ -231,10 +277,10 @@
 * Fix acf icons visibility issue
 * Fix link colors in sidebar
 * Add default font-family for form select items
-* Remove opionated label font-weight
-* Remove opionated nav default dropshadow from sub menus
-* Remove opionated nav default border-color from sub menus
-* Remove opionated bubble tip from sub menus
+* Remove opinionated label font-weight
+* Remove opinionated nav default dropshadow from sub menus
+* Remove opinionated nav default border-color from sub menus
+* Remove opinionated bubble tip from sub menus
 
 ### 9.1.4: 2022-09-07
 
@@ -503,7 +549,7 @@
 
 * Open submenus on the left if the nav items go over the viewport, Fixes #5
 * Added $is_preview and $post_id to be always handed over to block template
-* Create empty inc/functions directory for custom funtions
+* Create empty inc/functions directory for custom functions
 
 ### 8.2.4: 2021-12-03
 
@@ -578,7 +624,7 @@
 
 * Devpackages 2.3.7: Change back from @ronilaukkarinen/stylelint-declaration-strict-value@1.7.13 to official stylelint-declaration-strict-value@1.8.0
 * Devpackages 2.3.7: Fix rule for declaration-strict-value
-* Devpackages 2.3.7: Upgade to webpack 5
+* Devpackages 2.3.7: Upgrade to webpack 5
 * Devpackages 2.3.7: Update packages
 
 ### 8.1.1: 2021-11-05
@@ -1032,7 +1078,7 @@ This release includes only form style and accessibility improvements.
 
 * Add Laragon support #92 (thank you @divn!)
 * New theme script dependencies partial: Gulp styles to later stage
-* Release version 1.0.5 of newtheme starting scripts
+* Release version 1.0.5 of newtheme starting scripts 
 
 ### 7.1.3: 2021-04-15
 

README.md

@@ -249,9 +249,9 @@ Starting from v2.6.0 WooCommerce support comes with [Air helper](https://github.
 
 ### Requirements
 
-* PHP >= 7.4
+* PHP >= 8.3
 * Requires at least: WordPress 4.7.1
-* Tested up to WordPress 6.4.3
+* Tested up to WordPress 6.6.2
 
 ### Recommendations for development
 

bin/newtheme-popos.sh

@@ -1,9 +1,5 @@
 #!/bin/bash
 # WordPress theme starting bash script for Air-light, ported for Pop!_OS, might work on Ubuntu or even Debian, or other forks.
-# @Author: Roni Laukkarinen
-# @Date:   2021-04-22 08:06:02
-# @Last Modified by:   Roni Äikäs
-# @Last Modified time: 2023-09-29 22:15:53
 
 # Script specific vars
 SCRIPT_LABEL='for Pop!_OS'
@@ -13,15 +9,21 @@ SCRIPT_VERSION='1.0.0 (2023-09-29)'
 CURRENTFILE=`basename $0`
 
 # Determine scripts location to get imports right
-if [ "$CURRENTFILE" = "newtheme.sh" ]; then
+if [ "$CURRENTFILE" = "newtheme-popos.sh" ]; then
   SCRIPTS_LOCATION="$( pwd )"
   source ${SCRIPTS_LOCATION}/tasks/variables.sh
   source ${SCRIPTS_LOCATION}/tasks/header.sh
   exit
 else
   DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
   ORIGINAL_FILE=$( readlink $DIR/$CURRENTFILE )
-  SCRIPTS_LOCATION=$( dirname $ORIGINAL_FILE )
+  # Check if ORIGINAL_FILE is empty before calling dirname
+  if [ -n "$ORIGINAL_FILE" ]; then
+    SCRIPTS_LOCATION=$( dirname "$ORIGINAL_FILE" )
+  else
+    echo "Error: Could not determine original file location"
+    exit 1
+  fi
 fi
 
 # Final note about server requirements

bin/newtheme.sh

@@ -1,13 +1,9 @@
 #!/bin/bash
 # WordPress theme starting bash script for Air-light
-# @Author: Roni Laukkarinen
-# @Date:   2021-04-22 08:06:02
-# @Last Modified by:   Roni Laukkarinen
-# @Last Modified time: 2021-11-25 13:22:53
 
 # Script specific vars
 SCRIPT_LABEL='for macOS'
-SCRIPT_VERSION='1.1.3 (2023-09-12)'
+SCRIPT_VERSION='1.1.4 (2024-04-18)'
 
 # Vars needed for this file to function globally
 CURRENTFILE=`basename $0`

bin/tasks/additions.sh

@@ -1,17 +1,13 @@
 #!/bin/bash
-# @Author: Roni Laukkarinen
-# @Date:   2021-05-21 14:40:29
-# @Last Modified by:   Elias Kautto
-# @Last Modified time: 2022-05-27 10:37:34
 echo "${YELLOW}Adding media library folder...${TXTRESET}"
 mkdir -p ${PROJECT_PATH}/media
 echo "" > ${PROJECT_PATH}/media/index.php
 chmod 777 ${PROJECT_PATH}/media
 
 echo "${YELLOW}Generating default README.md...${TXTRESET}"
 
-NEWEST_AIR_VERSION="9.4.0"
-NEWEST_WORDPRESS_VERSION="6.4.3"
+NEWEST_AIR_VERSION="9.4.5"
+NEWEST_WORDPRESS_VERSION="6.6.2"
 NEWEST_PHP_VERSION="8.3"
 CURRENT_DATE=$(LC_TIME=en_US date '+%d %b %Y' |tr ' ' '_');
 echo "# ${PROJECT_NAME}
@@ -41,7 +37,7 @@ This project is hand made for customer by Dude.
 
 ## Getting started
 
-Your local server should be up and running. If you need help, ask your superviser or refer to **[Internal Development Docs](https://app.gitbook.com/o/PedExJWZmbCiZe4gDwKC/s/VVikkYgIZ9miBzwYDCYh/)** → **[Joining the project later on](https://app.gitbook.com/o/PedExJWZmbCiZe4gDwKC/s/VVikkYgIZ9miBzwYDCYh/project-stages/joining-the-project-later-on)**.
+Your local server should be up and running. If you need help, ask your supervisor or refer to **[Internal Development Docs](https://app.gitbook.com/o/PedExJWZmbCiZe4gDwKC/s/VVikkYgIZ9miBzwYDCYh/)** → **[Joining the project later on](https://app.gitbook.com/o/PedExJWZmbCiZe4gDwKC/s/VVikkYgIZ9miBzwYDCYh/project-stages/joining-the-project-later-on)**.
 
 ### Installation
 

bin/tasks/dependencies.sh

@@ -1,8 +1,4 @@
 #!/bin/bash
-# @Author: Roni Laukkarinen
-# @Date:   2021-04-22 08:06:02
-# @Last Modified by:   Roni Laukkarinen
-# @Last Modified time: 2021-11-25 13:22:15
 echo "${YELLOW}Getting devpackages${TXTRESET}"
 cd ${PROJECT_PATH}
 git clone https://github.com/digitoimistodude/devpackages

bin/tasks/project.sh

@@ -17,3 +17,4 @@ sed -e "s/\THEMENAME/${THEME_NAME}/" -e "s/\THEMENAME/${THEME_NAME}/" -e "s/\THE
 rm ${PROJECT_PATH}/gulp/config.js
 sed -e "s/\PROJECTNAME/${PROJECT_NAME}/" -e "s/\PROJECTNAME/${PROJECT_NAME}/" -e "s/\PROJECTNAME/${PROJECT_NAME}/" ${PROJECT_PATH}/gulp/config2.js > ${PROJECT_PATH}/gulp/config.js
 rm ${PROJECT_PATH}/gulp/config2.js
+sed -e "s/\PROJECTNAME/${PROJECT_NAME}/" ${PROJECT_PATH}/devpackages/phpcs.xml > ${PROJECT_PATH}/phpcs.xml

bin/tasks/replaces-wsl.sh

@@ -1,5 +1,5 @@
 echo "${YELLOW}Generating theme files with theme name and textdomain called ${THEME_NAME}${TXTRESET}"
-# THE magical sed command by rolle (goes through every single file in theme folder and searchs and replaces every air instance with THEME_NAME):
+# THE magical sed command by rolle (goes through every single file in theme folder and searches and replaces every air instance with THEME_NAME):
 # WSL/Ubuntu version of sed binary, different format than on macOS
 # Note: find + -exec sed doesn't work in WSL for some weird reason so we have to use "s;string;replacewith;" format
 for i in `grep -rl air-light * --exclude-dir=node_modules 2> /dev/null`; do LC_ALL=C sed -i -e "s;air-light;${THEME_NAME};" $i; done

bin/tasks/replaces.sh

@@ -1,10 +1,6 @@
 #!/bin/bash
-# @Author: Roni Laukkarinen
-# @Date:   2021-05-18 10:29:32
-# @Last Modified by:   Roni Laukkarinen
-# @Last Modified time: 2021-11-25 12:56:04
 echo "${YELLOW}Generating theme files with theme name and textdomain called ${THEME_NAME}${TXTRESET}"
-# THE magical sed command by rolle (goes through every single file in theme folder and searchs and replaces every air instance with THEME_NAME):
+# THE magical sed command by rolle (goes through every single file in theme folder and searches and replaces every air instance with THEME_NAME):
 for i in `grep -rl air-light * --exclude-dir=node_modules 2> /dev/null`; do LC_ALL=C sed -i '' -e "s;air-light;${THEME_NAME};" $i $i; done
 for i in `grep -rl Air-light * --exclude-dir=node_modules 2> /dev/null`; do LC_ALL=C sed -i '' -e "s;Air-light;${THEME_NAME};" $i $i; done
 for i in `grep -rl air * --exclude-dir=node_modules 2> /dev/null`; do LC_ALL=C sed -i '' -e "s;air-light;${THEME_NAME};" $i $i; done