Skip to content

Commit

Permalink
Merge branch 'main' into static-site-adapter-docs
Browse files Browse the repository at this point in the history
  • Loading branch information
gioboa authored Oct 11, 2023
2 parents d78a2e1 + 4b85066 commit 0e6dcec
Show file tree
Hide file tree
Showing 1,272 changed files with 66,082 additions and 15,258 deletions.
17 changes: 10 additions & 7 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
FROM cimg/rust:1.65.0-node
FROM cimg/rust:1.72.1-node

RUN rustup toolchain install nightly-2022-09-23; \
rustup default nightly-2022-09-23; \
rustup --version; \
RUN rustup --version; \
cargo --version; \
rustc --version; \
rustup update; \
rustc --version;

RUN rustup update; \
rustup target add wasm32-unknown-unknown; \
cargo install cargo-insta wasm-pack; \
cargo install cargo-insta; \
cargo install wasm-pack; \
rustup component add clippy; \
corepack enable --install-directory ~/bin

RUN mkdir /home/circleci/store; \
pnpm config set store-dir /home/circleci/store
6 changes: 6 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ packages/docs/api/**/*
packages/docs/src/routes/examples/apps/**/*
packages/docs/src/routes/playground/app/**/*
packages/docs/src/routes/tutorial/**/*
packages/qwik-labs/lib/**/*
packages/qwik-labs/lib-types/**/*
packages/qwik-labs/vite/**/*
packages/insights/drizzle.config.ts
packages/insights/panda.config.ts
starters/apps/base
starters/apps/library
starters/templates
vite.config.ts
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🐞 Bug Report
description: Something does not work or is flaky! let us know!
labels: [bug, triage]
labels: ['TYPE: bug', 'STATUS-1: needs triage']
title: '[🐞]'
body:
- type: markdown
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: ['COMP: docs']
labels: ['COMP: docs', 'STATUS-1: needs triage']
body:
- type: markdown
attributes:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: ✨ Feature Request
description: Suggest an idea for this project.
labels: [enhancement, triage]
labels: ['TYPE: enhancement', 'STATUS-1: needs triage']
title: '[✨]'
body:
- type: textarea
Expand Down
39 changes: 34 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
branches:
- main
- next
- qwik-labs
- vercelserverless
- 'build/**'
workflow_dispatch:
inputs:
disttag:
Expand Down Expand Up @@ -50,6 +53,10 @@ jobs:
- 'packages/qwik/src/**/*.rs'
- 'packages/qwik-city/**/*.ts'
- 'packages/qwik-city/**/*.tsx'
- 'packages/qwik-labs/package.json'
- 'packages/qwik-labs/src/**/*.ts'
- 'packages/qwik-labs/src/**/*.tsx'
- 'packages/qwik-labs/src-vite/**/*.ts'
- 'packages/eslint-plugin-qwik/**/*.ts'
- 'starters/apps/**/*.ts'
- 'starters/apps/**/*.tsx'
Expand All @@ -59,8 +66,11 @@ jobs:
- 'Cargo.yaml'
- '.github/workflows/*.yaml'
- 'scripts/*.ts'
- name: Print fullbuild output
run: echo ${{ steps.filter.outputs.fullbuild == 'true' || github.event.inputs.disttag != '' }}
- name: Print variables output
run: |
echo fullbuild=${{ steps.filter.outputs.fullbuild }}
echo disttag=${{ github.event.inputs.disttag }}
echo event_name=${{ github.event_name }}
############ BUILD PACKAGE ############
build-package:
Expand Down Expand Up @@ -372,9 +382,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 @@ -388,6 +398,22 @@ jobs:
path: packages/qwik-city/lib/
if-no-files-found: error

- name: Print QwikLabs Lib Build
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
run: tree packages/qwik-labs/lib/ packages/qwik-labs/lib-types/ packages/qwik-labs/vite/

- name: Upload QwikLabs Build Artifacts
if: ${{ needs.changes.outputs.fullbuild == 'true' }}
uses: actions/upload-artifact@master
with:
name: builderio-qwiklabs-distribution
path: |
packages/qwik-labs/lib/
packages/qwik-labs/lib-types/
packages/qwik-labs/vite/
packages/qwik-labs/package.json
if-no-files-found: error

