Merge branch 'trunk' into develop

# Conflicts: # packages/toolkit/utils/index.js
10up · Sep 24, 2024 · e0c129b · e0c129b
2 parents 75b890b + 44caa00
commit e0c129b
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 68 deletions.
diff --git a/.changeset/clean-ravens-film.md b/.changeset/clean-ravens-film.md
diff --git a/.changeset/fifty-ants-call.md b/.changeset/fifty-ants-call.md
diff --git a/.changeset/gorgeous-ants-grow.md b/.changeset/gorgeous-ants-grow.md
diff --git a/.changeset/great-plants-fail.md b/.changeset/great-plants-fail.md
diff --git a/.changeset/hip-toys-learn.md b/.changeset/hip-toys-learn.md
diff --git a/.changeset/poor-birds-rhyme.md b/.changeset/poor-birds-rhyme.md
diff --git a/.changeset/pre.json b/.changeset/pre.json
diff --git a/.changeset/weak-oranges-promise.md b/.changeset/weak-oranges-promise.md
diff --git a/.changeset/yellow-pumpkins-fail.md b/.changeset/yellow-pumpkins-fail.md
diff --git a/packages/eslint-config/CHANGELOG.md b/packages/eslint-config/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.1.0
+
+### Minor Changes
+
+- 5ddee2c: Update eslint rule for typescript to use default arguments for default props.
+
 ## 4.1.0-next.0
 
 ### Minor Changes

diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@10up/eslint-config",
-	"version": "4.1.0-next.0",
+	"version": "4.1.0",
 	"description": "A shareable ESLint configuration",
 	"publishConfig": {
 		"access": "public"

diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## 6.2.2
+
+### Patch Changes
+
+- 7692784: Simple enhancements to toolkit project command to align with devops needs.
+
+## 6.2.1
+
+### Patch Changes
+
+- 868ffdc: Fixing git clone path inside project command to support paths with spaces.
+
+## 6.2.0
+
+### Minor Changes
+
+- dba1534: Project Command (BETA)
+
+### Patch Changes
+
+- dcc09bb: Fix: watch close when using modules
+- 1aba76c: Fix project init command
+- 58d5861: Fix init command
+- d9f3642: Refactor init command
+- 1f612a2: Update `project` command to use latest
+
 ## 6.2.0-next.4
 
 ### Patch Changes

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": "6.2.0-next.4",
+	"version": "6.2.2",
 	"bin": {
 		"10up-toolkit": "bin/10up-toolkit.js"
 	},
@@ -74,7 +74,7 @@
 	},
 	"devDependencies": {
 		"@10up/babel-preset-default": ">=2.1.1",
-		"@10up/eslint-config": ">=4.1.0-next.0",
+		"@10up/eslint-config": ">=4.1.0",
 		"@10up/stylelint-config": ">=3.0.0"
 	},
 	"peerDependencies": {

diff --git a/projects/10up-theme/package.json b/projects/10up-theme/package.json
@@ -20,7 +20,7 @@
     "@linaria/babel-preset": "^5.0.3",
     "@linaria/webpack-loader": "^5.0.3",
     "@wordpress/env": "^5.0.0",
-    "10up-toolkit": "^6.2.0-next.4"
+    "10up-toolkit": "^6.2.2"
   },
   "dependencies": {
     "@10up/block-components": "^1.18.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": "^6.2.0-next.4"
+    "10up-toolkit": "^6.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": "^6.2.0-next.4",
+    "10up-toolkit": "^6.2.2",
     "@testing-library/dom": "9.3.3",
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/user-event": "^14.5.2",