Skip to content

Commit

Permalink
Merge branch 'main' into resource_internal_error
Browse files Browse the repository at this point in the history
  • Loading branch information
JerryWu1234 authored Sep 26, 2024
2 parents 743f40a + 426ba59 commit fc2cc22
Show file tree
Hide file tree
Showing 326 changed files with 11,552 additions and 9,913 deletions.
3 changes: 2 additions & 1 deletion .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"@builder.io/qwik-labs",
"insights",
"@builder.io/qwik-react",
"@builder.io/qwik-worker"
"@builder.io/qwik-worker",
"qwik-cli-e2e"
],
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
"onlyUpdatePeerDependentsWhenOutOfRange": true
Expand Down
5 changes: 5 additions & 0 deletions .changeset/quiet-grapes-sit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@builder.io/qwik': patch
---

fix(optimizer): ignore unknown deps in graph causing crashes during build
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
contact_links:
- name: ✨ Feature requests Ideas
url: https://github.com/QwikDev/qwik-evolution/discussions
about: Propose new features and improvements and help shape Qwik
- name: 🤔 Support Question
url: https://qwik.dev/chat
about: This issue tracker is not for support questions. Please post your question on the Discord chat.
36 changes: 0 additions & 36 deletions .github/ISSUE_TEMPLATE/feature.yaml

This file was deleted.

31 changes: 12 additions & 19 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,33 @@
# Overview

<!--
The Qwik Team and Qwik Community are grateful for all PRs that improve Qwik. Thank you for your time and effort! Please be aware that not all PRs can be merged, but PRs that meet the following criteria will receive the highest priority:
a) Fixes to the core, and
The Qwik Team and Community appreciate all PRs. Thank you for your effort! Not all PRs can be merged, but those that meet the following criteria will be prioritized:
b) Framework functionality that can only be achieved by the core.
a) Core fixes, and
If your functionality can be delivered as a 3rd-Party Community Add-On, we encourage that route as it will likely provide a faster path to adoption.
b) Framework functionality achievable only by the core.
If you feel your functionality is of high value to everybody in the Qwik Community, we encourage socializing it in the Qwik Discord channels as the core team may take this up for inclusion in the core.
_— Build primitives is our mantra_
If this PR can be done as a 3rd-Party Community Add-On, we encourage that for quicker adoption.
If you believe your functionality is valuable to the entire Qwik Community, discuss it in the Qwik Discord channels for potential inclusion in the core.
-->

# What is it?

- [ ] Feature / enhancement
- [ ] Bug
- [ ] Docs / tests / types / typos
- [ ] Infra

# Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

# Use cases and why

<!-- Actual / expected behavior if it's a bug -->

- 1. One use case
- 2. Another use case
<!--
* Include a summary of the motivation and context for this PR
* Is it related to any opened issues? (please add them here)
-->

# Checklist:

