Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added changesets prerelease to V2 #6918

Draft
wants to merge 19 commits into
base: build/v2
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 5 additions & 5 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
"changelog": ["./changelog-github-custom.cjs", { "repo": "QwikDev/qwik" }],
"commit": false,
"fixed": [["@builder.io/qwik", "@builder.io/qwik-city", "eslint-plugin-qwik", "create-qwik"]],
"fixed": [["@qwik.dev/core", "@qwik.dev/city", "eslint-plugin-qwik", "create-qwik"]],
"linked": [],
"access": "public",
"baseBranch": "main",
"baseBranch": "build/v2",
"updateInternalDependencies": "minor",
"ignore": [
"qwik-docs",
"@builder.io/qwik-labs",
"@qwik.dev/labs",
"insights",
"@builder.io/qwik-react",
"@builder.io/qwik-worker",
"@qwik.dev/react",
"@qwik.dev/worker",
"qwik-cli-e2e"
],
"___experimentalUnsafeOptions_WILL_CHANGE_IN_PATCH": {
Expand Down
2 changes: 1 addition & 1 deletion .changeset/five-kangaroos-matter.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
'@builder.io/qwik': patch
'@qwik.dev/core': patch
---

BREAKING: `useComputed$` no longer accepts Promise results. Instead, use `useSignal` and `useTask$` together to perform async signal updates
19 changes: 19 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"mode": "pre",
"tag": "alpha",
"initialVersions": {
"create-qwik": "2.0.0-0",
"qwik-docs": "0.0.1",
"eslint-plugin-qwik": "2.0.0-0",
"@qwik.dev/core": "2.0.0-0",
"@qwik.dev/city": "2.0.0-0",
"insights": "0.1.0",
"@qwik.dev/dom": "2.1.19",
"@qwik.dev/labs": "2.0.0-0",
"@qwik.dev/react": "2.0.0-0",
"@qwik.dev/worker": "2.0.0-0",
"supabase-auth-helpers-qwik": "0.0.3"
},
"branch": "main",
"changesets": []
}
5 changes: 0 additions & 5 deletions .changeset/quiet-grapes-sit.md

This file was deleted.

4 changes: 3 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ on:
workflow_dispatch:
inputs:
disttag:
description: 'Publish "@builder.io/qwik" to NPM using this dist-tag, push the git-tag to the repo and create a GitHub release. The "latest" and "next" dist-tags will use the version number already committed in package.json.'
description: 'Publish "@qwik.dev/core" to NPM using this dist-tag, push the git-tag to the repo and create a GitHub release. The "latest" and "next" dist-tags will use the version number already committed in package.json.'
required: true
type: choice
default: 'dev'
Expand Down Expand Up @@ -875,6 +875,8 @@ jobs:
uses: changesets/action@v1
with:
publish: pnpm release
title: V2 Version Packages
branch: build/v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
24 changes: 12 additions & 12 deletions CONTINUOUS_BUILD.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ This repo contains build artifacts that are generated as part of the continues b

Currently supported artifacts:

