Merge branch 'develop' into feature/stylelint-upgrade

10up · Sep 25, 2023 · 5fe5d7e · 5fe5d7e
2 parents e7d6f97 + 8f34e85
commit 5fe5d7e
Show file tree

Hide file tree

Showing 9 changed files with 6,384 additions and 3,927 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/stylelint-config/CHANGELOG.md b/packages/stylelint-config/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 2.0.5
+
+### Patch Changes
+
+- b172081: Fixes validation for `--wp--some--property` for custom properties
+  Fixes usage of `currentcolor` vs `currentColor`
+
+## 2.0.5-next.0
+
+### Patch Changes
+
+- b172081: Fixes validation for `--wp--some--property` for custom properties
+  Fixes usage of `currentcolor` vs `currentColor`
+
 ## 2.0.4
 
 ### Patch Changes

diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@10up/stylelint-config",
-	"version": "2.0.4",
+	"version": "2.0.5",
 	"description": "10up stylelint config for WordPress projects",
 	"main": "index.js",
 	"homepage": "https://github.com/10up/10up-toolkit/tree/develop/packages/stylelint-config#readme",

diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## 5.2.2
+
+### Patch Changes
+
+- d3ea57e: install @wordpress/eslint-plugin in toolkit by default
+
+## 5.2.2-next.0
+
+### Patch Changes
+
+- d3ea57e: install @wordpress/eslint-plugin in toolkit by default
+- Updated dependencies [b172081]
+  - @10up/stylelint-config@2.0.5-next.0
+
 ## 5.2.1
 
 ### Patch Changes

diff --git a/packages/toolkit/README.md b/packages/toolkit/README.md
@@ -257,6 +257,31 @@ Replace `TENUP_THEME_DIST_URL` and `TENUP_THEME_DIST_PATH` with the path to the
 
 Make sure to reload the page after running 10up-toolkit as the `dist/fast-refresh.php` file is generated by 10up-toolkit
 
+### HTTPS and Certificates
+
+In some setups (such as Laravel Valet), Websocket SSL connections will fail unless you explicitly tell webpack what cert files to use (see issue [290](https://github.com/10up/10up-toolkit/issues/290)).
+
+If you aren't already customizing webpack in your project, create a new `webpack.config.js` file in the root of your project/theme. You need to specify the cert, key, and ca properties for the config.devServer.https object.
+
+```
+const config = require('10up-toolkit/config/webpack.config.js');
+const fs = require('fs')
+
+// Customize this to the appropriate path to your certificate folder
+const certPath = '/Users/youruser/.config/valet'
+
+// Check if devServer is in use and if so, modify the cert files used
+if( typeof config.devServer === 'object ) {
+  config.devServer.https = {
+    key: fs.readFileSync(`${certPath}/Certificates/yoursite.test.key`),
+    cert: fs.readFileSync(`${certPath}/Certificates/yoursite.test.crt`),
+    ca: fs.readFileSync(`${certPath}/CA/LaravelValetCASelfSigned.pem`),
+  }
+}
+
+module.exports = config;
+```
+
 ### Troubleshooting
 
 If HMR/Fast Refresh is not working for you these steps can help you debug the problem:
@@ -282,6 +307,7 @@ module.exports = (api) => {
   };
 };
 ```
+- If your're getting SSL errors for the Websocket connection, you may need to explicitly tell webpack what certificate files to use. See the above section "HTTPS and Certificates"
 
 
 ## <a id="linting"></a> Linting

diff --git a/packages/toolkit/package.json b/packages/toolkit/package.json
@@ -13,7 +13,7 @@
     "url": "git+https://github.com/10up/10up-toolkit.git",
     "directory": "packages/toolkit"
   },
-  "version": "5.2.1",
+  "version": "5.2.2",
   "bin": {
     "10up-toolkit": "bin/10up-toolkit.js"
   },
@@ -26,6 +26,7 @@
     "@typescript-eslint/parser": "^5.59.6",
     "@wordpress/dependency-extraction-webpack-plugin": "^4.16.0",
     "@wordpress/jest-console": "^6.11.0",
+    "@wordpress/eslint-plugin": "^13.10.0",
     "babel-jest": "^27.5.1",
     "babel-loader": "^9.1.2",
     "camelcase": "^6.3.0",
@@ -56,7 +57,7 @@
     "sass": "^1.62.1",
     "sass-loader": "^13.2.2",
     "sharp": "^0.32.1",
-    "stylelint-config-standard-scss": "^3.0.0",
+    "stylelint-config-standard-scss": "^11.0.0",
     "stylelint-webpack-plugin": "^4.1.1",
     "svgo": "^3.0.2",
     "typescript": "^5.0.4",
@@ -70,12 +71,12 @@
   "devDependencies": {
     "@10up/babel-preset-default": "^2.1.0",
     "@10up/eslint-config": "^3.1.1",
-    "@10up/stylelint-config": "^2.0.4"
+    "@10up/stylelint-config": "^2.0.5"
   },
   "peerDependencies": {
     "@10up/babel-preset-default": "^2.0.4",
     "@10up/eslint-config": "^3.1.1",
-    "@10up/stylelint-config": ">=2.0.4",
+    "@10up/stylelint-config": ">=2.0.5-next.0",
     "@linaria/webpack-loader": "^4.1.11",
     "@linaria/babel-preset": "^4.3.3"
   },

diff --git a/projects/10up-theme/package.json b/projects/10up-theme/package.json
@@ -20,7 +20,7 @@
     "@linaria/babel-preset": "^4.3.3",
     "@linaria/webpack-loader": "^4.1.11",
     "@wordpress/env": "^5.0.0",
-    "10up-toolkit": "^5.2.1"
+    "10up-toolkit": "^5.2.2"
   },
   "dependencies": {
     "@10up/block-components": "1.7.0",

diff --git a/projects/library-ts/package.json b/projects/library-ts/package.json
@@ -39,7 +39,7 @@
   },
   "homepage": "https://github.com/10up/component-accordion#readme",
   "devDependencies": {
-    "10up-toolkit": "^5.2.1"
+    "10up-toolkit": "^5.2.2"
   },
   "dependencies": {
     "xss": "^1.0.11"

diff --git a/projects/library/package.json b/projects/library/package.json
@@ -26,7 +26,7 @@
   },
   "homepage": "https://github.com/10up/component-accordion#readme",
   "devDependencies": {
-    "10up-toolkit": "^5.2.1",
+    "10up-toolkit": "^5.2.2",
     "@testing-library/dom": "^7.29.4",
     "@testing-library/jest-dom": "^5.11.9",
     "@testing-library/user-event": "^12.6.3",