Skip to content

Commit

Permalink
Merge branch 'trunk' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasio committed May 16, 2023
2 parents 861a04e + 68a9105 commit a640a66
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 35 deletions.
8 changes: 0 additions & 8 deletions .changeset/new-olives-sniff.md

This file was deleted.

34 changes: 17 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions packages/babel-preset-default/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 2.1.0

### Minor Changes

- f3122e4: Updating several dependencies
Better error messages when svg parsing fails

## 2.0.4

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/babel-preset-default/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@10up/babel-preset-default",
"version": "2.0.4",
"version": "2.1.0",
"description": "10up's default babel preset",
"publishConfig": {
"access": "public"
Expand Down Expand Up @@ -38,7 +38,7 @@
"core-js": "^3.30.2"
},
"devDependencies": {
"@10up/eslint-config": "^3.0.0",
"@10up/eslint-config": "^3.1.0",
"@wordpress/element": "^4.20.0",
"babel-jest": "^27.5.1",
"eslint": "^8.40.0",
Expand Down
12 changes: 12 additions & 0 deletions packages/eslint-config/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## 3.1.0

### Minor Changes

- f3122e4: Updating several dependencies
Better error messages when svg parsing fails

### Patch Changes

- Updated dependencies [f3122e4]
- @10up/babel-preset-default@2.1.0

## 3.0.0

### Major Changes
Expand Down
4 changes: 2 additions & 2 deletions packages/eslint-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@10up/eslint-config",
"version": "3.0.0",
"version": "3.1.0",
"description": "A shareable ESLint configuration",
"publishConfig": {
"access": "public"
Expand Down Expand Up @@ -38,7 +38,7 @@
"10up"
],
"dependencies": {
"@10up/babel-preset-default": "^2.0.4"
"@10up/babel-preset-default": "^2.1.0"
},
"devDependencies": {
"eslint": "^8.40.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/toolkit/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Changelog

## 5.2.0

### Minor Changes

- f3122e4: Updating several dependencies
Better error messages when svg parsing fails

## 5.1.0

### Minor Changes
Expand Down
6 changes: 3 additions & 3 deletions packages/toolkit/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"url": "git+https://github.com/10up/10up-toolkit.git",
"directory": "packages/toolkit"
},
"version": "5.1.0",
"version": "5.2.0",
"bin": {
"10up-toolkit": "bin/10up-toolkit.js"
},
Expand Down Expand Up @@ -68,8 +68,8 @@
"webpackbar": "^5.0.2"
},
"devDependencies": {
"@10up/babel-preset-default": "^2.0.4",
"@10up/eslint-config": "^3.0.0",
"@10up/babel-preset-default": "^2.1.0",
"@10up/eslint-config": "^3.1.0",
"@10up/stylelint-config": "^2.0.4"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion projects/10up-theme/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"@linaria/babel-preset": "^4.3.3",
"@linaria/webpack-loader": "^4.1.11",
"@wordpress/env": "^5.0.0",
"10up-toolkit": "^5.1.0"
"10up-toolkit": "^5.2.0"
},
"dependencies": {
"@10up/block-components": "1.7.0",
Expand Down
2 changes: 1 addition & 1 deletion projects/library-ts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"homepage": "https://github.com/10up/component-accordion#readme",
"devDependencies": {
"10up-toolkit": "^5.1.0"
"10up-toolkit": "^5.2.0"
},
"dependencies": {
"xss": "^1.0.11"
Expand Down
2 changes: 1 addition & 1 deletion projects/library/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"homepage": "https://github.com/10up/component-accordion#readme",
"devDependencies": {
"10up-toolkit": "^5.1.0",
"10up-toolkit": "^5.2.0",
"@testing-library/dom": "^7.29.4",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/user-event": "^12.6.3",
Expand Down

0 comments on commit a640a66

Please sign in to comment.