ci: update actions

CheeseGrinder · Sep 29, 2024 · 7697dac · 7697dac
1 parent 66a072d
commit 7697dac
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 49 deletions.
diff --git a/.github/workflows/actions/archive-download/action.yml b/.github/workflows/actions/archive-download/action.yml
diff --git 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
@@ -25,16 +25,18 @@ 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
 
     - name: Bump Pre Version
       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
@@ -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
@@ -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
@@ -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
diff --git 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"
+  ]
 }