Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into ianlet/main
Browse files Browse the repository at this point in the history
  • Loading branch information
zanettin committed Oct 26, 2023
2 parents 18b8a4d + a07c3cd commit fd37805
Show file tree
Hide file tree
Showing 230 changed files with 6,560 additions and 5,716 deletions.
4 changes: 1 addition & 3 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
"projectOwner": "BuilderIO",
"repoType": "github",
"repoHost": "https://github.com",
"files": [
"README.md"
],
"files": ["README.md"],
"imageSize": 100,
"commit": true,
"commitConvention": "angular",
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ temp

# Application
qwik-app/
**/server/
/server/
/starters/**/server/
/packages/*/server/
/packages/*/src/styled-system/
todo-express/
target
!/packages/docs/src/routes/demo/events/target
Expand All @@ -31,9 +34,9 @@ lib
tsdoc-metadata.json

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

# Package Managers
.yarn/*
Expand Down
3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"ms-azuretools.vscode-docker",
"manucorporat.vermoji",
"vadimcn.vscode-lldb",
"streetsidesoftware.code-spell-checker"
"streetsidesoftware.code-spell-checker",
"ZixuanChen.vitest-explorer"
],
"unwantedRecommendations": []
}
15 changes: 0 additions & 15 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,6 @@
"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}/tsm.cjs"
],
"console": "integratedTerminal"
}
]
}
10 changes: 10 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"vitest.include": ["**/*.unit.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
"vitest.exclude": [
"**/node_modules/**",
"**/dist/**",
"**/dist-dev/**",
"**/cypress/**",
"**/.{idea,git,cache,output,temp}/**"
]
}
10 changes: 1 addition & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -234,20 +234,12 @@ pnpm serve
### Unit Tests Only
Unit tests use [uvu](https://github.com/lukeed/uvu)
Unit tests use [vitest](https://vitest.dev)
```shell
pnpm test.unit
```
To keep _uvu_ open with the watch mode, run:
```shell
pnpm test.watch
```
> Note that the `test.watch` command isn't necessary if you're running the `pnpm start` command, since `start` will also concurrently run the _uvu_ watch process.
### E2E Tests Only
E2E tests use [Playwright](https://playwright.dev/).
Expand Down
78 changes: 39 additions & 39 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qwik-monorepo",
"version": "1.2.13",
"version": "1.2.15",
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
Expand All @@ -27,74 +27,73 @@
"esbuild-plugin-raw": "^0.1.7"
},
"devDependencies": {
"@builder.io/partytown": "^0.8.0",
"@builder.io/partytown": "^0.8.1",
"@clack/prompts": "^0.7.0",
"@microsoft/api-documenter": "^7.22.30",
"@microsoft/api-extractor": "7.36.3",
"@napi-rs/cli": "2.12.1",
"@microsoft/api-documenter": "^7.23.9",
"@microsoft/api-extractor": "^7.38.0",
"@napi-rs/cli": "^2.16.3",
"@napi-rs/triples": "1.1.0",
"@node-rs/helper": "1.3.3",
"@octokit/action": "3.18.1",
"@playwright/test": "1.36.2",
"@types/brotli": "1.3.1",
"@types/cross-spawn": "6.0.2",
"@types/eslint": "8.44.1",
"@types/express": "4.17.17",
"@types/mri": "1.1.1",
"@types/node": "^20.4.5",
"@playwright/test": "^1.38.1",
"@types/brotli": "^1.3.2",
"@types/cross-spawn": "^6.0.3",
"@types/eslint": "^8.44.4",
"@types/express": "^4.17.19",
"@types/mri": "^1.1.2",
"@types/node": "^20.8.4",
"@types/path-browserify": "1.0.0",
"@types/prettier": "2.7.3",
"@types/prompts": "2.4.4",
"@types/semver": "7.5.0",
"@types/prompts": "^2.4.6",
"@types/semver": "^7.5.3",
"@types/which-pm-runs": "1.0.0",
"@typescript-eslint/eslint-plugin": "6.2.0",
"@typescript-eslint/parser": "6.2.0",
"@typescript-eslint/rule-tester": "^6.2.0",
"@typescript-eslint/utils": "6.2.0",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"@typescript-eslint/rule-tester": "^6.7.5",
"@typescript-eslint/utils": "^6.7.5",
"all-contributors-cli": "6.26.1",
"brotli": "1.3.3",
"commitizen": "4.3.0",
"concurrently": "8.2.0",
"concurrently": "^8.2.1",
"create-qwik": "workspace:*",
"cross-spawn": "7.0.3",
"cz-conventional-changelog": "3.3.0",
"esbuild": "0.18.17",
"eslint": "8.45.0",
"esbuild": "^0.19.4",
"eslint": "^8.51.0",
"eslint-plugin-no-only-tests": "3.1.0",
"eslint-plugin-qwik": "1.2.6",
"eslint-plugin-qwik": "^1.2.13",
"execa": "7.2.0",
"express": "4.18.2",
"install": "^0.13.0",
"monaco-editor": "^0.39.0",
"monaco-editor": "^0.44.0",
"mri": "1.2.0",
"ora": "6.3.1",
"path-browserify": "1.0.1",
"prettier": "3.0.0",
"prettier": "^3.0.3",
"prettier-plugin-jsdoc": "^1.1.1",
"pretty-quick": "^3.1.3",
"prompts": "2.4.2",
"rollup": "3.26.3",
"semver": "7.5.4",
"snoop": "^1.0.4",
"syncpack": "^10.7.3",
"terser": "5.19.2",
"tsm": "2.2.2",
"typescript": "5.1.6",
"undici": "5.22.1",
"uvu": "0.5.6",
"vite": "4.4.7",
"vite-tsconfig-paths": "4.2.0",
"terser": "^5.21.0",
"tsm": "^2.3.0",
"typescript": "^5.2.2",
"undici": "^5.26.0",
"vite": "^4.4.11",
"vite-tsconfig-paths": "^4.2.1",
"vitest": "0.34.6",
"watchlist": "0.3.1",
"which-pm-runs": "1.1.0",
"zod": "^3.21.4"
"zod": "^3.22.4"
},
"engines": {
"node": ">=16.8.0 <18.0.0 || >=18.11",
"npm": "please-use-pnpm",
"yarn": "please-use-pnpm",
"pnpm": ">=8.6.12"
},
"packageManager": "pnpm@8.6.12",
"packageManager": "pnpm@8.9.0",
"pnpm": {
"overrides": {
"vfile": "6.0.1"
Expand All @@ -106,6 +105,7 @@
"build": "tsm scripts/index.ts --tsc --build --qwikcity --qwiklabs --api --platform-binding-wasm-copy",
"build.cli": "tsm scripts/index.ts --cli --dev",
"build.cli.prod": "tsm scripts/index.ts --cli",
"build.core": "tsm scripts/index.ts --tsc --build --qwikcity --platform-binding-wasm-copy",
"build.eslint": "tsm scripts/index.ts --eslint",
"build.full": "tsm scripts/index.ts --tsc --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding --wasm",
"build.only_javascript": "tsm scripts/index.ts --tsc --build --api",
Expand Down Expand Up @@ -136,7 +136,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 && tsm scripts/index.ts --tsc --build --api --eslint --platform-binding --wasm --prepare-release",
"release.prepare": "pnpm lint && pnpm test.unit --run && tsm scripts/index.ts --tsc --build --api --eslint --platform-binding --wasm --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:test.watch\" \"npm:tsc.watch\" -n build,test,tsc -c green,magenta,cyan",
Expand All @@ -148,13 +148,13 @@
"test.e2e.firefox": "playwright test starters --browser=firefox --config starters/playwright.config.ts",
"test.e2e.webkit": "playwright test starters --browser=webkit --config starters/playwright.config.ts",
"test.rust": "make test",
"test.unit": "tsm node_modules/uvu/bin.js packages unit.ts --tsmconfig tsm.cjs",
"test.unit.debug": "tsm --inspect-brk node_modules/uvu/bin.js packages unit.ts --tsmconfig tsm.cjs",
"test.unit": "vitest packages",
"test.unit.debug": "vitest --inspect-brk packages",
"test.vite": "playwright test starters/e2e/qwikcity --browser=chromium --config starters/playwright.config.ts",
"test.watch": "watchlist packages unit.ts -- pnpm test.unit",
"tsc.check": "tsc --noEmit",
"tsc.trace": "tsc -p tsconfig.json --traceResolution > tsc.log",
"tsc.watch": "tsc --noEmit --watch --preserveWatchOutput"
"tsc.watch": "tsc --noEmit --watch --preserveWatchOutput",
"update.qwik.builds": "tsm scripts/update-qwik-builds.ts packages/docs && tsm scripts/update-qwik-builds.ts packages/insights; pnpm install"
},
"type": "module"
}
4 changes: 2 additions & 2 deletions packages/create-qwik/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "create-qwik",
"description": "Interactive CLI for create Qwik projects and adding features.",
"version": "1.2.13",
"version": "1.2.15",
"author": "Builder.io Team",
"bin": "./create-qwik.cjs",
"bugs": "https://github.com/BuilderIO/qwik/issues",
"devDependencies": {
"@clack/prompts": "^0.7.0",
"@types/yargs": "17.0.24",
"@types/yargs": "^17.0.28",
"kleur": "4.1.5",
"yargs": "17.7.2"
},
Expand Down
55 changes: 27 additions & 28 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,49 +7,48 @@
"devDependencies": {
"@algolia/autocomplete-core": "1.7.4",
"@algolia/client-search": "4.14.3",
"@builder.io/partytown": "^0.8.0",
"@builder.io/qwik": "github:BuilderIo/qwik-build#main",
"@builder.io/qwik-city": "github:BuilderIo/qwik-city-build#main",
"@builder.io/qwik-labs": "github:BuilderIo/qwik-labs-build#main",
"@builder.io/partytown": "^0.8.1",
"@builder.io/qwik": "github:BuilderIo/qwik-build#d3722d228e541225f75068160287811ee900a29c",
"@builder.io/qwik-city": "github:BuilderIo/qwik-city-build#86e0034604ef6ecb2e50e7b3c2c2b8f3a36b0118",
"@builder.io/qwik-labs": "github:BuilderIo/qwik-labs-build#f93ef76256c988d57acd24cc5d59ebf2e39c3d02",
"@builder.io/qwik-react": "0.5.0",
"@builder.io/sdk-qwik": "^0.4.5",
"@docsearch/css": "3.3.4",
"@builder.io/sdk-qwik": "^0.6.2",
"@docsearch/css": "^3.5.2",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.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",
"@types/prismjs": "^1.26.0",
"@types/react": "18.2.17",
"@types/react-dom": "18.2.7",
"@unpic/core": "^0.0.28",
"@unpic/qwik": "^0.0.24",
"@mui/material": "^5.14.13",
"@mui/x-data-grid": "^6.16.1",
"@supabase/supabase-js": "^2.38.1",
"@types/prismjs": "^1.26.1",
"@types/react": "^18.2.28",
"@types/react-dom": "^18.2.13",
"@unpic/core": "^0.0.31",
"@unpic/qwik": "^0.0.27",
"algoliasearch": "4.16.0",
"autoprefixer": "^10.4.14",
"fflate": "0.8.0",
"autoprefixer": "^10.4.16",
"fflate": "^0.8.1",
"gray-matter": "4.0.3",
"openai": "^3.3.0",
"postcss": "8.4.27",
"prettier": "3.0.0",
"postcss": "^8.4.31",
"prettier": "^3.0.3",
"prism-themes": "1.9.0",
"prismjs": "1.29.0",
"puppeteer": "^20.9.0",
"qwik-image": "^0.0.7",
"qwik-image": "^0.0.8",
"react": "18.2.0",
"react-dom": "18.2.0",
"rehype-pretty-code": "0.9.8",
"shiki": "^0.14.3",
"rehype-pretty-code": "^0.10.1",
"shiki": "^0.14.5",
"snarkdown": "^2.0.0",
"tailwindcss": "3.3.3",
"tsm": "2.2.2",
"typescript": "5.1.6",
"undici": "5.22.1",
"uvu": "0.5.6",
"tsm": "^2.3.0",
"typescript": "^5.2.2",
"undici": "^5.26.0",
"valibot": "^0.17.1",
"vite": "4.4.7",
"vite-plugin-inspect": "^0.7.33",
"wrangler": "^3.3.0"
"vite": "^4.4.11",
"vite-plugin-inspect": "^0.7.40",
"wrangler": "^3.11.0"
},
"engines": {
"node": ">=18.11",
Expand Down
16 changes: 16 additions & 0 deletions packages/docs/public/ecosystem/qwik-morocco.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/docs/public/ecosystem/twitter.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions packages/docs/src/components/code-sandbox/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export default component$<{
<div class="tabs">
{tabs.map((tab, idx) => (
<span
key={idx}
onClick$={() => (activeTab.value = idx)}
class={{ tab: true, active: idx == activeTab.value }}
>
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/docsearch/doc-search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const DocSearch = component$((props: DocSearchProps) => {
snippetLength: 10,
});

const searchButtonRef = useSignal();
const searchButtonRef = useSignal<Element>();

return (
<div
Expand Down
Loading

0 comments on commit fd37805

Please sign in to comment.