diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..cf7b770 --- /dev/null +++ b/.github/workflows/release.yml @@ -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 diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 1a48641..03ecc4d 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -1,13 +1,10 @@ name: Testing CI on: - push: - branches: - - main - - feat/v3 pull_request: branches: - main + - dev jobs: main: @@ -18,4 +15,4 @@ jobs: fetch-depth: 0 - run: npm run bootstrap - - run: npx run lib:test + - run: npm run lib:test diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..de85b4e --- /dev/null +++ b/CHANGELOG.md @@ -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 diff --git a/lerna.json b/lerna.json index 99dc239..0fd853c 100644 --- a/lerna.json +++ b/lerna.json @@ -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" } diff --git a/package.json b/package.json index cbab181..4815628 100644 --- a/package.json +++ b/package.json @@ -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" diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md new file mode 100644 index 0000000..2a60db0 --- /dev/null +++ b/packages/demo/CHANGELOG.md @@ -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 diff --git a/packages/demo/package.json b/packages/demo/package.json index 60a047c..3d298a6 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -1,7 +1,7 @@ { "name": "demo", "private": true, - "version": "3.0.0", + "version": "3.0.1-beta.7", "type": "module", "scripts": { "dev": "vite", diff --git a/packages/react-plock/CHANGELOG.md b/packages/react-plock/CHANGELOG.md new file mode 100644 index 0000000..b73ddb8 --- /dev/null +++ b/packages/react-plock/CHANGELOG.md @@ -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 diff --git a/packages/react-plock/package.json b/packages/react-plock/package.json index 6229b53..6faedd0 100644 --- a/packages/react-plock/package.json +++ b/packages/react-plock/package.json @@ -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 ", "homepage": "https://github.com/itsrennyman/react-plock#readme", diff --git a/packages/react-plock/src/Plock.tsx b/packages/react-plock/src/Plock.tsx index 6b4fe4e..c9b9534 100644 --- a/packages/react-plock/src/Plock.tsx +++ b/packages/react-plock/src/Plock.tsx @@ -85,7 +85,7 @@ export function Masonry({ display: "grid", alignItems: "start", gridColumnGap: gap, - gridTemplateColumns: `repeat(${columns}, minmax(0, 1fr)`, + gridTemplateColumns: `repeat(${columns}, minmax(0, 1fr))`, }} > {dataColumns.map((column, idx) => (