Merge branch 'trunk' into develop

10up · May 6, 2024 · 353071c · 353071c
2 parents e8f5d6e + f0dd36e
commit 353071c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 37 deletions.
diff --git a/.changeset/early-kiwis-arrive.md b/.changeset/early-kiwis-arrive.md
diff --git a/.changeset/neat-trees-roll.md b/.changeset/neat-trees-roll.md
diff --git a/.changeset/pre.json b/.changeset/pre.json
diff --git a/.changeset/thin-geckos-sparkle.md b/.changeset/thin-geckos-sparkle.md
diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 6.1.0
+
+### Minor Changes
+
+- a41a046: Add support for `scriptModule` & `viewScriptModule` assets
+- 1693913: Bundle PostCSS Global Data Plugin with default configuration
+
+### Patch Changes
+
+- 20d2e65: Feature: allow defining module script entrypoints via `moduleEntry` key in `package.json` decoupled from blocks
+
 ## 6.1.0-next.1
 
 ### Minor 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.1.0-next.1",
+	"version": "6.1.0",
 	"bin": {
 		"10up-toolkit": "bin/10up-toolkit.js"
 	},

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.1.0-next.1"
+    "10up-toolkit": "^6.1.0"
   },
   "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.1.0-next.1"
+    "10up-toolkit": "^6.1.0"
   },
   "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.1.0-next.1",
+    "10up-toolkit": "^6.1.0",
     "@testing-library/dom": "9.3.3",
     "@testing-library/jest-dom": "^6.2.0",
     "@testing-library/user-event": "^14.5.2",