Skip to content

Commit 4b75378

Browse files
chore: bump qwik dependencies for v0.15 (#157)
1 parent 77a8038 commit 4b75378

File tree

5 files changed

+114
-27
lines changed

5 files changed

+114
-27
lines changed

.github/workflows/release.yml

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,26 @@
11
name: Release
22

33
on:
4-
- workflow_dispatch
4+
workflow_dispatch:
5+
inputs:
6+
type:
7+
required: true
8+
type: choice
9+
description: Release type
10+
options:
11+
- patch
12+
- minor
13+
- major
14+
- previous
15+
default: 'patch'
16+
17+
package:
18+
required: true
19+
type: choice
20+
description: Package to release
21+
options:
22+
- qwik-nx
23+
- create-qwik-nx
524

625
jobs:
726
test:
@@ -25,9 +44,7 @@ jobs:
2544

2645
release:
2746
runs-on: ubuntu-latest
28-
2947
needs: [test]
30-
3148
steps:
3249
- uses: actions/checkout@v3
3350
with:
@@ -36,7 +53,20 @@ jobs:
3653
uses: ./.github/actions/setup
3754

3855
- name: Release
39-
uses: ./.github/actions/release
56+
env:
57+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
58+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
59+
run: pnpx nx run ${{ inputs.package }}:version-publish --configuration=${{ inputs.type }} --push=true --baseBranch=${{ github.ref_name }}
60+
61+
- name: Tag last-release
62+
if: github.ref == 'refs/heads/main'
63+
shell: bash
64+
run: git tag -f last-release
65+
66+
- name: Push changes
67+
uses: ad-m/github-push-action@master
4068
with:
4169
github_token: ${{ secrets.GITHUB_TOKEN }}
42-
npm_token: ${{ secrets.NPM_TOKEN }}
70+
branch: ${{ github.ref }}
71+
force: true
72+
tags: true

packages/qwik-nx/migrations.json

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,50 @@
152152
"version": "^0.28.5"
153153
}
154154
}
155+
},
156+
"0.15.8": {
157+
"version": "0.15.8",
158+
"packages": {
159+
"@builder.io/qwik": {
160+
"version": "~1.1.1"
161+
},
162+
"@builder.io/qwik-city": {
163+
"version": "~1.1.1"
164+
},
165+
"@types/eslint": {
166+
"version": "~8.37.0"
167+
},
168+
"@types/node": {
169+
"version": "^18.16.1"
170+
},
171+
"@typescript-eslint/eslint-plugin": {
172+
"version": "^5.59.1"
173+
},
174+
"@typescript-eslint/parser": {
175+
"version": "^5.59.1"
176+
},
177+
"eslint-plugin-qwik": {
178+
"version": "~1.1.1"
179+
},
180+
"typescript": {
181+
"version": "^5.0.4"
182+
},
183+
"undici": {
184+
"version": "^5.22.0"
185+
},
186+
"vite": {
187+
"version": "^4.3.5"
188+
},
189+
"vitest": {
190+
"version": "^0.30.1"
191+
},
192+
"vite-tsconfig-paths": {
193+
"version": "~4.2.0"
194+
},
195+
"storybook-framework-qwik": {
196+
"version": "^0.2.0"
197+
}
198+
}
155199
}
156200
}
157201
}

packages/qwik-nx/project.json

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,21 @@
7676
"executor": "@jscutlery/semver:version",
7777
"options": {
7878
"noVerify": true,
79-
"push": true,
79+
"push": false,
8080
"releaseAs": "patch",
8181
"postTargets": ["qwik-nx:publish", "qwik-nx:push-to-github"]
82-
}
83-
},
84-
"version-publish-minor": {
85-
"executor": "@jscutlery/semver:version",
86-
"options": {
87-
"noVerify": true,
88-
"push": true,
89-
"releaseAs": "minor",
90-
"postTargets": ["qwik-nx:publish", "qwik-nx:push-to-github"]
82+
},
83+
"configurations": {
84+
"patch": {},
85+
"minor": {
86+
"releaseAs": "minor"
87+
},
88+
"major": {
89+
"releaseAs": "major"
90+
},
91+
"previous": {
92+
"postTargets": ["qwik-nx:publish:previous", "qwik-nx:push-to-github"]
93+
}
9194
}
9295
},
9396
"publish": {
@@ -98,6 +101,9 @@
98101
"configurations": {
99102
"local": {
100103
"registry": "http://localhost:4873"
104+
},
105+
"previous": {
106+
"tag": "previous"
101107
}
102108
}
103109
},

packages/qwik-nx/src/utils/storybook.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import type { PluginOption, UserConfig } from 'vite';
1+
import { PluginOption, UserConfig, mergeConfig } from 'vite';
22
import {
33
type QwikVitePluginOptions,
44
qwikVite,
@@ -13,7 +13,13 @@ export function withNx(
1313
config: UserConfig,
1414
qwikViteOpts?: QwikVitePluginOptions
1515
): UserConfig {
16-
const updated = { ...config };
16+
const updated = mergeConfig(config, {
17+
build: {
18+
rollupOptions: {
19+
external: ['@qwik-city-sw-register'],
20+
},
21+
},
22+
});
1723
updated.plugins = updated.plugins?.map((plugin: PluginOption) => {
1824
switch ((plugin as any)?.name) {
1925
case 'vite-plugin-qwik':

packages/qwik-nx/src/utils/versions.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// qwik packages
2-
export const qwikVersion = '~0.100.0';
3-
export const qwikCityVersion = '~0.100.0';
4-
export const qwikEslintPluginVersion = '~0.100.0';
2+
export const qwikVersion = '~1.1.1';
3+
export const qwikCityVersion = '~1.1.1';
4+
export const qwikEslintPluginVersion = '~1.1.1';
55

66
// css preprocessors
77
export const sassVersion = '~1.56.1';
88
export const lessVersion = '~4.1.3';
99
export const stylusVersion = '~0.59.0';
1010

11-
export const undiciVersion = '^5.21.0';
12-
export const viteVersion = '~4.2.1';
13-
export const viteTsconfigPathsVersion = '~4.0.7';
14-
export const vitestVersion = '^0.28.5';
11+
export const undiciVersion = '^5.22.0';
12+
export const viteVersion = '^4.3.3';
13+
export const viteTsconfigPathsVersion = '~4.2.0';
14+
export const vitestVersion = '^0.30.1';
1515

1616
export const autoprefixerVersion = '~10.4.11';
1717
export const postcssVersion = '~8.4.16';
@@ -25,7 +25,7 @@ export const wranglerVersion = '^2.8.0';
2525
export const nxCloudflareWrangler = '^2.0.0';
2626

2727
// storybook
28-
export const storybookFrameworkQwikVersion = '^0.0.8';
28+
export const storybookFrameworkQwikVersion = '^0.2.0';
2929
export const typesMdx = '^2.0.3';
3030

3131
// react integartion
@@ -45,5 +45,6 @@ export const tsEslintVersion = '~5.43.0';
4545
export const prettierVersion = '~2.8.7';
4646
export const typescriptVersion = '~5.0.2';
4747
export const nodeFetchVersion = '~3.3.0';
48-
export const typesNodeVersion = '^18.15.9';
49-
export const typesEslint = '~8.21.3';
48+
export const typesNodeVersion = '^18.16.1';
49+
export const typesEslint = '~8.37.0';
50+
export const tsMorphVersion = '^17.0.0';

0 commit comments

Comments
 (0)