diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 14353cd..8cbca5c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,9 +23,24 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 - - name: Install pnpm - run: npm i pnpm@7.23.0 -g - - name: Install + - uses: pnpm/action-setup@v2 + name: Install pnpm + id: pnpm-install + with: + run_install: false + - name: Get pnpm store directory + id: pnpm-cache + shell: bash + run: | + echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT + - uses: actions/cache@v3 + name: Setup pnpm cache + with: + path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- + - name: Install run: | pnpm install --frozen-lockfile=false - name: Build diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4797a53..e44968b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,10 +24,26 @@ jobs: uses: actions/setup-node@v2 with: node-version: 14 - - name: install pnpm - run: npm i pnpm@7.23.0 -g - - name: install dependencies - run: pnpm install --frozen-lockfile=false + - uses: pnpm/action-setup@v2 + name: Install pnpm + id: pnpm-install + with: + run_install: false + - name: Get pnpm store directory + id: pnpm-cache + shell: bash + run: | + echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT + - uses: actions/cache@v3 + name: Setup pnpm cache + with: + path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- + - name: Install + run: | + pnpm install --frozen-lockfile=false - name: create and publish versions uses: changesets/action@v1 with: diff --git a/.github/workflows/snapshot-release.yml b/.github/workflows/snapshot-release.yml index 3e1c3e3..c6ab58e 100644 --- a/.github/workflows/snapshot-release.yml +++ b/.github/workflows/snapshot-release.yml @@ -1,8 +1,11 @@ -name: Release +name: Snapshot Release on: push: branches: - snapshot + - 'hotfix/**' + paths: + - '.changeset/**' env: CI: true jobs: @@ -22,17 +25,31 @@ jobs: uses: actions/setup-node@v2 with: node-version: 14 - - name: install pnpm - run: npm i pnpm@7.23.0 -g - - name: install dependencies - run: pnpm install --frozen-lockfile=false - - name: create and publish versions - uses: changesets/action@v1 + - uses: pnpm/action-setup@v2 + name: Install pnpm + id: pnpm-install + with: + run_install: false + - name: Get pnpm store directory + id: pnpm-cache + shell: bash + run: | + echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT + - uses: actions/cache@v3 + name: Setup pnpm cache with: - version: pnpm ci:snapshot - commit: "chore: update versions" - title: "chore: update versions" - publish: pnpm ci:prerelease + path: ${{ steps.pnpm-cache.outputs.STORE_PATH }} + key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.os }}-pnpm-store- + - name: Install + run: | + pnpm install --frozen-lockfile=false + - name: create and publish versions + run: | + pnpm changeset pre enter beta + pnpm ci:snapshot + pnpm ci:prerelease env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file diff --git a/package.json b/package.json index 2bea4a4..09e56f3 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "rollup-plugin-node-externals": "5.1.2", "ts-node": "^10.7.0", "tslib": "2.4.0", - "ttypescript": "1.5.13", + "ttypescript": "1.5.15", "typescript": "4.4.3", "typescript-transform-paths": "3.3.1", "vite": "^4.3.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0ebdfe9..93b691f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,7 +28,7 @@ importers: rollup-plugin-node-externals: 5.1.2 ts-node: ^10.7.0 tslib: 2.4.0 - ttypescript: 1.5.13 + ttypescript: 1.5.15 typescript: 4.4.3 typescript-transform-paths: 3.3.1 vite: ^4.3.2 @@ -60,7 +60,7 @@ importers: rollup-plugin-node-externals: 5.1.2_rollup@3.19.1 ts-node: 10.9.1_m64khrxlcwyzcm23z7cdilwtqi tslib: 2.4.0 - ttypescript: 1.5.13_yfl7cqpkld7lzicr772fsmvr3q + ttypescript: 1.5.15_yfl7cqpkld7lzicr772fsmvr3q typescript: 4.4.3 typescript-transform-paths: 3.3.1_typescript@4.4.3 vite: 4.3.2_@types+node@17.0.22 @@ -70,7 +70,7 @@ importers: examples/vite: specifiers: '@changesets/cli': ^2.24.4 - '@svgr-rs/svgrs-plugin': workspace:^0.0.2 + '@svgr-rs/svgrs-plugin': workspace:^0.1.2 '@tailwindcss/typography': 0.5.7 '@types/react': ^18.0.18 '@types/react-dom': ^18.0.6 @@ -123,7 +123,7 @@ importers: '@pmmmwh/react-refresh-webpack-plugin': 0.5.5 '@rematch/core': 2.2.0 '@soda/friendly-errors-webpack-plugin': 1.8.1 - '@svgr-rs/svgrs-plugin': workspace:^0.0.2 + '@svgr-rs/svgrs-plugin': workspace:^0.1.2 '@tailwindcss/typography': 0.5.2 '@teamsupercell/typings-for-css-modules-loader': 2.5.1 '@types/html-webpack-plugin': 3.2.6 @@ -15666,8 +15666,8 @@ packages: yargs: 17.7.1 dev: true - /ttypescript/1.5.13_yfl7cqpkld7lzicr772fsmvr3q: - resolution: {integrity: sha512-KT/RBfGGlVJFqEI8cVvI3nMsmYcFvPSZh8bU0qX+pAwbi7/ABmYkzn7l/K8skw0xmYjVCoyaV6WLsBQxdadybQ==} + /ttypescript/1.5.15_yfl7cqpkld7lzicr772fsmvr3q: + resolution: {integrity: sha512-48ykDNHzFnPMnv4hYX1P8Q84TvCZyL1QlFxeuxsuZ48X2+ameBgPenvmCkHJtoOSxpoWTWi8NcgNrRnVDOmfSg==} hasBin: true peerDependencies: ts-node: '>=8.0.2'