Skip to content

Commit 94717c3

Browse files
committed
Merge branch 'trunk' into develop
2 parents a632485 + 8073c55 commit 94717c3

File tree

11 files changed

+22
-41
lines changed

11 files changed

+22
-41
lines changed

.changeset/dull-pigs-cheer.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/hot-worms-compete.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/light-mice-relate.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/pre.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

packages/eslint-config/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 4.1.1
4+
5+
### Patch Changes
6+
7+
- 402c108: [eslint-config] update deps
8+
39
## 4.1.1-next.0
410

511
### Patch Changes

packages/eslint-config/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@10up/eslint-config",
3-
"version": "4.1.1-next.0",
3+
"version": "4.1.1",
44
"description": "A shareable ESLint configuration",
55
"publishConfig": {
66
"access": "public"

packages/toolkit/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Changelog
22

3+
## 6.4.0
4+
5+
### Minor Changes
6+
7+
- 402c108: Introducing Vanilla-extract support
8+
9+
### Patch Changes
10+
11+
- 6573d42: Fix: transform file extension for .sass and .scss assets inside block.json files
12+
313
## 6.3.1-next.1
414

515
### Minor Changes

packages/toolkit/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"url": "git+https://github.com/10up/10up-toolkit.git",
1414
"directory": "packages/toolkit"
1515
},
16-
"version": "6.3.1-next.1",
16+
"version": "6.4.0",
1717
"bin": {
1818
"10up-toolkit": "bin/10up-toolkit.js"
1919
},
@@ -75,7 +75,7 @@
7575
},
7676
"devDependencies": {
7777
"@10up/babel-preset-default": ">=2.1.1",
78-
"@10up/eslint-config": ">=4.1.1-next.0",
78+
"@10up/eslint-config": ">=4.1.1",
7979
"@10up/stylelint-config": ">=3.0.0"
8080
},
8181
"peerDependencies": {

projects/10up-theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"@linaria/babel-preset": "^5.0.3",
2121
"@linaria/webpack-loader": "^5.0.3",
2222
"@wordpress/env": "^10.10.0",
23-
"10up-toolkit": "^6.3.1-next.1"
23+
"10up-toolkit": "^6.4.0"
2424
},
2525
"dependencies": {
2626
"@10up/block-components": "^1.18.0",

projects/library-ts/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
},
4040
"homepage": "https://github.com/10up/component-accordion#readme",
4141
"devDependencies": {
42-
"10up-toolkit": "^6.3.1-next.1"
42+
"10up-toolkit": "^6.4.0"
4343
},
4444
"dependencies": {
4545
"xss": "^1.0.11"

0 commit comments

Comments
 (0)