Skip to content

Commit

Permalink
Merge branch 'main' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
zanettin committed Jun 21, 2023
2 parents 87617dd + 86877ee commit ce1e587
Show file tree
Hide file tree
Showing 1,558 changed files with 87,448 additions and 23,645 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,11 @@ tsdoc-metadata.json
scripts/**/*
**/server/**/*.js
*.tsbuildinfo
packages/docs/api/**/*
packages/docs/src/routes/examples/apps/**/*
packages/docs/src/routes/playground/app/**/*
packages/docs/src/routes/tutorial/**/*
starters/apps/base
starters/apps/library
starters/templates
vite.config.ts
2 changes: 2 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,7 @@ module.exports = {
'no-only-tests/no-only-tests': 'error',
'@typescript-eslint/no-unused-vars': 'off',
'@typescript-eslint/no-var-requires': 'off',
curly: 'error',
'no-new-func': 'error',
},
};
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ body:
- Qwik React
- Qwik City (routing)
- Starters / CLI
- Qwik Playground
validations:
required: true

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/docs_suggestion.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: 📖 Documentation Suggestion
description: Suggestions on how we can improve the documentation.
title: '[📖]'
labels: [documentation]
labels: ['COMP: docs']
body:
- type: markdown
attributes:
Expand Down
19 changes: 18 additions & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,25 @@
# 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
b) Framework functionality that can only be achieved by the core.
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.
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_
-->

# What is it?

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

# Description

Expand Down
89 changes: 50 additions & 39 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: Qwik CI

on:
push:
pull_request:
push:
branches:
- main
- next
workflow_dispatch:
inputs:
disttag:
Expand All @@ -27,6 +30,11 @@ jobs:
fullbuild: ${{ steps.filter.outputs.fullbuild == 'true' || github.event.inputs.disttag != '' }}

steps:
- name: Cancel Previous Runs
uses: styfle/cancel-workflow-action@0.11.0
if: github.event_name == 'pull_request'
with:
access_token: ${{ secrets.GITHUB_TOKEN }}
- name: Branch
run: echo "${{ github.ref }}"
- name: NPM Dist Tag
Expand All @@ -49,6 +57,8 @@ jobs:
- 'tsconfig.json'
- 'pnpm-lock.yaml'
- 'Cargo.yaml'
- '.github/workflows/*.yaml'
- 'scripts/*.ts'
- name: Print fullbuild output
run: echo ${{ steps.filter.outputs.fullbuild == 'true' || github.event.inputs.disttag != '' }}

Expand All @@ -61,13 +71,11 @@ jobs:
uses: actions/checkout@v3

- uses: pnpm/action-setup@v2.2.4
with:
version: 7

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

Expand All @@ -76,7 +84,7 @@ jobs:
- name: Install NPM Dependencies
run: pnpm install --frozen-lockfile

- name: Build Package
- name: Build Packages
run: pnpm tsm scripts/index.ts --tsc --build --cli --api --set-dist-tag="${{ github.event.inputs.disttag }}"

- name: Print Qwik Dist Build
Expand Down Expand Up @@ -129,14 +137,12 @@ jobs:

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

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

Expand Down Expand Up @@ -225,14 +231,12 @@ jobs:

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

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

Expand Down Expand Up @@ -315,14 +319,12 @@ jobs:

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

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

Expand Down Expand Up @@ -370,9 +372,9 @@ jobs:
path: packages/qwik/dist/*
if-no-files-found: error

- name: Build QwikCity
- name: Build QwikCity / QwikLabs
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
run: pnpm tsm scripts/index.ts --tsc --qwikcity --api
run: pnpm tsm scripts/index.ts --tsc --qwikcity --qwiklabs --api

- name: Print QwikCity Lib Build
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
Expand All @@ -386,12 +388,6 @@ jobs:
path: packages/qwik-city/lib/
if-no-files-found: error

- name: Commit Build Artifacts
if: ${{ needs.changes.outputs.fullbuild == 'true' && github.event_name == 'push' }}
env:
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
run: pnpm run qwik-save-artifacts

############ RELEASE ############
release:
name: Release
Expand All @@ -408,13 +404,11 @@ jobs:
uses: actions/checkout@v3

- uses: pnpm/action-setup@v2.2.4
with:
version: 7

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

Expand Down Expand Up @@ -443,16 +437,22 @@ jobs:
- name: Install NPM Dependencies
run: pnpm install --frozen-lockfile

- name: Dry-Run Publish @builder.io/qwik
- name: Commit Build Artifacts
if: ${{ needs.changes.outputs.fullbuild == 'true' && github.event_name == 'push' }}
env:
QWIK_API_TOKEN_GITHUB: ${{ secrets.QWIK_API_TOKEN_GITHUB }}
run: pnpm run qwik-save-artifacts

- name: Dry-Run Publish
if: ${{ github.event_name != 'workflow_dispatch' }}
run: pnpm tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release --dry-run
run: pnpm tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --validate --release --dry-run
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Publish @builder.io/qwik
- name: Publish
if: ${{ github.event_name == 'workflow_dispatch' }}
run: pnpm tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --release
run: pnpm tsm scripts/index.ts --set-dist-tag="${{ github.event.inputs.disttag }}" --validate --release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand All @@ -469,10 +469,10 @@ jobs:
settings:
- host: ubuntu-latest
browser: chromium
node: 16.x
node: 18.x
- host: macos-latest
browser: webkit
node: 16.x
node: 18.x

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

Expand All @@ -483,8 +483,6 @@ jobs:

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

- name: Setup Node ${{ matrix.settings.node }}
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
Expand Down Expand Up @@ -542,13 +540,11 @@ jobs:
uses: actions/checkout@v3

- uses: pnpm/action-setup@v2.2.4
with:
version: 7

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

Expand Down Expand Up @@ -634,13 +630,11 @@ jobs:
uses: actions/checkout@v3

- uses: pnpm/action-setup@v2.2.4
with:
version: 7

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

Expand All @@ -656,3 +650,20 @@ jobs:
- name: ESLint Check
if: ${{ always() }}
run: pnpm run lint.eslint

############ TRIGGER QWIKCITY E2E Test ############
trigger-qwikcity-e2e:
name: Trigger Qwik City E2E
runs-on: ubuntu-latest

needs:
- release

if: ${{ needs.changes.outputs.fullbuild == 'true' && github.ref_name == 'main' }}
steps:
- name: Repository Dispatch
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ secrets.QWIK_API_TOKEN_GITHUB }}
repository: builderIO/qwik-city-e2e
event-type: main-updated
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -53,7 +53,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -67,4 +67,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
49 changes: 0 additions & 49 deletions .github/workflows/release-qwik-city.yml

This file was deleted.

0 comments on commit ce1e587

Please sign in to comment.