- [ ] My code follows the [developer guidelines of this project](https://github.com/QwikDev/qwik/blob/main/CONTRIBUTING.md)
- [ ] I have performed a self-review of my own code
- [ ] I have made corresponding changes to the documentation
- [ ] I have ran `pnpm change` and documented my changes
- [ ] I have made corresponding changes to the Qwik docs
- [ ] Added new tests to cover the fix / functionality
126 changes: 76 additions & 50 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,9 +163,7 @@ jobs:
uses: actions/cache/restore@v4
with:
lookup-only: true
path: |
packages/docs/dist
packages/docs/server
path: docs-build-completed.txt
key: ${{ hashfiles('others-key.txt', 'packages/docs/**/*') }}
- name: 'check cache: insights'
id: cache-insights
Expand All @@ -189,7 +187,7 @@ jobs:
with:
lookup-only: true
path: e2e-tests-completed.txt
key: ${{ hashfiles('others-key.txt', 'starters/e2e/**/*', 'starters/apps/e2e/**/*') }}
key: ${{ hashfiles('others-key.txt', 'starters/**/*') }}

############ BUILD Qwik ############
build-qwik:
Expand Down Expand Up @@ -221,7 +219,7 @@ jobs:

- name: Print Qwik Dist Build
continue-on-error: true
run: tree packages/qwik/dist/
run: tree -a packages/qwik/dist/

- name: Save qwik cache
uses: actions/cache/save@v4
Expand All @@ -233,6 +231,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: artifact-qwik-no-optimizer
include-hidden-files: true
path: packages/qwik/dist/
if-no-files-found: error

Expand Down Expand Up @@ -302,6 +301,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: artifact-bindings-${{ matrix.settings.target }}
include-hidden-files: true
path: packages/qwik/bindings/
if-no-files-found: error

Expand Down Expand Up @@ -358,6 +358,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: artifact-qwik
include-hidden-files: true
path: |
packages/qwik/bindings
packages/qwik/dist
Expand Down Expand Up @@ -429,57 +430,62 @@ jobs:
key: ${{ needs.changes.outputs.hash-others }}

- name: Print QwikCity Lib Build
run: tree packages/qwik-city/lib/
run: tree -a packages/qwik-city/lib/

- name: Upload QwikCity Build Artifacts
uses: actions/upload-artifact@v4
with:
name: artifact-qwikcity
include-hidden-files: true
path: packages/qwik-city/lib/
if-no-files-found: error

- name: Print QwikLabs Lib Build
run: tree packages/qwik-labs/lib/ packages/qwik-labs/vite/
run: tree -a packages/qwik-labs/lib/ packages/qwik-labs/vite/

- name: Upload QwikLabs+React Build Artifacts
uses: actions/upload-artifact@v4
with:
name: artifact-qwiklabs
include-hidden-files: true
path: |
packages/qwik-labs/lib/
packages/qwik-labs/vite/
packages/qwik-labs/package.json
if-no-files-found: error

- name: Print qwik-react Lib Build
run: tree packages/qwik-react/lib/
run: tree -a packages/qwik-react/lib/

- name: Upload qwik-react Build Artifacts
uses: actions/upload-artifact@v4
with:
name: artifact-qwikreact
include-hidden-files: true
path: |
packages/qwik-react/lib/
packages/qwik-react/package.json
if-no-files-found: error

- name: Print Create Qwik CLI Dist Build
run: tree packages/create-qwik/dist/
run: tree -a packages/create-qwik/dist/

- name: Upload Create Qwik CLI Build Artifacts
uses: actions/upload-artifact@v4
with:
name: artifact-create-qwik
include-hidden-files: true
path: packages/create-qwik/dist/
if-no-files-found: error

- name: Print Eslint rules Dist Build
run: tree packages/eslint-plugin-qwik/dist/
run: tree -a packages/eslint-plugin-qwik/dist/

- name: Upload Eslint rules Build Artifacts
uses: actions/upload-artifact@v4
with:
name: artifact-eslint-plugin-qwik
include-hidden-files: true
path: packages/eslint-plugin-qwik/dist/
if-no-files-found: error

Expand Down Expand Up @@ -578,12 +584,13 @@ jobs:
- run: corepack pnpm install --frozen-lockfile
- name: Build Qwik Docs
run: pnpm run build.packages.docs
run: pnpm run build.packages.docs && echo ok > docs-build-completed.txt

- name: Save Docs Artifacts
uses: actions/upload-artifact@v4
with:
name: artifact-docs
include-hidden-files: true
path: |
packages/docs/dist
packages/docs/server
Expand All @@ -592,44 +599,7 @@ jobs:
uses: actions/cache/save@v4
with:
key: ${{ needs.changes.outputs.hash-docs }}
path: |
packages/docs/dist
packages/docs/server
# TODO: move this to a run_workflow action that has repository permissions and grabs the artifact
deploy-docs:
name: Cloudflare Pages Deployment
if: always() && needs.changes.outputs.build-docs == 'true'
needs:
- build-docs
- changes
runs-on: ubuntu-latest

steps:
- name: Check docs status
if: needs.build-docs.result != 'success'
run: exit 1

- name: Checkout
uses: actions/checkout@v4

- name: Restore docs cache
uses: actions/cache/restore@v4
with:
key: ${{ needs.changes.outputs.hash-docs }}
path: |
packages/docs/dist
packages/docs/server
# not the official version, so be careful when updating
- name: Deploy to Cloudflare Pages
uses: AdrianGonz97/refined-cf-pages-action@c7b767eef599f127d8ce2388d4ed2270d3b750af
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: 'qwik-docs'
directory: packages/docs/dist
githubToken: ${{ secrets.GITHUB_TOKEN }}
path: docs-build-completed.txt

############ UNIT TEST ############
test-unit:
Expand Down Expand Up @@ -746,6 +716,56 @@ jobs:
if: matrix.settings.host != 'windows-latest'
run: pnpm cli.validate

############ E2E CLI TEST ############
test-cli-e2e:
name: E2E CLI Tests
if: always() && needs.changes.outputs.build-e2e == 'true'

needs:
- build-other-packages
- changes
- test-unit

strategy:
matrix:
settings:
- host: ubuntu-latest
- host: macos-latest
- host: windows-latest

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

steps:
- name: Checkout
uses: actions/checkout@v4

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

- name: Download Build Artifacts
uses: actions/download-artifact@v4

- name: Move Distribution Artifacts
run: |
mv artifact-qwik/* packages/qwik/
mkdir -p packages/qwik-city/lib/
mv artifact-qwikcity/* packages/qwik-city/lib/
mkdir -p packages/create-qwik/dist/
mv artifact-create-qwik/* packages/create-qwik/dist/
mkdir -p packages/eslint-plugin-qwik/dist/
mv artifact-eslint-plugin-qwik/* packages/eslint-plugin-qwik/dist/
- run: pnpm install --frozen-lockfile

- name: CLI E2E Tests
run: pnpm run test.e2e-cli

########### LINT PACKAGES ############
lint-package:
name: Lint Package
Expand All @@ -765,6 +785,10 @@ jobs:

- run: pnpm install --frozen-lockfile

- name: SyncPack Check
if: always()
run: pnpm run lint.syncpack

- name: Prettier Check
if: always()
run: pnpm run lint.prettier
Expand All @@ -788,8 +812,10 @@ jobs:
- test-e2e
# test-unit runs when any packages changes, so we have to release
# on main, we always check if we have something to release
# don't run on forks
if: |
always() && (
always() &&
github.repository == 'QwikDev/qwik' && (
github.ref == 'refs/heads/main' ||
needs.test-unit.result == 'success'
)
Expand Down
Loading

0 comments on commit fc2cc22

Please sign in to comment.