Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 35670d2
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sun Apr 14 10:33:05 2024 +1000

    build: downgrade to tsup@6.6.0 due to out of memory issues

commit 3b7f148
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sun Apr 14 10:24:25 2024 +1000

    build: reduce build memory usage

commit 9c56c4b
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sun Apr 14 10:21:15 2024 +1000

    chore: update tsup and typescript options

commit d398f1a
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sun Apr 14 10:19:46 2024 +1000

    chore: update workspace packages

commit dc68d2a
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sun Apr 14 09:57:45 2024 +1000

    chore: update .npmrc

commit 15b904c
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sun Apr 14 09:50:02 2024 +1000

    chore: add steps to publish packages

commit 7b9864d
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sat Apr 13 17:41:25 2024 +1000

    chore: create github release in release workflow

commit 3c3649d
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sat Apr 13 17:34:49 2024 +1000

    chore: use giantnodes/next-semver@v1

commit 07dde6b
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sat Apr 13 17:32:32 2024 +1000

    chore: add labels to release pr

commit 41daf7b
Author: Jordan Phillips <jordypee27@gmail.com>
Date:   Sat Apr 13 17:20:47 2024 +1000

    chore: add missing commit flags
  • Loading branch information
PHILLIPS71 committed Apr 14, 2024
1 parent 4715f3d commit ae8e939
Show file tree
Hide file tree
Showing 11 changed files with 525 additions and 193 deletions.
32 changes: 22 additions & 10 deletions .github/actions/release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@ inputs:
RELEASE_IDENTIFIER:
required: false

outputs:
version:
value: ${{ steps.version.outputs.version }}
branch:
value: ${{ steps.branch.outputs.branch }}

runs:
using: 'composite'
steps:
- name: '🏷️ Increment Release'
id: version
uses: giantnodes/next-semver@v0.0.1
uses: giantnodes/next-semver@v1
with:
path: VERSION.txt
type: ${{ inputs.RELEASE_TYPE }}
Expand Down Expand Up @@ -43,18 +49,24 @@ runs:
git config --global user.name 'Giantnodes Bot'
git config --global user.email 'bot@giantnodes.com'
- name: '🏷️ Tag & Commit Release'
- name: '🏷️ Tag, Commit & Release'
shell: bash
id: branch
run: |
git checkout -b release/${{ steps.version.outputs.version }}
git commit -m 'chore(release): ${{ steps.version.outputs.version }}'
git commit -anm 'chore(release): ${{ steps.version.outputs.version }}'
git tag ${{ steps.version.outputs.version }}
git push origin release/${{ steps.version.outputs.version }} --tags --force
- name: '🏷️ Open Pull Request'
uses: thomaseizinger/create-pull-request@master
with:
title: 'chore(release): ${{ steps.version.outputs.version }}'
github_token: ${{ inputs.GITHUB_TOKEN }}
head: release/${{ steps.version.outputs.version }}
base: main
gh release create ${{ steps.version.outputs.version }} --generate-notes
echo "branch=$(git branch --show-current)" >> $GITHUB_OUTPUT
# - name: '🏷️ Open Pull Request'
# uses: thomaseizinger/create-pull-request@master
# with:
# title: 'chore(release): ${{ steps.version.outputs.version }}'
# labels: '🏷️ Release, 🥳️ LGTM'
# github_token: ${{ inputs.GITHUB_TOKEN }}
# head: release/${{ steps.version.outputs.version }}
# base: main
47 changes: 45 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ on:
- canary

jobs:
release:
name: '🏷️ Release'
create-release:
name: '🏷️ Create Release'
runs-on: ubuntu-latest
steps:
- name: '🐙️ Checkout'
Expand All @@ -35,8 +35,51 @@ jobs:
uses: ./.github/actions/init

- name: '🏷️ Release'
id: release
uses: ./.github/actions/release
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RELEASE_TYPE: ${{ github.event.inputs.type }}
RELEASE_IDENTIFIER: ${{ github.event.inputs.identifier }}

publish-theme:
name: '🏷️ Publish @giantnodes/theme'
runs-on: ubuntu-latest
needs: [create-release]
steps:
- name: '🐙️ Checkout'
uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.branch }}

- name: '💽️ Init'
uses: ./.github/actions/init

