Skip to content

Commit

Permalink
Merge branch 'release-next'
Browse files Browse the repository at this point in the history
  • Loading branch information
brophdawg11 committed Apr 23, 2024
2 parents 89049ce + 82a3a77 commit ec03b12
Show file tree
Hide file tree
Showing 52 changed files with 14,319 additions and 10,961 deletions.
1 change: 1 addition & 0 deletions .changeset/config.json
Expand Up @@ -17,5 +17,6 @@
"access": "public",
"baseBranch": "dev",
"updateInternalDependencies": "patch",
"bumpVersionsWithWorkspaceProtocolOnly": true,
"ignore": []
}
1 change: 1 addition & 0 deletions .eslintignore
@@ -1,5 +1,6 @@
/fixtures/
node_modules/
pnpm-lock.yaml
/docs/api
examples/**/dist/
packages/**/dist/
Expand Down
@@ -1,11 +1,11 @@
name: ⚙️ Deduplicate yarn.lock
name: ⚙️ Deduplicate lock file

on:
push:
branches:
- dev
paths:
- ./yarn.lock
- ./pnpm-lock.yaml

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
Expand All @@ -20,14 +20,17 @@ jobs:
- name: ⬇️ Checkout repo
uses: actions/checkout@v4

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0

- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "yarn"
cache: "pnpm"

- name: ⚙️ Dedupe yarn.lock
run: npx yarn-deduplicate && rm -rf ./node_modules && yarn
- name: ⚙️ Dedupe lock file
run: pnpm dedupe && rm -rf ./node_modules && pnpm install

- name: 💪 Commit
run: |
Expand All @@ -38,6 +41,6 @@ jobs:
echo "💿 no deduplication needed"
exit 0
fi
git commit -m "chore: deduplicate `yarn.lock`"
git commit -m "chore: deduplicate `pnpm-lock.yaml`"
git push
echo "💿 https://github.com/$GITHUB_REPOSITORY/commit/$(git rev-parse HEAD)"
9 changes: 6 additions & 3 deletions .github/workflows/format.yml
Expand Up @@ -21,20 +21,23 @@ jobs:
with:
token: ${{ secrets.FORMAT_PAT }}

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0

- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
cache: yarn
cache: pnpm
node-version-file: ".nvmrc"

- name: 📥 Install deps
run: yarn --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: 🔃 Sort contributors.yml
run: sort --ignore-case --output contributors.yml contributors.yml

- name: 👔 Format
run: yarn format
run: pnpm format

- name: 💪 Commit
run: |
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/release-experimental.yml
Expand Up @@ -22,22 +22,25 @@ jobs:
with:
fetch-depth: 0

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0

- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
cache: yarn
cache: pnpm
node-version-file: ".nvmrc"

- name: 📥 Install deps
run: yarn --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: 🏗 Build
run: yarn build
run: pnpm build

- name: 🔐 Setup npm auth
run: |
echo "registry=https://registry.npmjs.org" >> ~/.npmrc
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
- name: 🚀 Publish
run: npm run publish
run: pnpm run publish
16 changes: 11 additions & 5 deletions .github/workflows/release.yml
Expand Up @@ -27,14 +27,17 @@ jobs:
with:
fetch-depth: 0

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0

- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version-file: ".nvmrc"
cache: "yarn"
cache: "pnpm"

- name: 📥 Install deps
run: yarn --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: 🔐 Setup npm auth
run: |
Expand All @@ -50,10 +53,10 @@ jobs:
id: changesets
uses: changesets/action@v1
with:
version: yarn run version
version: pnpm run version
commit: "chore: Update version for release"
title: "chore: Update version for release"
publish: yarn run release
publish: pnpm run release
createGithubReleases: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -70,11 +73,14 @@ jobs:
- name: ⬇️ Checkout repo
uses: actions/checkout@v4

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0

- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
node-version: 16
cache: "npm"
cache: "pnpm"

- id: find_package_version
run: |
Expand Down
15 changes: 9 additions & 6 deletions .github/workflows/test.yml
Expand Up @@ -35,10 +35,13 @@ jobs:
- name: ⬇️ Checkout repo
uses: actions/checkout@v4

- name: 📦 Setup pnpm
uses: pnpm/action-setup@v3.0.0

- name: ⎔ Setup node
uses: actions/setup-node@v4
with:
cache: yarn
cache: pnpm
check-latest: true
node-version: ${{ matrix.node }}

Expand All @@ -49,16 +52,16 @@ jobs:
echo "::remove-matcher owner=eslint-stylish::"
- name: 📥 Install deps
run: yarn --frozen-lockfile
run: pnpm install --frozen-lockfile

- name: 🏗 Build
run: yarn build
run: pnpm build

- name: 🔬 Lint
run: yarn lint
run: pnpm lint

- name: 🧪 Run tests
run: yarn test
run: pnpm test

- name: Check bundle size
run: yarn size
run: pnpm size
2 changes: 2 additions & 0 deletions .gitignore
@@ -1,10 +1,12 @@
.DS_Store
npm-debug.log

/docs/api/
/website/build/
node_modules/

/examples/*/yarn.lock
/examples/*/pnpm-lock.yaml
/examples/*/dist
/tutorial/dist

Expand Down
2 changes: 2 additions & 0 deletions .npmrc
@@ -0,0 +1,2 @@
ignore-workspace-cycles=true
enable-pre-post-scripts=true

0 comments on commit ec03b12

Please sign in to comment.