- [`@builder.io/qwik`](https://github.com/QwikDev/qwik-build)
- [`@builder.io/qwik-city`](https://github.com/QwikDev/qwik-city-build)
- [`@builder.io/qwik-labs`](https://github.com/QwikDev/qwik-labs-build)
- [`@qwik.dev/core`](https://github.com/QwikDev/qwik-build)
- [`@qwik.dev/city`](https://github.com/QwikDev/qwik-city-build)
- [`@qwik.dev/labs`](https://github.com/QwikDev/qwik-labs-build)

The build artifact is created if:

Expand All @@ -27,23 +27,23 @@ To install a specific build artifact change you `package.json` like so (not all
```json
{
"dependencies": {
"@builder.io/qwik": "github:QwikDev/qwik-build#SHA",
"@builder.io/qwik-city": "github:QwikDev/qwik-city-build#SHA",
"@builder.io/qwik-labs": "github:QwikDev/qwik-labs-build#SHA"
"@qwik.dev/core": "github:QwikDev/qwik-build#SHA",
"@qwik.dev/city": "github:QwikDev/qwik-city-build#SHA",
"@qwik.dev/labs": "github:QwikDev/qwik-labs-build#SHA"
}
}
```

Where `#SHA` is one of the following:

- `#SHA` - Install a specific build SHA. You can get the SHA from:
- [`@builder.io/qwik`](https://github.com/QwikDev/qwik-build/commits/) commits
- [`@builder.io/qwik-city`](https://github.com/QwikDev/qwik-city-build/commits/) commits
- [`@builder.io/qwik-labs`](https://github.com/QwikDev/qwik-labs-build/commits/) commits
- [`@qwik.dev/core`](https://github.com/QwikDev/qwik-build/commits/) commits
- [`@qwik.dev/city`](https://github.com/QwikDev/qwik-city-build/commits/) commits
- [`@qwik.dev/labs`](https://github.com/QwikDev/qwik-labs-build/commits/) commits
- `#build/name` (or `#main`) - Install a specific `build/*` (or `#main`) branch:
- [`@builder.io/qwik`](https://github.com/QwikDev/qwik-build/branches/) branches
- [`@builder.io/qwik-city`](https://github.com/QwikDev/qwik-city-build/branches/) branches
- [`@builder.io/qwik-labs`](https://github.com/QwikDev/qwik-labs-build/branches/) branches
- [`@qwik.dev/core`](https://github.com/QwikDev/qwik-build/branches/) branches
- [`@qwik.dev/city`](https://github.com/QwikDev/qwik-city-build/branches/) branches
- [`@qwik.dev/labs`](https://github.com/QwikDev/qwik-labs-build/branches/) branches
> NOTE: Package managers will treat any SHA in the lock file which is on the branch as valid, and so they will not auto upgrade to the latest. For this reason this is not recommended.

## Bisect for regression
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ It will build **everything**, including Rust packages and WASM.
pnpm build.full
```

The build output will be written to `packages/qwik/dist`, which will be the directory that is published to [@builder.io/qwik](https://www.npmjs.com/package/@builder.io/qwik).
The build output will be written to `packages/qwik/dist`, which will be the directory that is published to [@qwik.dev/core](https://www.npmjs.com/package/@qwik.dev/core).

### Run in your own app:

Expand Down Expand Up @@ -240,24 +240,24 @@ To use your build in your project, follow these steps:

```shell
pnpm install
pnpm link --global @builder.io/qwik @builder.io/qwik-city
pnpm link --global @qwik.dev/core @qwik.dev/city
```

or

```shell
npm install
npm link @builder.io/qwik @builder.io/qwik-city
npm link @qwik.dev/core @qwik.dev/city
```

or

```shell
yarn install
yarn link @builder.io/qwik @builder.io/qwik-city
yarn link @qwik.dev/core @qwik.dev/city
```

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.
If you can't use package linking (npm link) just copy the contents of `packages/qwik/dist` into your projects' `node_modules/@qwik.dev/core` folder, and/or the contents of `packages/qwik-city/lib` into your projects' `node_modules/@qwik.dev/city` folder.

### Test against the docs site:

Expand Down Expand Up @@ -360,6 +360,6 @@ pnpm fmt
3. Create a PR with the `package.json` change to merge to `main`.
4. After the `package.json` with the updated version is in `main`, click the [Run Workflow](https://github.com/QwikDev/qwik/actions/workflows/ci.yml) button from the "Qwik CI" GitHub Action workflow.
5. Select the NPM dist-tag that should be used for this version, then click "Run Workflow".
6. The GitHub Action will dispatch the workflow to build `@builder.io/qwik`, `@builder.io/qwik-city` and each of their submodules, build WASM and native bindings, and validate the package before publishing to NPM.
6. The GitHub Action will dispatch the workflow to build `@qwik.dev/core`, `@qwik.dev/city` and each of their submodules, build WASM and native bindings, and validate the package before publishing to NPM.
7. If the build is successful and all tests and validation passes, the workflow will automatically publish to NPM, commit a git tag to the repo, and create a GitHub release.
8. ⚡️
1 change: 0 additions & 1 deletion cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@
"quicktime",
"qvisible",
"qwik",
"qwikauth",
"qwikcity",
"qwikdeps",
"qwikdom",
Expand Down
4 changes: 2 additions & 2 deletions e2e/qwik-cli-e2e/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Tests can be invoked by running `pnpm run test.e2e-cli`.

E2E project does the following internally:

0. Vitest is configured to run a setup function once **PRIOR TO ALL** tests. During the setup `@builder.io/qwik`, `@builder.io/qwik-city` and `eslint-plugin-qwik` packages will be packed with `pnpm pack` Those will be used at a step 2 for every test. Tarballs are located in `temp/tarballs` folder within this repo. It is assumed that packages are built before E2E is executed.
0. Vitest is configured to run a setup function once **PRIOR TO ALL** tests. During the setup `@qwik.dev/core`, `@qwik.dev/city` and `eslint-plugin-qwik` packages will be packed with `pnpm pack` Those will be used at a step 2 for every test. Tarballs are located in `temp/tarballs` folder within this repo. It is assumed that packages are built before E2E is executed.

1. Simulates `npm create qwik` locally using direct command `node packages/create-qwik/create-qwik.cjs playground {outputDir}`

Expand All @@ -21,7 +21,7 @@ E2E project does the following internally:

Note that provided folder should exist. If custom path is used, generated application will not be removed after the test completes, which is helpful for debugging.

2. Uses packed `@builder.io/qwik`, `@builder.io/qwik-city` and `eslint-plugin-qwik` packages to update package.json file of the generated application with `file:path-to-package.tgz`.
2. Uses packed `@qwik.dev/core`, `@qwik.dev/city` and `eslint-plugin-qwik` packages to update package.json file of the generated application with `file:path-to-package.tgz`.

3. Runs actual tests. Please pay attention at the `beforeAll` hook in the spec file

Expand Down
6 changes: 3 additions & 3 deletions e2e/qwik-cli-e2e/utils/setup.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { execSync } from 'child_process';
import { existsSync, writeFileSync } from 'fs';
import { join } from 'path';
import { workspaceRoot } from '.';
import { existsSync, writeFileSync } from 'fs';

const packageCfg = {
'@builder.io/qwik': {
'@qwik.dev/core': {
packagePath: 'packages/qwik',
distPath: 'packages/qwik/dist',
},
'@builder.io/qwik-city': {
'@qwik.dev/city': {
packagePath: 'packages/qwik-city',
distPath: 'packages/qwik-city/lib',
},
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"name": "qwik-monorepo",
"version": "0.0.0-read-qwik-package-json",
"comments": {
"01": "devDependencies includes reference to @builder.io/qwik: workspace: *. This is needed or e2e tests will fail",
"01": "devDependencies includes reference to @qwik.dev/core: workspace: *. This is needed or e2e tests will fail",
"02": " It would be nice to be able to remove this dependency and fix the test.",
"03": "devDependencies can't include reference to @builder.io/qwik-city or e2e test will fail."
"03": "devDependencies can't include reference to @qwik.dev/city or e2e test will fail."
},
"config": {
"syncpack": {
Expand Down Expand Up @@ -88,8 +88,6 @@
},
"devDependencies": {
"@builder.io/partytown": "0.10.2",
"@builder.io/qwik": "workspace:^",
"@builder.io/qwik-city": "workspace:^",
"@changesets/cli": "2.27.7",
"@changesets/get-github-info": "0.6.0",
"@changesets/types": "6.0.0",
Expand All @@ -103,6 +101,8 @@
"@node-rs/helper": "1.6.0",
"@octokit/action": "6.1.0",
"@playwright/test": "1.47.0",
"@qwik.dev/core": "workspace:^",
"@qwik.dev/city": "workspace:^",
"@types/brotli": "1.3.4",
"@types/bun": "1.1.6",
"@types/cross-spawn": "6.0.6",
Expand Down Expand Up @@ -188,8 +188,8 @@
"build.cli.prod": "tsm scripts/index.ts --cli",
"build.core": "tsm scripts/index.ts --tsc --build --qwikcity --api --platform-binding",
"build.eslint": "tsm scripts/index.ts --eslint",
"build.full": "tsm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding --wasm",
"build.local": "tsm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --qwikauth --cli --platform-binding-wasm-copy",
"build.full": "tsm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --cli --platform-binding --wasm",
"build.local": "tsm scripts/index.ts --tsc --tsc-docs --build --supabaseauthhelpers --api --eslint --qwikcity --qwikworker --qwiklabs --qwikreact --cli --platform-binding-wasm-copy",
"build.only_javascript": "tsm scripts/index.ts --tsc --build --api",
"build.packages.docs": "pnpm -C ./packages/docs/ run build",
"build.packages.insights": "pnpm -C ./packages/insights/ run build",
Expand Down
2 changes: 1 addition & 1 deletion packages/create-qwik/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@

- - built files are now under dist/ or lib/. All tools that respect package export maps should just work. (by [@wmertens](https://github.com/wmertens) in [#6715](https://github.com/QwikDev/qwik/pull/6715))
If you have trouble with Typescript, ensure that you use `moduleResolution: "Bundler"` in your `tsconfig.json`.
- `@builder.io/qwik` no longer depends on `undici`
- `@qwik.dev/core` no longer depends on `undici`
4 changes: 2 additions & 2 deletions packages/docs/adapters/cloudflare-pages/vite.config.mts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { cloudflarePagesAdapter } from '@builder.io/qwik-city/adapters/cloudflare-pages/vite';
import { extendConfig } from '@builder.io/qwik-city/vite';
import { cloudflarePagesAdapter } from '@qwik.dev/city/adapters/cloudflare-pages/vite';
import { extendConfig } from '@qwik.dev/city/vite';
// @ts-ignore
import baseConfig from '../../vite.config.mts';

Expand Down
12 changes: 7 additions & 5 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,12 @@
"@algolia/autocomplete-core": "1.7.4",
"@algolia/client-search": "4.14.3",
"@builder.io/partytown": "0.10.2",
"@builder.io/qwik": "workspace:^",
"@builder.io/qwik-city": "workspace:^",
"@builder.io/qwik-labs": "workspace:^",
"@builder.io/qwik-react": "workspace:^",
"@builder.io/qwik": "workspace:@qwik.dev/core@*",
"@builder.io/qwik-city": "workspace:@qwik.dev/city@*",
"@qwik.dev/core": "workspace:^",
"@qwik.dev/city": "workspace:^",
"@qwik.dev/react": "workspace:^",
"@qwik.dev/labs": "workspace:^",
"@builder.io/sdk-qwik": "0.14.31",
"@docsearch/css": "3.6.1",
"@emotion/react": "11.13.0",
Expand Down Expand Up @@ -40,7 +42,7 @@
"prism-themes": "1.9.0",
"prismjs": "1.29.0",
"puppeteer": "22.13.1",
"qwik-image": "0.0.14-alpha",
"qwik-image": "0.0.15",
"react": "18.3.1",
"react-dom": "18.3.1",
"rehype-pretty-code": "0.11.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/src/components/builder-content/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { component$, Resource, useResource$ } from '@builder.io/qwik';
import { useLocation } from '@builder.io/qwik-city';
import { useLocation } from '@qwik.dev/city';
import { component$, Resource, useResource$ } from '@qwik.dev/core';
import { QWIK_MODEL } from '../../constants';

export default component$<{
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/code-block/code-block.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$, useStyles$, type QRL, useVisibleTask$, useSignal } from '@builder.io/qwik';
import { component$, useStyles$, type QRL, useVisibleTask$, useSignal } from '@qwik.dev/core';
import prismjs from 'prismjs';
// Set to global so that prism language plugins can find it.
const _global =
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/code-sandbox/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$, useContext, useStylesScoped$, Slot, useSignal } from '@builder.io/qwik';
import { component$, useContext, useStylesScoped$, Slot, useSignal } from '@qwik.dev/core';
import CSS from './index.css?inline';
import { GlobalStore } from '../../context';
import { EditIcon } from '../svgs/edit-icon';
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/src/components/content-nav/content-nav.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type ContentMenu, useContent, useLocation } from '@builder.io/qwik-city';
import { component$, useStyles$ } from '@builder.io/qwik';
import { type ContentMenu, useContent, useLocation } from '@qwik.dev/city';
import { component$, useStyles$ } from '@qwik.dev/core';
import styles from './content-nav.css?inline';

export const ContentNav = component$(() => {
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/src/components/contributors/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { component$, useStylesScoped$ } from '@builder.io/qwik';
import { useDocumentHead } from '@qwik.dev/city';
import { component$, useStylesScoped$ } from '@qwik.dev/core';
import styles from './contributors.css?inline';
import { useDocumentHead } from '@builder.io/qwik-city';

export default component$(() => {
useStylesScoped$(styles);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$, useSignal, useStyles$ } from '@builder.io/qwik';
import { component$, useSignal, useStyles$ } from '@qwik.dev/core';
import { CopyCode as CopyCodeIcon } from '../svgs/copy-code-icon';
import styles from './copy-code.css?inline';

Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/docsearch/algolia-logo.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$ } from '@builder.io/qwik';
import { component$ } from '@qwik.dev/core';

type AlgoliaLogoTranslations = Partial<{
searchByText: string;
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/docsearch/context.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { createContextId } from '@builder.io/qwik';
import { createContextId } from '@qwik.dev/core';

export const SearchContext = createContextId<any>('docsearch');
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$ } from '@builder.io/qwik';
import { component$ } from '@qwik.dev/core';
import { SearchIcon } from './icons/SearchIcon';

export function isAppleDevice() {
Expand Down
4 changes: 2 additions & 2 deletions packages/docs/src/components/docsearch/doc-search-modal.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$, useSignal, noSerialize, useContextProvider, useTask$ } from '@builder.io/qwik';
import { component$, useSignal, noSerialize, useContextProvider, useTask$ } from '@qwik.dev/core';
import { MAX_QUERY_SIZE } from './constants';
import { SearchContext } from './context';
import type { DocSearchProps, DocSearchState } from './doc-search';
Expand All @@ -12,7 +12,7 @@ import type { DocSearchHit } from './types';
import { identity } from './utils';
import { clearStalled, setStalled } from './utils/stalledControl';
import { AIButton } from './result';
import { isBrowser } from '@builder.io/qwik/build';
import { isBrowser } from '@qwik.dev/core/build';

export type ModalTranslations = Partial<{
searchBox: SearchBoxTranslations;
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 @@ -9,7 +9,7 @@ import {
type Signal,
$,
sync$,
} from '@builder.io/qwik';
} from '@qwik.dev/core';
import type { DocSearchHit, InternalDocSearchHit } from './types';
import { type ButtonTranslations, DocSearchButton } from './doc-search-button';
import { DocSearchModal, type ModalTranslations } from './doc-search-modal';
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/docsearch/error-screen.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$ } from '@builder.io/qwik';
import { component$ } from '@qwik.dev/core';
import { ErrorIcon } from './icons/ErrorIcon';

export type ErrorScreenTranslations = Partial<{
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/src/components/docsearch/hit.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$, Slot } from '@builder.io/qwik';
import { component$, Slot } from '@qwik.dev/core';
import type { InternalDocSearchHit, StoredDocSearchHit } from './types';

interface HitProps {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$ } from '@builder.io/qwik';
import { component$ } from '@qwik.dev/core';

export const ControlKeyIcon = component$(() => {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { component$ } from '@builder.io/qwik';
import { component$ } from '@qwik.dev/core';

export const ErrorIcon = component$(() => {
return (
Expand Down
Loading
Loading