- name: '🏷️ Publish @giantnodes/theme'
working-directory: packages/theme
shell: bash
run: |
pnpm publish --access public
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

publish-react:
name: '🏷️ Publish @giantnodes/theme'
runs-on: ubuntu-latest
needs: [create-release]
steps:
- name: '🐙️ Checkout'
uses: actions/checkout@v4
with:
ref: ${{ steps.version.outputs.branch }}

- name: '💽️ Init'
uses: ./.github/actions/init

- name: '🏷️ Publish @giantnodes/react'
working-directory: packages/react
shell: bash
run: |
pnpm publish --access public
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
5 changes: 4 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
strict-peer-dependencies=false
registry=https://registry.npmjs.org/

enable-pre-post-scripts=true
strict-peer-dependencies=false

public-hoist-pattern[]=*@giantnodes/theme*
public-hoist-pattern[]=*@react-types/shared*
public-hoist-pattern[]=*tailwind-variants*
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"devDependencies": {
"@commitlint/cli": "^19.2.1",
"@commitlint/config-conventional": "^19.1.0",
"@typescript-eslint/eslint-plugin": "^7.3.1",
"@typescript-eslint/parser": "^7.3.1",
"@typescript-eslint/eslint-plugin": "^7.6.0",
"@typescript-eslint/parser": "^7.6.0",
"eslint": "^8.57.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-airbnb-typescript": "18.0.0",
Expand All @@ -35,9 +35,9 @@
"husky": "^9.0.11",
"prettier": "^3.2.5",
"pretty-quick": "^4.0.0",
"tsup": "^8.0.2",
"turbo": "^1.12.5",
"typescript": "^5.4.2"
"tsup": "^6.6.0",
"turbo": "^1.13.2",
"typescript": "^5.4.5"
},
"engines": {
"node": ">=16.x",
Expand Down
6 changes: 4 additions & 2 deletions packages/react/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"name": "@giantnodes/react",
"version": "0.0.0",
"description": "",
"description": "A collection Giantnodes React components",
"license": "AGPL-3.0",
"sideEffects": false,
"main": "./dist/index.js",
"main": "dist/index.js",
"module": "dist/index.mjs",
"types": "dist/index.d.ts",
"files": [
"dist"
],
Expand Down
1 change: 0 additions & 1 deletion packages/react/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"$schema": "https://json.schemastore.org/tsconfig",
"extends": "../../tsconfig.json",
"compilerOptions": {
"isolatedModules": false,
"baseUrl": "./",
"paths": {
"@/*": ["./src/*"],
Expand Down
7 changes: 4 additions & 3 deletions packages/react/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { defineConfig } from 'tsup'

const config: Options = {
clean: true,
dts: false,
dts: true,
minify: true,
outDir: 'dist',
target: 'es2019',
entry: ['src/**/*.ts?(x)'],
format: ['cjs', 'esm'],
target: 'esnext',
outDir: 'dist',
banner: { js: '"use client";' },
}

Expand Down
7 changes: 4 additions & 3 deletions packages/theme/package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "@giantnodes/theme",
"version": "0.0.0",
"description": "",
"description": "A collection default Giantnodes Tailwind CSS components",
"license": "AGPL-3.0",
"sideEffects": false,
"packageManager": "pnpm@8.6.0",
"main": "./dist/index.js",
"main": "dist/index.js",
"module": "dist/index.mjs",
"types": "dist/index.d.ts",
"files": [
"dist"
],
Expand Down
1 change: 0 additions & 1 deletion packages/theme/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"$schema": "https://json.schemastore.org/tsconfig",
"extends": "../../tsconfig.json",
"compilerOptions": {
"isolatedModules": false,
"baseUrl": "./",
"paths": {
"@/*": ["./src/*"]
Expand Down
5 changes: 3 additions & 2 deletions packages/theme/tsup.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ import { defineConfig } from 'tsup'
const config: Options = {
clean: true,
dts: true,
minify: true,
outDir: 'dist',
target: 'es2019',
entry: ['src/**/*.ts?(x)'],
format: ['cjs', 'esm'],
target: 'esnext',
outDir: 'dist',
}

export { config }
Expand Down
Loading

0 comments on commit ae8e939

Please sign in to comment.