From 29cde26cbd05ea4220753453f68298cf32a2e0c7 Mon Sep 17 00:00:00 2001 From: Blujedis Date: Sat, 2 Jul 2022 17:17:08 -0700 Subject: [PATCH] feat: update workflow --- .github/workflows/release.yml | 26 +++++++++++++++++--------- .husky/commit-msg | 2 +- .husky/pre-commit | 4 ++++ package.json | 10 +++------- pnpm-lock.yaml | 16 ++++++++++++++-- 5 files changed, 39 insertions(+), 19 deletions(-) create mode 100755 .husky/pre-commit diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 83083ab..20b53d4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,15 +11,23 @@ jobs: runs-on: ubuntu-latest if: ${{ github.ref == 'refs/heads/main'}} steps: - - uses: actions/checkout@main - - name: Setup Node.js 14.x - uses: actions/setup-node@v2 - with: - node-version: 14.x - - run: npm ci - - run: npm run build --if-present - - run: npm test - - run: npx semantic-release + - uses: actions/checkout@v2 + - uses: pnpm/action-setup@v2.2.2 + with: + version: 7 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + cache: 'pnpm' + - name: Install dependencies + run: pnpm install + - name: Build application + run: npm run build --if-present + - name: Test application + run: npm test --if-present + - name: Create semantic release + run: npx semantic-release env: GITHUB_TOKEN: ${{ secrets.SERVICE_ACCT }} NPM_TOKEN: ${{ secrets.NPM_TOKEN_BLUREG }} \ No newline at end of file diff --git a/.husky/commit-msg b/.husky/commit-msg index 741b0fb..9ced979 100755 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -1,4 +1,4 @@ #!/usr/bin/env sh . "$(dirname -- "$0")/_/husky.sh" -pnpm commitlint --edit +npx --no -- commitlint --edit "" diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 0000000..610c2a5 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/usr/bin/env sh +. "$(dirname -- "$0")/_/husky.sh" + +npm test diff --git a/package.json b/package.json index 866e53b..97ea5f2 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "types": "tsc --emitDeclarationOnly", "dev": "tsup --watch src & npm run types", "docs": "rimraf docs/ && typedoc src/index.ts && touch ./docs/.nojekyll", + "test": "echo \"Warn: no test specified in vite-plugin-svelte-svgr\"", "prepare": "husky install", "prepublishOnly": "npm run build && npm run docs", "semantic-release": "semantic-release --branches main" @@ -61,11 +62,6 @@ "esm" ] }, - "husky": { - "hooks": { - "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" - } - }, "dependencies": { "@rollup/pluginutils": "^4.2.1", "picomatch": "^2.3.1", @@ -79,7 +75,7 @@ "semantic-release": "^19.0.3", "@commitlint/cli": "^17.0.3", "@commitlint/config-conventional": "^17.0.3", - "husky": "^8.0.1", + "husky": "^8.0.0", "typedoc": "^0.23.5", "typescript": "^4.2.4", "vite": "^2.9.13", @@ -90,4 +86,4 @@ "svelte": "3.x", "vite": "^2.9.13" } -} +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c88038b..3d5f70e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,7 +6,7 @@ specifiers: '@rollup/pluginutils': ^4.2.1 '@types/node': ^15.0.1 '@types/svgo': ^2.3.0 - husky: ^8.0.1 + husky: ^8.0.0 picomatch: ^2.3.1 prettier: ^2.2.1 rimraf: ^3.0.2 @@ -21,7 +21,6 @@ specifiers: dependencies: '@rollup/pluginutils': 4.2.1 picomatch: 2.3.1 - rimraf: 3.0.2 svgo: 2.8.0 devDependencies: @@ -31,6 +30,7 @@ devDependencies: '@types/svgo': 2.6.3 husky: 8.0.1 prettier: 2.7.1 + rimraf: 3.0.2 semantic-release: 19.0.3 svelte: 3.48.0 tsup: 6.1.2_typescript@4.7.4 @@ -649,6 +649,7 @@ packages: /balanced-match/1.0.2: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} + dev: true /before-after-hook/2.2.2: resolution: {integrity: sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==} @@ -672,6 +673,7 @@ packages: dependencies: balanced-match: 1.0.2 concat-map: 0.0.1 + dev: true /brace-expansion/2.0.1: resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} @@ -827,6 +829,7 @@ packages: /concat-map/0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} + dev: true /conventional-changelog-angular/5.0.13: resolution: {integrity: sha512-i/gipMxs7s8L/QeuavPF2hLnJgH6pEZAttySB6aiQLWcX3puWDL3ACVmvBhJGxnAy52Qc15ua26BufY6KpmrVA==} @@ -1430,6 +1433,7 @@ packages: /fs.realpath/1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} + dev: true /fsevents/2.3.2: resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} @@ -1492,6 +1496,7 @@ packages: minimatch: 3.1.2 once: 1.4.0 path-is-absolute: 1.0.1 + dev: true /global-dirs/0.1.1: resolution: {integrity: sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==} @@ -1627,9 +1632,11 @@ packages: dependencies: once: 1.4.0 wrappy: 1.0.2 + dev: true /inherits/2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} + dev: true /ini/1.3.8: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} @@ -1972,6 +1979,7 @@ packages: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: brace-expansion: 1.1.11 + dev: true /minimatch/5.1.0: resolution: {integrity: sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==} @@ -2170,6 +2178,7 @@ packages: resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==} dependencies: wrappy: 1.0.2 + dev: true /onetime/5.1.2: resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==} @@ -2310,6 +2319,7 @@ packages: /path-is-absolute/1.0.1: resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==} engines: {node: '>=0.10.0'} + dev: true /path-key/3.1.1: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} @@ -2533,6 +2543,7 @@ packages: hasBin: true dependencies: glob: 7.1.6 + dev: true /rollup/2.75.7: resolution: {integrity: sha512-VSE1iy0eaAYNCxEXaleThdFXqZJ42qDBatAwrfnPlENEZ8erQ+0LYX4JXOLPceWfZpV1VtZwZ3dFCuOZiSyFtQ==} @@ -3168,6 +3179,7 @@ packages: /wrappy/1.0.2: resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==} + dev: true /xtend/4.0.2: resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}