Skip to content

Commit

Permalink
Merge branch 'main' into qwik-vite-output-array
Browse files Browse the repository at this point in the history
  • Loading branch information
@KingSora
KingSora authored Jun 11, 2024
2 parents 74e935d + 8d2dbdb commit a311c97
Show file tree
Hide file tree
Showing 28 changed files with 299 additions and 384 deletions.
56 changes: 33 additions & 23 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ on:
- 'build/**'
workflow_dispatch:
inputs:
node_version:
description: 'Node version to use for the build'
required: false
type: string
default: '20.x'
disttag:
description: 'Publish "@builder.io/qwik" to NPM using this dist-tag, push the git-tag to the repo and create a GitHub release. The "latest" and "next" dist-tags will use the version number already committed in package.json.'
required: true
Expand Down Expand Up @@ -97,12 +102,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4

- name: Setup Node
uses: actions/setup-node@v4.0.2
with:
node-version: 18.x
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

Expand All @@ -115,7 +120,7 @@ jobs:
pnpm install --frozen-lockfile
- name: Build Packages
run: pnpm tsm scripts/index.ts --tsc --build --cli --api --qwiklabs --eslint --platform-binding-wasm-copy --set-dist-tag="${{ github.event.inputs.disttag }}"
run: pnpm tsm scripts/index.ts --tsc --build --cli --api --qwiklabs --qwikcity --eslint --platform-binding-wasm-copy --set-dist-tag="${{ github.event.inputs.disttag }}"

- name: Print Qwik Dist Build
run: tree packages/qwik/dist/
Expand Down Expand Up @@ -150,7 +155,12 @@ jobs:
path: packages/eslint-plugin-qwik/dist/
if-no-files-found: error

############ BUILD WASM ############
- name: Publish packages for testing
run: pnpm dlx pkg-pr-new@0.0.8 publish --compact --pnpm ./packages/qwik/dist ./packages/qwik-city/lib ./packages/eslint-plugin-qwik/dist ./packages/create-qwik/dist
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

############ BUILD WASM #############
build-wasm:
name: Build WASM
runs-on: ubuntu-latest
Expand All @@ -165,14 +175,14 @@ jobs:
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4
if: ${{ needs.changes.outputs.fullbuild == 'true' }}

- name: Setup Node
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
uses: actions/setup-node@v4.0.2
with:
node-version: 18.x
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

Expand Down Expand Up @@ -258,14 +268,14 @@ jobs:
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4
if: ${{ needs.changes.outputs.fullbuild == 'true' }}

- name: Setup Node
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
uses: actions/setup-node@v4.0.2
with:
node-version: 18.x
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

Expand Down Expand Up @@ -325,14 +335,14 @@ jobs:
if: ${{ needs.changes.outputs.insightsbuild == 'true' }}
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4
if: ${{ needs.changes.outputs.insightsbuild == 'true' }}

- name: Setup Node
if: ${{ needs.changes.outputs.insightsbuild == 'true' }}
uses: actions/setup-node@v4.0.2
with:
node-version: 18.x
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

Expand All @@ -358,12 +368,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4

- name: Setup Node
uses: actions/setup-node@v4.0.2
with:
node-version: 18.x
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

Expand Down Expand Up @@ -402,14 +412,14 @@ jobs:
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4
if: ${{ needs.changes.outputs.fullbuild == 'true' }}

- name: Setup Node
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
uses: actions/setup-node@v4.0.2
with:
node-version: 18.x
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

Expand Down Expand Up @@ -501,12 +511,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4

- name: Setup Node
uses: actions/setup-node@v4.0.2
with:
node-version: 18.x
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

Expand Down Expand Up @@ -572,10 +582,10 @@ jobs:
settings:
- host: ubuntu-latest
browser: chromium
node: 18.x
node: 20.x
- host: macos-latest
browser: webkit
node: 18.x
node: 20.x

runs-on: ${{ matrix.settings.host }}

Expand All @@ -584,7 +594,7 @@ jobs:
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4
if: ${{ needs.changes.outputs.fullbuild == 'true' }}

- name: Setup Node ${{ matrix.settings.node }}
Expand Down Expand Up @@ -645,12 +655,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4

- name: Setup Node
uses: actions/setup-node@v4.0.2
with:
node-version: 18.x
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

Expand Down Expand Up @@ -741,12 +751,12 @@ jobs:
- name: Checkout
uses: actions/checkout@v4.1.1

- uses: pnpm/action-setup@v2.2.4
- uses: pnpm/action-setup@v4

- name: Setup Node
uses: actions/setup-node@v4.0.2
with:
node-version: 18.x
node-version: 20.x
cache: 'pnpm'
registry-url: https://registry.npmjs.org/

Expand Down
70 changes: 0 additions & 70 deletions .github/workflows/codeql-analysis.yml
View file

This file was deleted.

8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qwik-monorepo",
"version": "1.5.5",
"version": "1.5.6",
"comments": {
"01": "devDependencies includes reference to @builder.io/qwik: workspace: *. This is needed or e2e tests will fail",
"02": " It would be nice to be able to remove this dependency and fix the test.",
Expand Down Expand Up @@ -68,8 +68,8 @@
"@clack/prompts": "^0.7.0",
"@eslint/eslintrc": "^3.0.2",
"@mdx-js/mdx": "^3.0.1",
"@microsoft/api-documenter": "^7.24.2",
"@microsoft/api-extractor": "^7.43.1",
"@microsoft/api-documenter": "7.24.2",
"@microsoft/api-extractor": "7.43.1",
"@napi-rs/cli": "^2.18.0",
"@napi-rs/triples": "^1.2.0",
"@node-rs/helper": "^1.5.0",
Expand Down Expand Up @@ -192,7 +192,7 @@
"preinstall": "npx only-allow pnpm",
"prettier.fix": "prettier --cache --write .",
"qwik-save-artifacts": "tsm ./scripts/qwik-save-artifacts.ts",
"release.prepare": "pnpm lint && pnpm test.unit --run && tsm scripts/index.ts --tsc --build --api --eslint --platform-binding --wasm --prepare-release",
"release.prepare": "pnpm build --prepare-release",
"serve": "tsm --inspect --conditions=development starters/dev-server.ts 3300",
"serve.debug": "tsm --inspect-brk --conditions=development starters/dev-server.ts 3300",
"start": "concurrently \"npm:build.watch\" \"npm:tsc.watch\" -n build,tsc -c green,cyan",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-qwik/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "create-qwik",
"description": "Interactive CLI for create Qwik projects and adding features.",
"version": "1.5.5",
"version": "1.5.6",
"author": "Builder.io Team",
"bin": "./create-qwik.cjs",
"bugs": "https://github.com/QwikDev/qwik/issues",
Expand Down
Loading

0 comments on commit a311c97

Please sign in to comment.