Merge pull request #1023 from WebDevStudios/release/WDSUS-2-4.0-Theme…

…-Revamp

Release/WDSUS-2 V4.0

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 # Closes
 
 <!--
-Please do not leave this blank, use this format to link issue numbers:
+REQUIRED. Please do not leave this blank, use this format to link issue numbers:
 [#WDS-123](https://webdevstudios.atlassian.net/browse/TICKET-NUMBER)
 -->
 
@@ -22,14 +22,14 @@ Please do not leave this blank, use this format to link issue numbers:
 ## Link to test
 
 <!--
-Please do not leave this blank, use this format to link to testing environment:
+REQUIRED. Please do not leave this blank, use this format to link to testing environment:
 [Develop](https://wds.wdslab.com/)
 -->
 
 ## Description
 
 <!--
-Please do not leave this blank
+REQUIRED. Please do not leave this blank
 This PR [adds/removes/fixes/replaces] the [feature/bug/etc].
 -->
 
@@ -42,7 +42,10 @@ https://docs.github.com/en/free-pro-team@latest/github/managing-your-work-on-git
 
 ## Mobile & Desktop Screenshots/Recordings
 
-<!-- Visual changes require screenshots -->
+<!--
+REQUIRED. Please do not leave this blank
+For visual alterations, provide screenshots or recordings For both desktop and mobile. You can utilize Loom for this purpose: https://www.loom.com/screen-recorder
+-->
 
 
 ## Added tests?

.github/dependabot.yml

@@ -3,4 +3,4 @@ updates:
     - package-ecosystem: 'npm'
       directory: '/'
       schedule:
-          interval: 'daily'
+          interval: 'weekly'

.github/workflows/assertions.yml

@@ -12,7 +12,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [16.x]
+                node-version: [18.x]
                 php-versions: ['8.0']
 
         steps:
@@ -32,8 +32,8 @@ jobs:
               with:
                   node-version: ${{ matrix.node-version }}
 
-            - name: Use NPM 8
-              run: npm i -g npm@8
+            - name: Use NPM 9
+              run: npm i -g npm@9
 
             - name: Cache Node dependencies
               uses: actions/cache@v2

.nvmrc

@@ -1 +1 @@
-16
+18

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
+	"phpsab.standard": "WordPress",
 	"phpsab.executablePathCS": "./vendor/bin/phpcs",
 	"phpsab.executablePathCBF": "./vendor/bin/phpcbf",
 	"editor.formatOnSave": true,
@@ -7,7 +8,7 @@
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
 	},
 	"intelephense.format.enable": false,
-	"intelephense.stubs": [ "acf", "wordpress" ],
+	"intelephense.stubs": [ "acf", "wordpress", "standard", "Core", "pcre" ],
 
 	"workbench.colorCustomizations": {
 		"activityBar.background": "#3F4040",

404.php

@@ -13,7 +13,7 @@
 
 	<main id="main" class="<?php echo esc_attr( main_classes( [] ) ); ?>">
 
-		<section class="error-404 not-found">
+		<section class="error-404 not-found is-layout-constrained">
 			<header class="page-header">
 				<h1 class="page-title"><?php esc_html_e( "Sorry, this page doesn't exist.", 'wd_s' ); ?></h1>
 			</header><!-- .page-header -->

CHANGELOG.md

@@ -2,9 +2,24 @@
 
 All notable changes to this project will be documented in this file. Dates are displayed in UTC.
 
-## Details
+Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [v3.5](https://github.com/WebDevStudios/wd_s/compare/3.0...v3.5)
+## [v4.0.0](https://github.com/WebDevStudios/wd_s/compare/v3.5...v4.0.0)
+
+- Add scaffolding code for the acf block generated using CLI [`#1094`](https://github.com/WebDevStudios/wd_s/pull/1094)
+- Feature/site editor index [`#1097`](https://github.com/WebDevStudios/wd_s/pull/1097)
+- Feature/WDSUS-45 WDS Cleanup [`#1072`](https://github.com/WebDevStudios/wd_s/pull/1072)
+- Feature/WDSUS-43 Folder Restructure [`#1062`](https://github.com/WebDevStudios/wd_s/pull/1062)
+- Feature/wdsus 7 implement wp cli [`#1006`](https://github.com/WebDevStudios/wd_s/pull/1006)
+- WDSUS-19: adds WDS Blocks category [`#1022`](https://github.com/WebDevStudios/wd_s/pull/1022)
+- #958 changed dirname call to WP method [`#1019`](https://github.com/WebDevStudios/wd_s/pull/1019)
+- Update CHANGELOG.md [`#1015`](https://github.com/WebDevStudios/wd_s/pull/1015)
+- WDSUS-24 - Update Changelog [`#1014`](https://github.com/WebDevStudios/wd_s/pull/1014)
+- WDSUS-45 - Update lock files [`77435d5`](https://github.com/WebDevStudios/wd_s/commit/77435d5e87135c14d581a2b65dbadd02deda325a)
+- WDSUS-2 - Update packages [`82cde06`](https://github.com/WebDevStudios/wd_s/commit/82cde06325363bd80a79bf63f545d16ea9f20a2a)
+- WDSUS-2 Update package lock file [`c1406ab`](https://github.com/WebDevStudios/wd_s/commit/c1406abac10765eb667e81e12352947d7697d8af)
+
+## [v3.5](https://github.com/WebDevStudios/wd_s/compare/3.0...v3.5)
 
 > 20 May 2023
 
@@ -178,7 +193,7 @@ All notable changes to this project will be documented in this file. Dates are d
 - Update text domains and package names [`ddb6fb8`](https://github.com/WebDevStudios/wd_s/commit/ddb6fb8e141edb6b24faf52693eccd5d3b7ced11)
 - Fix spacing issues [`0c601aa`](https://github.com/WebDevStudios/wd_s/commit/0c601aa5176bac0d0edcf84a28cd9d7dd5dd8d2c)
 
-#### [2.1](https://github.com/WebDevStudios/wd_s/compare/v2.0.1...2.1)
+## [2.1](https://github.com/WebDevStudios/wd_s/compare/v2.0.1...2.1)
 
 > 20 April 2021
 
@@ -216,7 +231,7 @@ All notable changes to this project will be documented in this file. Dates are d
 - fix merge conflict [`0abaf96`](https://github.com/WebDevStudios/wd_s/commit/0abaf96a60004bb97652a0185552931de45c61bf)
 - Adds browsersync and scripts [`ac9af1b`](https://github.com/WebDevStudios/wd_s/commit/ac9af1bbb386e5042ee6bab4c369f5d127a1ecca)
 
-#### [v2.0.1](https://github.com/WebDevStudios/wd_s/compare/v2.0.0...v2.0.1)
+## [v2.0.1](https://github.com/WebDevStudios/wd_s/compare/v2.0.0...v2.0.1)
 
 > 10 November 2020
 
@@ -702,7 +717,7 @@ All notable changes to this project will be documented in this file. Dates are d
 - Merges in ACF + Gutenberg update [`43a56d8`](https://github.com/WebDevStudios/wd_s/commit/43a56d8eaf261903cd2b2d74d4d4c0b7421035a9)
 - packages & dependencies bump [`7d5f7b4`](https://github.com/WebDevStudios/wd_s/commit/7d5f7b4512fe76b7caf138266e6eaef7616a8327)
 
-#### 1.2
+## 1.2
 
 > 28 December 2012
 

README.md

@@ -4,7 +4,7 @@
 
 A starter theme from WebDevStudios. <https://wdunderscores.com>
 
-[![WebDevStudios. Your Success is Our Mission.](https://webdevstudios.com/wp-content/uploads/2018/04/wds-github-banner.png)](https://webdevstudios.com/contact/)
+[![WebDevStudios. Your Success is Our Mission.](https://camo.githubusercontent.com/42f2d2ee1fd163a35dfde75884c89f308d0ae014e313bd3050caa1b98bfde9c6/68747470733a2f2f77656264657673747564696f732e636f6d2f77702d636f6e74656e742f75706c6f6164732f323031382f30342f7764732d6769746875622d62616e6e65722e706e67)](https://webdevstudios.com/contact/)
 
 ## Table of Contents <!-- omit in toc -->
 
@@ -19,22 +19,20 @@ A starter theme from WebDevStudios. <https://wdunderscores.com>
 
 ## Introduction
 
-Hi. I'm a starter theme called `wd_s`, or `wdunderscores`. I'm a theme meant for hacking so don't use me as a Parent Theme. Instead, try turning me into the next, most awesome, WordPress theme out there. That's what I'm here for!
+Hello there! I am a versatile starter theme known as `wd_s`, or `wdunderscores`. My foundation is built primarily on PHP templates, but I offer the flexibility to incorporate custom templates through the Site Editor. It's worth noting that I'm designed for customization, so it's best not to use me as a Parent Theme. Instead, harness my potential to transform me into the most amazing WordPress theme you can envision – that's what I'm here for!
 
-I feature some of the web's most proven technologies like: [Tailwind](https://www.tailwindcss.com), [npm](https://www.npmjs.com/), [webpack](https://webpack.js.org/), [Sass](http://sass-lang.com/), and [PostCSS](https://github.com/postcss/postcss). To help you write clean code (that meets [WordPress standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/)), we tap into [@wordpress/scripts](https://developer.wordpress.org/block-editor/packages/packages-scripts/) for linting CSS and JavaScript. Did I mention that I'm also accessible? Yup. I pass both WCAG 2.1AA and Section 508 standards out of the box.
+I come equipped with a host of robust web technologies, including [Tailwind](https://www.tailwindcss.com), [npm](https://www.npmjs.com/), [webpack](https://webpack.js.org/), [Sass](http://sass-lang.com/), and [PostCSS](https://github.com/postcss/postcss). To ensure your code aligns with [WordPress standards](https://make.wordpress.org/core/handbook/best-practices/coding-standards/) and stays clean, I leverage [@wordpress/scripts](https://developer.wordpress.org/block-editor/packages/packages-scripts/) for CSS and JavaScript linting. What's more, I take accessibility seriously and proudly comply with both WCAG 2.1AA and Section 508 standards right from the start.
 
-I also support [Selective Refresh](https://make.wordpress.org/core/2016/03/22/implementing-selective-refresh-support-for-widgets/) and [Live Preview](https://codex.wordpress.org/Theme_Customization_API#Part_3:_Configure_Live_Preview_.28Optional.29) in the Theme Customizer.
-
-Not to mention, I use [Browsersync](https://www.browsersync.io/) so you can watch your project update in real-time while you work.
+I also come with the Site Editor activated, providing you with even more versatility and ease in crafting your WordPress theme. Whether you're customizing templates or utilizing the Site Editor, I'm here to support your creative journey. And remember, I do require at least PHP 8.0 to be activated to unlock my full potential.
 
 ## Getting Started
 
 ### Prerequisites
 
 Because I compile and bundle assets via NPM scripts, basic knowledge of the command line and the following dependencies are required:
 
-- [Node](https://nodejs.org) (v16+)
-- [NPM](https://npmjs.com) (v8+)
+- [Node](https://nodejs.org) (v18+)
+- [NPM](https://npmjs.com) (v9+)
 - [Composer](https://getcomposer.org/)
 
 ### Quick Start
@@ -75,10 +73,10 @@ cd /wp-content/themes/your-theme
 
 Install theme dependencies and trigger an initial build.
 
->Note: You will need to have Composer and NPM 8 installed first.
+>Note: You will need to have Composer 2 and NPM 9 installed first.
 
 ```bash
-npm i --legacy-peer-deps
+npm i && composer i
 ```
 
 ### Development
@@ -94,6 +92,20 @@ Command | Action
 `npm run format` | Fix all CSS, JS, MD, and PHP formatting errors automatically
 `npm run report` | Gives detailed information on coding standards violations in PHP code
 
+### Building a block with wpcli
+
+In order to build a block, run the following wpcli script.
+
+Note: If you're using Local, you can open the shell from within Local to do this. `Sitename -> Open site shell`.
+
+```bash
+wp wds create_portable_block myblock --title="This is myblock" --desc="This block is used for wds." --keyword="myblock" --icon="table-row-before" --namespace="wds"
+```
+
+This will scaffold out a block inside of the `blocks` folder in the theme. Replace `myblock` with the name of your block and update the other items `title`, `desc`, `keyword`, `icon`, `namespace` with the appropriate information.
+
+Note: If you don't see your new block available under the block listing in the editor after following the above steps, try changing the namespacing in your block's `block.json` to the following format `your-namespace/blockname` and check again.
+
 ## Contributing and Support
 
 Your contributions and [support tickets](https://github.com/WebDevStudios/wd_s/issues) are welcome. Please see our [contributing guidelines](https://github.com/WebDevStudios/wd_s/blob/main/CONTRIBUTING.md) before submitting a pull request.

archive.php

@@ -16,7 +16,7 @@
 
 	<?php if ( have_posts() ) : ?>
 
-	<header class="page-header">
+	<header class="page-header is-layout-constrained">
 		<?php
 				the_archive_title( '<h1 class="page-title">', '</h1>' );
 				the_archive_description( '<div class="archive-description">', '</div>' );