############ RELEASE ############
release:
name: Release
Expand Down Expand Up @@ -433,6 +459,9 @@ jobs:
mv dist-dev-create-qwik/* packages/create-qwik/dist/
mkdir -p packages/eslint-plugin-qwik/dist/
mv dist-dev-eslint-plugin-qwik/* packages/eslint-plugin-qwik/dist/
mv builderio-qwiklabs-distribution/lib packages/qwik-labs/lib
mv builderio-qwiklabs-distribution/lib-types packages/qwik-labs/lib-types
mv builderio-qwiklabs-distribution/vite/* packages/qwik-labs/vite/
- name: Install NPM Dependencies
run: pnpm install --frozen-lockfile
Expand Down Expand Up @@ -651,7 +680,7 @@ jobs:
if: ${{ always() }}
run: pnpm run lint.eslint

############ TRIGGER QWIKCITY E2E Test ############
############ TRIGGER QWIKCITY E2E TEST ############
trigger-qwikcity-e2e:
name: Trigger Qwik City E2E
runs-on: ubuntu-latest
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Qwik PR Checks

on:
pull_request_target:
types:
- opened
- edited
- synchronize
- ready_for_review

permissions:
pull-requests: read

jobs:
############ SEMANTIC PR TITLE VALIDATION ############
semantic-pr:
name: Validate PR title
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48 changes: 32 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,28 +1,44 @@
# Keep "OS" and "IDE and local environment" ignores on your local machine in user home
# git config --global core.excludesFile ~/.gitignore
# https://git-scm.com/docs/gitignore

# OS
**/.DS_Store
etc
temp
.history
.vscode/settings.json
dist
lib
dist-dev
node_modules
tsc-out
external
*.
**/*.log
etc
temp
tsdoc-metadata.json
**/.DS_Store
src/napi/package-*
target
!/packages/docs/src/routes/demo/events/target
*.node
todo-express/

# Application
qwik-app/
**/server/
todo-express/
target
!/packages/docs/src/routes/demo/events/target
src/napi/package-*

# Node
node_modules

# Artifacts
tsc-out
dist
dist-dev
external
lib
tsdoc-metadata.json

# IDE and local environment
.vscode/settings.json
.idea
.eslintcache

# Yarn
# Package Managers
.yarn/*
!.yarn/releases
.pnpm-store/*

# Local Netlify folder
.netlify
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18.11
10 changes: 8 additions & 2 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
**/*.log
**/.DS_Store
*.
.vscode/settings.json
.history
.yarn
.yarnrc.yml
.pnpm-store
pnpm-lock.yaml
.mf
dist
Expand All @@ -20,17 +20,23 @@ output
rollup.config.js
build
.cache
.vscode
.rollup.cache
tsconfig.tsbuildinfo
packages/docs/api/**/*
packages/docs/src/routes/**/*.mdx
**/server/**/*.js
starters/**/*.js
# explicit exclusion for tailwind prettier.config.js
starters/features/tailwind/*
packages/docs/server
packages/docs/src/routes/api
packages/docs/**/*.md
packages/docs/**/*.mdx
packages/insights/drizzle
packages/insights/.netlify
packages/insights/scripts
packages/insights/**/*.gen.d.ts
packages/qwik-labs/lib-types

# TODO: Figure out why this doesn't pass in CI
packages/qwik/src/core/props/props.ts
Expand Down
3 changes: 3 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
{
"plugins": ["./node_modules/prettier-plugin-jsdoc/dist/index.js"],
"jsdocPreferCodeFences": true,
"tsdoc": true,
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
Expand Down
14 changes: 14 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"recommendations": [
"dbaeumer.vscode-eslint",
"unifiedjs.vscode-mdx",
"esbenp.prettier-vscode",
"ms-playwright.playwright",
"rust-lang.rust-analyzer",
"ms-azuretools.vscode-docker",
"manucorporat.vermoji",
"vadimcn.vscode-lldb",
"streetsidesoftware.code-spell-checker"
],
"unwantedRecommendations": []
}
4 changes: 0 additions & 4 deletions .vscode/extenstions.json

This file was deleted.

14 changes: 7 additions & 7 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,29 @@
"skipFiles": ["<node_internals>/**"],
"cwd": "${workspaceFolder}/packages/docs",
"program": "${workspaceFolder}/packages/docs/node_modules/vite/bin/vite.js",
"args": ["--mode", "ssr", "--force"],
"args": ["--mode", "ssr", "--force"]
},
{
"type": "node",
"name": "vscode-jest-tests",
"request": "launch",
"console": "integratedTerminal",
"internalConsoleOptions": "neverOpen",
"internalConsoleOptions": "neverOpen",
"program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
"cwd": "${workspaceFolder}",
"args": ["--runInBand", "--watchAll=false"]
},
},
{
"name": "uvu Current File",
"type": "node",
"request": "launch",
"skipFiles": ["<node_internals>/**"],
"program": "${workspaceFolder}/node_modules/tsm/bin.js",
"args": [
"${workspaceFolder}/node_modules/uvu/bin.js",
"${fileDirname}",
"${fileBasename}",
"--tsmconfig",
"${workspaceFolder}/node_modules/uvu/bin.js",
"${fileDirname}",
"${fileBasename}",
"--tsmconfig",
"${workspaceFolder}/tsm.cjs"
],
"console": "integratedTerminal"
Expand Down
Loading

0 comments on commit 0e6dcec

Please sign in to comment.