Skip to content

Commit

Permalink
Merge pull request #376 from 10up/develop
Browse files Browse the repository at this point in the history
Toolkit v6
  • Loading branch information
nicholasio authored Mar 11, 2024
2 parents 78272f2 + 64b9052 commit 4c06266
Show file tree
Hide file tree
Showing 168 changed files with 25,082 additions and 20,007 deletions.
5 changes: 5 additions & 0 deletions .changeset/funny-dogs-learn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@10up/stylelint-config": patch
---

Update `custom-property-pattern` regular expression to also match custom properties that use a singular `-` as a group separator
5 changes: 5 additions & 0 deletions .changeset/gentle-falcons-shop.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"10up-toolkit": patch
---

Add `.local` to the default list of supported domains.
14 changes: 14 additions & 0 deletions .changeset/good-pumas-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
"10up-toolkit": major
---

update default value of `useBlockAssets` to true. If you are not ready for it yet. Set `useBlockAssets` to false in your 10up-toolkit `package.json` config.

```json
{
"name": "your-project",
"10up-toolkit": {
"useBlockAssets": false
}
}
```
5 changes: 5 additions & 0 deletions .changeset/grumpy-experts-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"10up-toolkit": patch
---

Update dependencies
5 changes: 5 additions & 0 deletions .changeset/happy-pans-jam.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"10up-toolkit": minor
---

Feature: sourcemap option for production builds
6 changes: 6 additions & 0 deletions .changeset/healthy-radios-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"10up-toolkit": major
---

Update postcss-preset-env to ^9.0.0 from ^7.0.0
Swap postcss-editor-styles with postcss-editor-styles-wrapper which is compatible with PostCSS 8
6 changes: 6 additions & 0 deletions .changeset/hot-crabs-exercise.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@10up/babel-preset-default": patch
"10up-toolkit": patch
---

Fix HRM (again)
6 changes: 6 additions & 0 deletions .changeset/mean-pens-juggle.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@10up/stylelint-config": major
---

Discourage usage of `@nest` by disallowing the at-rule.
Adding support for new way of doing nesting as per latest Nesting Spec (as implemented by browsers in 2023).
5 changes: 5 additions & 0 deletions .changeset/pink-dots-grab.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@10up/stylelint-config": patch
---

fix update custom property pattern to also allow for single `-` separator
31 changes: 31 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"mode": "pre",
"tag": "next",
"initialVersions": {
"@10up/babel-preset-default": "2.1.0",
"@10up/eslint-config": "3.1.1",
"@10up/stylelint-config": "2.0.5",
"10up-toolkit": "5.2.2",
"tenup-theme": "1.1.5-next.7",
"@10up/component-accordion": "2.1.5",
"@10up/library-ts-test": "2.1.5"
},
"changesets": [
"funny-dogs-learn",
"gentle-falcons-shop",
"good-pumas-teach",
"grumpy-experts-wait",
"happy-pans-jam",
"healthy-radios-own",
"hot-crabs-exercise",
"mean-pens-juggle",
"pink-dots-grab",
"rare-ducks-hang",
"six-crabs-cry",
"smooth-trees-pump",
"stale-impalas-return",
"strong-actors-dream",
"tiny-toes-dream",
"tricky-ties-hang"
]
}
6 changes: 6 additions & 0 deletions .changeset/rare-ducks-hang.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@10up/eslint-config": major
---

- Bump minimum prettier version to v3.
- Removed `jsdoc/newline-after-description` eslint rule since it has been removed from the `eslint-plugin-jsdoc`.
5 changes: 5 additions & 0 deletions .changeset/six-crabs-cry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"10up-toolkit": patch
---

Stop using react fast refresh fork in favor of the upstream package
5 changes: 5 additions & 0 deletions .changeset/smooth-trees-pump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@10up/stylelint-config": major
---

Upgrading `stylelint` to version `15.0.0` and decouple from `@wordpress/stylelint-config`.
5 changes: 5 additions & 0 deletions .changeset/stale-impalas-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"10up-toolkit": minor
---

Add support to configure Webpack's publicPath
5 changes: 5 additions & 0 deletions .changeset/strong-actors-dream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@10up/eslint-config": patch
---

Fix peer dep
5 changes: 5 additions & 0 deletions .changeset/tiny-toes-dream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"10up-toolkit": major
---

Update linaria to next major and fix an issue with react-refresh plugin. Also drops support for node 14.
5 changes: 5 additions & 0 deletions .changeset/tricky-ties-hang.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"10up-toolkit": patch
---

Fix: allow overriding buildfiles.config.js, filenames.config.js and paths.config.js as stated in README
8 changes: 8 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
extends: ['@10up/eslint-config/node'],
rules: {
'global-require': 'off',
'import/no-dynamic-require': 'off',
'no-process-exit': 'off',
},
};
10 changes: 5 additions & 5 deletions .github/workflows/npm-release-latest-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Node.js 16.x
uses: actions/setup-node@v2
- name: Setup Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x

- name: Install Dependencies
run: npm ci
Expand All @@ -35,4 +35,4 @@ jobs:
createGithubReleases: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
10 changes: 5 additions & 5 deletions .github/workflows/npm-release-next-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Node.js 16.x
uses: actions/setup-node@v2
- name: Setup Node.js 18.x
uses: actions/setup-node@v4
with:
node-version: 16.x
node-version: 18.x

- name: Install Dependencies
run: npm ci
Expand All @@ -36,4 +36,4 @@ jobs:
createGithubReleases: true
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
21 changes: 7 additions & 14 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: test
on:
push:
branches:
- 'develop'
- 'trunk'
- "develop"
- "trunk"
pull_request:

concurrency:
Expand All @@ -19,21 +19,19 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
# Test node 16/18 on Ubuntu
# Test node 16 on macOS/Windows
# Enable linting only for node 16 + ubuntu
# Test node 16/18/20 on Ubuntu
# Test node 18 on macOS/Windows
# Enable linting only for node 20 & Ubuntu
matrix:
os: [ubuntu-latest]
node: [14, 16, 18]
node: [16, 18, 20]
include:
- os: macos-latest
node: 18
- os: windows-latest
node: 18
- node: 16
- node: 20
is_base_node_version: true
- node: 14
needs_npm_upgrade: true
- os: ubuntu-latest
is_base_os_version: true
steps:
Expand All @@ -60,11 +58,6 @@ jobs:
key: ${{ env.COMMIT_SHA }}--test-dist-${{ matrix.node }}-${{ matrix.os }}
restore-keys: ${{ env.DIST_RESTORE_KEYS }}

# See https://github.com/npm/cli/issues/3385
- name: upgrade npm
run: npm i [email protected] -g
if: matrix.needs_npm_upgrade

- name: npm ci
run: |
npm ci
Expand Down
11 changes: 11 additions & 0 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# This configuration file was automatically generated by Gitpod.
# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
# and commit this file to your remote git repository to share the goodness with others.

# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart

tasks:
- init: npm install && npm run build
command: npm run dev


4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged
8 changes: 8 additions & 0 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"*.[tj]s": [
"eslint"
],
"*.[tj]sx": [
"eslint"
]
}
Loading

0 comments on commit 4c06266

Please sign in to comment.