Skip to content

Commit

Permalink
Merge pull request #30 from itsrennyman/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
Renato Pozzi authored Mar 24, 2023
2 parents e10bd85 + 673f00c commit b18979f
Show file tree
Hide file tree
Showing 10 changed files with 241 additions and 11 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Test & Release CI

on:
push:
branches:
- main
- dev

jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Set Current Branch
run: echo "CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)" >> $GITHUB_ENV

- name: Bootstrap Dependencies
run: npm run bootstrap

- name: Run Testing Suite
run: npm run lib:test

- name: NPM Identity
run: |
echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > .npmrc
- name: Release Package
run: |
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor }}@users.noreply.github.com"
if [ ${{ env.CURRENT_BRANCH }} = dev ]; then
npm run lib:bump:next
npm run lib:publish:next
else
npm run lib:bump:latest
npm run lib:publish:latest
fi
7 changes: 2 additions & 5 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,10 @@
name: Testing CI

on:
push:
branches:
- main
- feat/v3
pull_request:
branches:
- main
- dev

jobs:
main:
Expand All @@ -18,4 +15,4 @@ jobs:
fetch-depth: 0

- run: npm run bootstrap
- run: npx run lib:test
- run: npm run lib:test
64 changes: 64 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 3.0.1-beta.7 (2023-03-24)

**Note:** Version bump only for package root





## 3.0.1-beta.6 (2023-03-24)

**Note:** Version bump only for package root





## 3.0.1-beta.5 (2023-03-24)

**Note:** Version bump only for package root





## 3.0.1-beta.4 (2023-03-24)

**Note:** Version bump only for package root





## 3.0.1-beta.3 (2023-03-24)

**Note:** Version bump only for package root





## 3.0.1-beta.2 (2023-03-24)

**Note:** Version bump only for package root





## 3.0.1-beta.1 (2023-03-24)

**Note:** Version bump only for package root





## 3.0.1-beta.0 (2023-03-24)

**Note:** Version bump only for package root
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"useWorkspaces": true,
"npmClient": "yarn",
"version": "3.0.0"
"version": "3.0.1-beta.7"
}
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
"bootstrap": "lerna bootstrap",
"lib:test": "lerna run test --scope react-plock",
"lib:build": "lerna run build --scope react-plock",
"lib:publish:next": "lerna publish from-package --dist-tag next",
"lib:publish:latest": "lerna publish from-package",
"lib:publish:next": "lerna publish from-package --dist-tag next --yes",
"lib:publish:latest": "lerna publish from-package --yes",
"lib:bump:next": "lerna version --conventional-commits --conventional-prerelease --preid beta -m \"chore(release): publish %s\" --yes",
"lib:bump:latest": "lerna version --conventional-commits --conventional-graduate -m \"chore(release): publish %s\" --yes",
"demo:dev": "lerna run dev --scope demo",
"demo:build": "lerna run build --scope demo",
"demo:preview": "lerna run preview --scope demo"
Expand Down
64 changes: 64 additions & 0 deletions packages/demo/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 3.0.1-beta.7 (2023-03-24)

**Note:** Version bump only for package demo





## 3.0.1-beta.6 (2023-03-24)

**Note:** Version bump only for package demo





## 3.0.1-beta.5 (2023-03-24)

**Note:** Version bump only for package demo





## 3.0.1-beta.4 (2023-03-24)

**Note:** Version bump only for package demo





## 3.0.1-beta.3 (2023-03-24)

**Note:** Version bump only for package demo





## 3.0.1-beta.2 (2023-03-24)

**Note:** Version bump only for package demo





## 3.0.1-beta.1 (2023-03-24)

**Note:** Version bump only for package demo





## 3.0.1-beta.0 (2023-03-24)

**Note:** Version bump only for package demo
2 changes: 1 addition & 1 deletion packages/demo/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "demo",
"private": true,
"version": "3.0.0",
"version": "3.0.1-beta.7",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
64 changes: 64 additions & 0 deletions packages/react-plock/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Change Log

All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## 3.0.1-beta.7 (2023-03-24)

**Note:** Version bump only for package react-plock





## 3.0.1-beta.6 (2023-03-24)

**Note:** Version bump only for package react-plock





## 3.0.1-beta.5 (2023-03-24)

**Note:** Version bump only for package react-plock





## 3.0.1-beta.4 (2023-03-24)

**Note:** Version bump only for package react-plock





## 3.0.1-beta.3 (2023-03-24)

**Note:** Version bump only for package react-plock





## 3.0.1-beta.2 (2023-03-24)

**Note:** Version bump only for package react-plock





## 3.0.1-beta.1 (2023-03-24)

**Note:** Version bump only for package react-plock





## 3.0.1-beta.0 (2023-03-24)

**Note:** Version bump only for package react-plock
2 changes: 1 addition & 1 deletion packages/react-plock/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-plock",
"version": "3.0.0",
"version": "3.0.1-beta.7",
"description": "The 1kB Masonry Grid for React",
"author": "Renato Pozzi <[email protected]>",
"homepage": "https://github.com/itsrennyman/react-plock#readme",
Expand Down
2 changes: 1 addition & 1 deletion packages/react-plock/src/Plock.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export function Masonry<T>({
display: "grid",
alignItems: "start",
gridColumnGap: gap,
gridTemplateColumns: `repeat(${columns}, minmax(0, 1fr)`,
gridTemplateColumns: `repeat(${columns}, minmax(0, 1fr))`,
}}
>
{dataColumns.map((column, idx) => (
Expand Down

0 comments on commit b18979f

Please sign in to comment.