From 7697daced26c280de05bcb825b654e22bd96b19f Mon Sep 17 00:00:00 2001 From: Sukaato Date: Sun, 29 Sep 2024 14:07:55 +0200 Subject: [PATCH] ci: update actions --- .../actions/archive-download/action.yml | 14 ---------- .github/workflows/actions/build/action.yml | 8 +++--- .github/workflows/actions/bump/action.yml | 10 ++++--- .github/workflows/actions/quality/action.yml | 4 +-- .github/workflows/actions/test/action.yml | 6 ++--- .github/workflows/release.yml | 27 +++++++++---------- package-lock.json | 3 --- packages/vue/package.json | 12 +++++---- 8 files changed, 35 insertions(+), 49 deletions(-) delete mode 100644 .github/workflows/actions/archive-download/action.yml diff --git a/.github/workflows/actions/archive-download/action.yml b/.github/workflows/actions/archive-download/action.yml deleted file mode 100644 index 7a8cbce..0000000 --- a/.github/workflows/actions/archive-download/action.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: Archive Download -description: Downloads and decompresses an archive from a previous job -inputs: - package: - description: Package name - node-version: - description: Node Version -runs: - using: composite - steps: - - uses: actions/download-artifact@v4 - with: - name: ${{ inputs.package }}-${{ inputs.node-version }} - path: ./packages/${{ inputs.package }}/poppy-ui-${{ inputs.package }}-${{ inputs.node-version }}.tgz diff --git a/.github/workflows/actions/build/action.yml b/.github/workflows/actions/build/action.yml index d548bf5..2425dc2 100644 --- a/.github/workflows/actions/build/action.yml +++ b/.github/workflows/actions/build/action.yml @@ -19,20 +19,20 @@ runs: node-version: ${{ inputs.node-version }} - name: Install Package - run: npm -w @poppy-ui/${{ inputs.package }} install + run: npm install -w @poppy-ui/${{ inputs.package }} shell: bash - name: Install Core if: inputs.package != 'core' - run: npm -w @poppy-ui/${{ inputs.package }} install @poppy-ui/core @poppy-ui/docs + run: npm install @poppy-ui/core @poppy-ui/docs -w @poppy-ui/${{ inputs.package }} shell: bash - name: Build - run: npm -w @poppy-ui/${{ inputs.package }} run build --if-present + run: npm run build -w @poppy-ui/${{ inputs.package }} --if-present shell: bash - name: Pack - run: npm -w @poppy-ui/${{ inputs.package }} pack + run: npm pack -w @poppy-ui/${{ inputs.package }} shell: bash - name: Rename tarball diff --git a/.github/workflows/actions/bump/action.yml b/.github/workflows/actions/bump/action.yml index 9037522..b45dfe0 100644 --- a/.github/workflows/actions/bump/action.yml +++ b/.github/workflows/actions/bump/action.yml @@ -25,8 +25,9 @@ runs: id: bump-ver if: inputs.preid == '' run: | - npm -ws version ${{ inputs.version }} --include-workspace-root --no-git-tag-version -m"ci(version): bump to v%s" - version=$(npm version --json | jq -r '.root') + npm version ${{ inputs.version }} -ws --include-workspace-root --no-git-tag-version -m"ci(version): bump to v%s" + version=v$(npm version --json | jq -r '.root') + git add . echo "version=$version" >> $GITHUB_OUTPUT shell: bash @@ -34,7 +35,8 @@ runs: id: bump-pre if: inputs.preid != '' run: | - npm -ws version ${{ inputs.version }} --preid=${{ inputs.preid }} --include-workspace-root --no-git-tag-version -m"ci(version): bump to v%s" - version=$(npm version --json | jq -r '.root') + npm version ${{ inputs.version }} --preid=${{ inputs.preid }} -ws --include-workspace-root --no-git-tag-version -m"ci(version): bump to v%s" + version=v$(npm version --json | jq -r '.root') + git add . echo "version=$version" >> $GITHUB_OUTPUT shell: bash diff --git a/.github/workflows/actions/quality/action.yml b/.github/workflows/actions/quality/action.yml index 01de73c..21e3381 100644 --- a/.github/workflows/actions/quality/action.yml +++ b/.github/workflows/actions/quality/action.yml @@ -24,12 +24,12 @@ runs: node-version: ${{ inputs.node-version }} - name: Install Package - run: npm -w @poppy-ui/${{ inputs.package }} install + run: npm install -w @poppy-ui/${{ inputs.package }} shell: bash - name: Install Core if: inputs.package != 'core' - run: npm -w @poppy-ui/${{ inputs.package }} install @poppy-ui/core @poppy-ui/docs + run: npm install @poppy-ui/core @poppy-ui/docs -w @poppy-ui/${{ inputs.package }} shell: bash - name: Format diff --git a/.github/workflows/actions/test/action.yml b/.github/workflows/actions/test/action.yml index b80e6b6..f18efe2 100644 --- a/.github/workflows/actions/test/action.yml +++ b/.github/workflows/actions/test/action.yml @@ -19,13 +19,13 @@ runs: node-version: ${{ inputs.node-version }} - name: Install - run: npm -w @poppy-ui/${{ inputs.package }} install + run: npm install -w @poppy-ui/${{ inputs.package }} shell: bash - name: Test - run: npm -w @poppy-ui/${{ inputs.package }} run test:spec --if-present -- --passWithNoTests --coverage + run: npm run test:spec -w @poppy-ui/${{ inputs.package }} --if-present -- --passWithNoTests --coverage shell: bash - name: Test e2e - run: npm -w @poppy-ui/${{ inputs.package }} run test:e2e --if-present -- --pass-with-no-tests --reporter github + run: npm run test:e2e -w @poppy-ui/${{ inputs.package }} --if-present -- --pass-with-no-tests --reporter github shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d7c8622..2ad8c75 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -109,17 +109,17 @@ jobs: - name: Build - Core run: | - npm -w @poppy-ui/core install - npm -w @poppy-ui/core run build --if-present + npm install -w @poppy-ui/core + npm run build --if-present -w @poppy-ui/core - name: Build - Vue run: | - npm -w=@poppy-ui/vue uninstall @poppy-ui/core - npm -w=@poppy-ui/vue uninstall @poppy-ui/docs - npm -w=@poppy-ui/vue install @poppy-ui/core@${{ steps.bump.outputs.version }} - npm -w=@poppy-ui/vue install -D @poppy-ui/docs@${{ steps.bump.outputs.version }} + npm uninstall @poppy-ui/core -w @poppy-ui/vue + npm uninstall @poppy-ui/docs -w @poppy-ui/vue + npm install @poppy-ui/core@${{ steps.bump.outputs.version }} -w @poppy-ui/vue + npm install @poppy-ui/docs@${{ steps.bump.outputs.version }} -D -w @poppy-ui/vue - npm -w @poppy-ui/core run build --if-present + npm run build --if-present -w @poppy-ui/vue publish: needs: @@ -146,9 +146,8 @@ jobs: - name: Publish Core run: | - npm run build - npm publish - working-directory: packages/core + npm run build -w @poppy-ui/core + npm publish -w @poppy-ui/core env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} @@ -161,10 +160,10 @@ jobs: - name: Upgrade - Vue run: | - npm -w=@poppy-ui/vue uninstall @poppy-ui/core - npm -w=@poppy-ui/vue uninstall @poppy-ui/docs - npm -w=@poppy-ui/vue install @poppy-ui/core@${{ steps.bump.outputs.version }} - npm -w=@poppy-ui/vue install -D @poppy-ui/docs@${{ steps.bump.outputs.version }} + npm uninstall @poppy-ui/core -w @poppy-ui/vue + npm uninstall @poppy-ui/docs -w @poppy-ui/vue + npm install @poppy-ui/core@${{ steps.bump.outputs.version }} -w @poppy-ui/vue + npm install -D @poppy-ui/docs@${{ steps.bump.outputs.version }} -w @poppy-ui/vue - name: Publish Vue run: | diff --git a/package-lock.json b/package-lock.json index d6b41a0..5fca15d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8539,9 +8539,6 @@ "name": "@poppy-ui/vue", "version": "0.2.0", "license": "MIT", - "dependencies": { - "@poppy-ui/core": "0.2.0" - }, "devDependencies": { "@biomejs/biome": "^1.9.2", "@poppy-ui/docs": "0.2.0", diff --git a/packages/vue/package.json b/packages/vue/package.json index 432d339..96fc527 100644 --- a/packages/vue/package.json +++ b/packages/vue/package.json @@ -15,7 +15,10 @@ }, "main": "./dist/index.js", "types": "./dist/types/index.d.ts", - "files": ["dist/", "css/"], + "files": [ + "dist/", + "css/" + ], "keywords": [ "daisy-ui", "framework", @@ -45,9 +48,6 @@ "lint:fix": "biome lint --fix", "biome": "biome" }, - "dependencies": { - "@poppy-ui/core": "0.2.0" - }, "devDependencies": { "@biomejs/biome": "^1.9.2", "@poppy-ui/docs": "0.2.0", @@ -64,5 +64,7 @@ "attributes": "dist/vetur/attributes.json" }, "web-types": "dist/web-types.json", - "sideEffects": ["css/*.css"] + "sideEffects": [ + "css/*.css" + ] }