Skip to content

Commit

Permalink
Merge branch 'main' of ssh://github.com/BuilderIO/qwik into fixed_ser…
Browse files Browse the repository at this point in the history
…ialize
  • Loading branch information
genki committed Sep 16, 2023
2 parents 7074c76 + bfe8040 commit c42dc77
Show file tree
Hide file tree
Showing 47 changed files with 5,619 additions and 596 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -414,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 @@ -680,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: 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
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
5 changes: 5 additions & 0 deletions packages/docs/scripts/pages.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
"href": "https://www.builder.io/",
"tags": "saas"
},
{
"href": "https://www.expobeds.com/",
"size": "large",
"tags": "conpany"
},
{
"href": "https://jose-aguilar.vercel.app/",
"tags": "portfolio"
Expand Down
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
2 changes: 1 addition & 1 deletion packages/docs/src/repl/worker/app-bundle-client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ export const getInputs = (options: ReplInputOptions) => {
});
};

const MODULE_EXTS = ['.tsx', '.ts', '.js', '.jsx', '.mjs'];
const MODULE_EXTS = ['.tsx', '.ts', '.js', '.jsx', '.mjs', '.css'];

export const getOutput = (o: OutputChunk | OutputAsset) => {
const f: ReplModuleOutput = {
Expand Down
5 changes: 3 additions & 2 deletions packages/docs/src/repl/worker/repl-plugins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@ const getRuntimeBundle = (runtimeBundle: string) => {
};

export const replCss = (options: ReplInputOptions): Plugin => {
const isStylesheet = (id: string) => ['.css', '.scss', '.sass'].some((ext) => id.endsWith(ext));
const isStylesheet = (id: string) =>
['.css', '.scss', '.sass'].some((ext) => id.endsWith(`${ext}?inline`));

return {
name: 'repl-css',
Expand All @@ -129,7 +130,7 @@ export const replCss = (options: ReplInputOptions): Plugin => {

load(id) {
if (isStylesheet(id)) {
const input = options.srcInputs.find((i) => i.path.endsWith(id));
const input = options.srcInputs.find((i) => i.path.endsWith(id.replace(/\?inline$/, '')));
if (input && typeof input.code === 'string') {
return `const css = ${JSON.stringify(input.code)}; export default css;`;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}
],
"kind": "Interface",
"content": "```typescript\nexport interface NetlifyEdgeAdapterOptions extends ServerAdapterOptions \n```\n**Extends:** ServerAdapterOptions\n\n\n| Property | Modifiers | Type | Description |\n| --- | --- | --- | --- |\n| [excludedPath?](#) | | string | _(Optional)_ Manually add path pattern that should be excluded from the edge function routes that are created by the 'manifest.json' file. |\n| [functionRoutes?](#) | | boolean | <p>_(Optional)_ Determines if the build should generate the edge functions declarations <code>manifest.json</code> file.</p><p>https://docs.netlify.com/edge-functions/declarations/</p><p>Defaults to <code>true</code>.</p> |\n| [staticPaths?](#) | | string\\[\\] | _(Optional)_ Manually add pathnames that should be treated as static paths and not SSR. For example, when these pathnames are requested, their response should come from a static file, rather than a server-side rendered response. |",
"content": "```typescript\nexport interface NetlifyEdgeAdapterOptions extends ServerAdapterOptions \n```\n**Extends:** ServerAdapterOptions\n\n\n| Property | Modifiers | Type | Description |\n| --- | --- | --- | --- |\n| [excludedPath?](#) | | string \\| string\\[\\] | <p>_(Optional)_ Manually add path pattern that should be excluded from the edge function routes that are created by the 'manifest.json' file.</p><p>If not specified, the following paths are excluded by default: /build/\\* /favicon.ico /robots.txt /mainifest.json /\\~partytown/\\* /service-worker.js /sitemap.xml</p><p>https://docs.netlify.com/edge-functions/declarations/\\#declare-edge-functions-in-netlify-toml</p> |\n| [functionRoutes?](#) | | boolean | <p>_(Optional)_ Determines if the build should generate the edge functions declarations <code>manifest.json</code> file.</p><p>https://docs.netlify.com/edge-functions/declarations/</p><p>Defaults to <code>true</code>.</p> |\n| [staticPaths?](#) | | string\\[\\] | _(Optional)_ Manually add pathnames that should be treated as static paths and not SSR. For example, when these pathnames are requested, their response should come from a static file, rather than a server-side rendered response. |",
"editUrl": "https://github.com/BuilderIO/qwik/tree/main/packages/qwik-city/adapters/netlify-edge/vite/index.ts",
"mdFile": "qwik-city.netlifyedgeadapteroptions.md"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ export interface NetlifyEdgeAdapterOptions extends ServerAdapterOptions
**Extends:** ServerAdapterOptions
| Property | Modifiers | Type | Description |
| -------------------- | --------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
| [excludedPath?](#) | | string | _(Optional)_ Manually add path pattern that should be excluded from the edge function routes that are created by the 'manifest.json' file. |
| [functionRoutes?](#) | | boolean | <p>_(Optional)_ Determines if the build should generate the edge functions declarations <code>manifest.json</code> file.</p><p>https://docs.netlify.com/edge-functions/declarations/</p><p>Defaults to <code>true</code>.</p> |
| [staticPaths?](#) | | string[] | _(Optional)_ Manually add pathnames that should be treated as static paths and not SSR. For example, when these pathnames are requested, their response should come from a static file, rather than a server-side rendered response. |
| Property | Modifiers | Type | Description |
| -------------------- | --------- | ------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [excludedPath?](#) | | string \| string[] | <p>_(Optional)_ Manually add path pattern that should be excluded from the edge function routes that are created by the 'manifest.json' file.</p><p>If not specified, the following paths are excluded by default: /build/\* /favicon.ico /robots.txt /mainifest.json /\~partytown/\* /service-worker.js /sitemap.xml</p><p>https://docs.netlify.com/edge-functions/declarations/\#declare-edge-functions-in-netlify-toml</p> |
| [functionRoutes?](#) | | boolean | <p>_(Optional)_ Determines if the build should generate the edge functions declarations <code>manifest.json</code> file.</p><p>https://docs.netlify.com/edge-functions/declarations/</p><p>Defaults to <code>true</code>.</p> |
| [staticPaths?](#) | | string[] | _(Optional)_ Manually add pathnames that should be treated as static paths and not SSR. For example, when these pathnames are requested, their response should come from a static file, rather than a server-side rendered response. |
[Edit this section](https://github.com/BuilderIO/qwik/tree/main/packages/qwik-city/adapters/netlify-edge/vite/index.ts)
Loading

0 comments on commit c42dc77

Please sign in to comment.