Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into brandonpittman/main
Browse files Browse the repository at this point in the history
  • Loading branch information
mhevery committed Oct 4, 2023
2 parents 6ed8997 + fb62a4b commit bfb1d8a
Show file tree
Hide file tree
Showing 307 changed files with 12,021 additions and 1,797 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- next
- qwik-labs
- vercelserverless
- 'build/**'
workflow_dispatch:
inputs:
disttag:
Expand Down Expand Up @@ -65,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 @@ -410,7 +414,7 @@ jobs:
packages/qwik-labs/package.json
if-no-files-found: error

############ RELEASE ############
############ RELEASE ############
release:
name: Release
runs-on: ubuntu-latest
Expand Down Expand Up @@ -676,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 }}
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18.11
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ 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
Expand Down
8 changes: 8 additions & 0 deletions @types/bun.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
declare const Bun: {
fileURLToPath: (url: string) => string;
env: any;
file: (path: string) => {
text: () => Promise<string>;
stream: () => Promise<ReadableStream<Uint8Array>>;
};
};
17 changes: 3 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,28 +210,17 @@ To use your build in your project, follow these steps:
yarn link @builder.io/qwik @builder.io/qwik-city
```

If you can't use package linking (npm link) just copy the contents of `package/qwik/dist` into your projects' `node_modules/@builder.io/qwik` folder.
If you can't use package linking (npm link) just copy the contents of `packages/qwik/dist` into your projects' `node_modules/@builder.io/qwik` folder, and/or the contents of `packages/qwik-city/lib` into your projects' `node_modules/@builder.io/qwik-city` folder.

### Test against the docs site:

1. Go to `packages/docs/package.json` and update:

```diff

-- "@builder.io/qwik": "0.17.4",
-- "@builder.io/qwik-city": "0.1.0-beta13",

++ "@builder.io/qwik": "workspace:*",
++ "@builder.io/qwik-city": "workspace:*",
```

2. At the root of the Qwik repo folder run:
1. At the root of the Qwik repo folder run:

```shell
pnpm install
```

3. Run the docs site:
2. Run the docs site:

```shell
cd packages/docs && pnpm start
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ npm create qwik@latest
pnpm create qwik@latest
# or
yarn create qwik@latest
# or
bun create qwik@latest
```

- Understand the difference between [resumable and replayable](https://qwik.builder.io/docs/concepts/resumable/) applications.
Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qwik-monorepo",
"version": "1.2.9",
"version": "1.2.12",
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
Expand Down Expand Up @@ -28,7 +28,7 @@
},
"devDependencies": {
"@builder.io/partytown": "^0.8.0",
"@clack/prompts": "^0.6.3",
"@clack/prompts": "^0.7.0",
"@microsoft/api-documenter": "^7.22.30",
"@microsoft/api-extractor": "7.36.3",
"@napi-rs/cli": "2.12.1",
Expand Down Expand Up @@ -91,9 +91,9 @@
"node": ">=16.8.0 <18.0.0 || >=18.11",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
"pnpm": ">=8.0.0"
"pnpm": ">=8.6.12"
},
"packageManager": "pnpm@8.6.1",
"packageManager": "pnpm@8.6.12",
"pnpm": {
"overrides": {
"vfile": "6.0.1"
Expand Down
4 changes: 2 additions & 2 deletions packages/create-qwik/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "create-qwik",
"description": "Interactive CLI for create Qwik projects and adding features.",
"version": "1.2.9",
"version": "1.2.12",
"author": "Builder.io Team",
"bin": "./create-qwik.cjs",
"bugs": "https://github.com/BuilderIO/qwik/issues",
"devDependencies": {
"@clack/prompts": "^0.6.3",
"@clack/prompts": "^0.7.0",
"@types/yargs": "17.0.24",
"kleur": "4.1.5",
"yargs": "17.7.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/create-qwik/src/helpers/jokes.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
["What's red and bad for your teeth?", "A Brick."],
[
"What's the difference between a guitar and a fish?",
"You can tune a guitar but you can't \"tuna\"fish!"
"You can tune a guitar but you can't \"tuna\" fish!"
],
["Why did the coffee file a police report?", "It got mugged."],
["What do you do when you see a space man?", "Park your car, man."],
Expand Down
9 changes: 5 additions & 4 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@docsearch/css": "3.3.4",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@modular-forms/qwik": "^0.12.0",
"@modular-forms/qwik": "^0.21.0",
"@mui/material": "^5.13.0",
"@mui/x-data-grid": "^6.4.0",
"@supabase/supabase-js": "^2.33.1",
Expand All @@ -31,6 +31,7 @@
"gray-matter": "4.0.3",
"openai": "^3.3.0",
"postcss": "8.4.27",
"prettier": "3.0.0",
"prism-themes": "1.9.0",
"prismjs": "1.29.0",
"puppeteer": "^20.9.0",
Expand All @@ -45,7 +46,7 @@
"typescript": "5.1.6",
"undici": "5.22.1",
"uvu": "0.5.6",
"valibot": "^0.13.0",
"valibot": "^0.17.1",
"vite": "4.4.7",
"vite-plugin-inspect": "^0.7.33",
"wrangler": "^3.3.0"
Expand All @@ -54,11 +55,11 @@
"node": ">=18.11",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
"pnpm": ">=8.0.0"
"pnpm": ">=8.6.12"
},
"homepage": "https://qwik.builder.io/",
"license": "MIT",
"packageManager": "pnpm@8.6.1",
"packageManager": "pnpm@8.6.12",
"private": true,
"scripts": {
"build": "qwik build",
Expand Down
Binary file not shown.
Binary file removed packages/docs/public/docs/qwikcity/routing.png
Binary file not shown.
26 changes: 26 additions & 0 deletions packages/docs/public/ecosystem/bun.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/docs/public/ecosystem/qwik-spin-delay.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added packages/docs/public/showcases/leonerd_blog.webp
Binary file not shown.
Binary file added packages/docs/public/showcases/pay4me_app.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added packages/docs/public/showcases/simplymc_art_.webp
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
31 changes: 22 additions & 9 deletions packages/docs/scripts/pages.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
[
{
"href": "https://frostytools.com",
"tags": "saas"
},
{
"href": "https://www.dimension.dev",
"tags": "saas"
},
{
"href": "https://wope.com/",
"tags": "saas"
Expand All @@ -7,6 +15,10 @@
"href": "https://www.builder.io/",
"tags": "saas"
},
{
"href": "https://reflect.app/",
"tags": "saas"
},
{
"href": "https://jose-aguilar.vercel.app/",
"tags": "portfolio"
Expand All @@ -16,12 +28,9 @@
"tags": "portfolio"
},
{
"href": "https://reflect.app/",
"tags": "saas"
},
{
"href": "https://realmof.tech/",
"tags": "portfolio"
"href": "https://qwik-city-movies-wm.netlify.app/",
"size": "large",
"tags": "app"
},
{
"href": "https://www.hexa.center/",
Expand Down Expand Up @@ -76,9 +85,9 @@
"tags": "portfolio"
},
{
"href": "https://qwik-city-movies-wm.netlify.app/",
"href": "https://www.expobeds.com/",
"size": "large",
"tags": "app"
"tags": "company"
},
{
"href": "https://jbnado.dev/",
Expand Down Expand Up @@ -160,7 +169,7 @@
},
{
"href": "https://pay4me.app",
"tags": "sass"
"tags": "saas"
},
{
"href": "https://qwik-osm-poc.netlify.app/",
Expand Down Expand Up @@ -190,5 +199,9 @@
{
"href": "https://qwik-meet.onrender.com/",
"tags": "webrtc"
},
{
"href": "https://getpolaris.ai/",
"tags": "saas"
}
]
10 changes: 8 additions & 2 deletions packages/docs/src/components/on-this-page/on-this-page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ import { EditIcon } from '../svgs/edit-icon';
import { GlobalStore } from '../../context';
import { AlertIcon } from '../svgs/alert-icon';

const QWIK_GROUP = ['components', 'concepts', 'faq', 'getting-started', 'think-qwik'];
const QWIK_GROUP = [
'components',
'concepts',
'faq',
'getting-started',
'think-qwik',
'deprecated-features',
];

const QWIK_ADVANCED_GROUP = [
'containers',
Expand All @@ -35,7 +42,6 @@ const QWIKCITY_GROUP = [
'pages',
'project-structure',
'qwikcity',
'qwikcity-deprecated-features',
'route-loader',
'routing',
'server$',
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion packages/docs/src/repl/monaco.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,8 @@ const MONACO_VS_URL = getCdnUrl('monaco-editor', MONACO_VERSION, '/min/vs');
const MONACO_LOADER_URL = `${MONACO_VS_URL}/loader.js`;

const CLIENT_LIB = `
declare module '*.css' {
declare module '*.css' {}
declare module '*.css?inline' {
const css: string
export default css
}
Expand Down
24 changes: 24 additions & 0 deletions packages/docs/src/repl/repl-options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,28 @@ export const ReplOptions = ({ input, versions }: ReplOptionsProps) => {
input={input}
isLoading={versions.length === 0}
/>

<StoreBoolean label="Debug" inputProp="debug" input={input} />
</div>
);
};

const StoreBoolean = (props: StoreBooleanProps) => {
return (
<label>
<span>{props.label}</span>
<input
type="checkbox"
checked={!!props.input[props.inputProp]}
onChange$={(ev?: any) => {
const input: HTMLInputElement = ev.target;
(props.input as any)[props.inputProp] = input.checked;
}}
/>
</label>
);
};

const StoreOption = (props: StoreOptionProps) => {
return (
<label>
Expand Down Expand Up @@ -61,6 +79,12 @@ interface StoreOptionProps {
isLoading?: boolean;
}

interface StoreBooleanProps {
label: string;
input: ReplAppInput;
inputProp: keyof ReplAppInput;
}

interface ReplOptionsProps {
input: ReplAppInput;
versions: string[];
Expand Down
Loading

0 comments on commit bfb1d8a

Please sign in to comment.