Skip to content
This repository has been archived by the owner on Apr 6, 2023. It is now read-only.

Commit

Permalink
Merge branch 'main' into feat/filesystem-entities
Browse files Browse the repository at this point in the history
  • Loading branch information
Diizzayy authored Oct 23, 2022
2 parents 3d54685 + 02227a2 commit 456dc1d
Show file tree
Hide file tree
Showing 603 changed files with 27,855 additions and 180,551 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ body:
Please use a template below to create a minimal reproduction
👉 https://stackblitz.com/github/nuxt/starter/tree/v3-stackblitz
👉 https://codesandbox.io/s/github/nuxt/starter/tree/v3-codesandbox
👉 https://codesandbox.io/p/github/nuxt/starter/v3-codesandbox
- type: textarea
id: bug-env
attributes:
Expand Down
109 changes: 79 additions & 30 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: CI
on:
push:
paths-ignore:
- 'docs/**'
- "docs/**"
branches:
- main
pull_request:
paths-ignore:
- 'docs/**'
- "docs/**"
branches:
- main

Expand All @@ -25,16 +25,17 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: corepack enable
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
cache: "pnpm"

- name: Install dependencies
run: yarn --immutable
run: pnpm install

- name: Build
run: yarn build
run: pnpm build

- name: Cache dist
uses: actions/cache@v3
Expand All @@ -54,16 +55,17 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: corepack enable
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
cache: "pnpm"

- name: Install dependencies
run: yarn --immutable
run: pnpm install

- name: Lint
run: yarn lint
run: pnpm lint

typecheck:
runs-on: ${{ matrix.os }}
Expand All @@ -77,19 +79,20 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: corepack enable
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
cache: "pnpm"

- name: Install dependencies
run: yarn --immutable
run: pnpm install

- name: Stub
run: yarn stub
- name: Build (stub)
run: pnpm build:stub

- name: Typecheck
run: yarn typecheck
run: pnpm typecheck

test-fixtures:
runs-on: ${{ matrix.os }}
Expand All @@ -103,25 +106,47 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: corepack enable
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
cache: "pnpm"

- name: Install dependencies
run: yarn --immutable
run: pnpm install

# https://github.com/vitejs/vite/blob/main/.github/workflows/ci.yml#L62
# Install playwright's binary under custom directory to cache
- name: Set Playwright path
if: runner.os != 'Windows'
run: echo "PLAYWRIGHT_BROWSERS_PATH=$HOME/.cache/playwright-bin" >> $GITHUB_ENV
- name: Set Playwright path (windows)
if: runner.os == 'Windows'
run: echo "PLAYWRIGHT_BROWSERS_PATH=$HOME\.cache\playwright-bin" >> $env:GITHUB_ENV

- name: Cache Playwright's binary
uses: actions/cache@v3
with:
# Playwright removes unused browsers automatically
# So does not need to add playwright version to key
key: ${{ runner.os }}-playwright-bin-v1
path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }}

- name: Install Playwright
# does not need to explicitly set chromium after https://github.com/microsoft/playwright/issues/14862 is solved
run: pnpm playwright install chromium

- name: Stub
run: yarn stub
- name: Build (stub)
run: pnpm build:stub

- name: Test (unit)
run: yarn test:unit
run: pnpm test:unit

- name: Test (fixtures)
run: yarn test:fixtures
run: pnpm test:fixtures

- name: Test (fixtures with dev)
run: yarn test:fixtures:dev
run: pnpm test:fixtures:dev
env:
NODE_OPTIONS: --max-old-space-size=8192

Expand All @@ -137,19 +162,41 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: corepack enable
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
cache: "pnpm"

- name: Install dependencies
run: yarn --immutable
run: pnpm install

# https://github.com/vitejs/vite/blob/main/.github/workflows/ci.yml#L62
# Install playwright's binary under custom directory to cache
- name: Set Playwright path (non-windows)
if: runner.os != 'Windows'
run: echo "PLAYWRIGHT_BROWSERS_PATH=$HOME/.cache/playwright-bin" >> $GITHUB_ENV
- name: Set Playwright path (windows)
if: runner.os == 'Windows'
run: echo "PLAYWRIGHT_BROWSERS_PATH=$HOME\.cache\playwright-bin" >> $env:GITHUB_ENV

- name: Cache Playwright's binary
uses: actions/cache@v3
with:
# Playwright removes unused browsers automatically
# So does not need to add playwright version to key
key: ${{ runner.os }}-playwright-bin-v1
path: ${{ env.PLAYWRIGHT_BROWSERS_PATH }}

- name: Install Playwright
# does not need to explicitly set chromium after https://github.com/microsoft/playwright/issues/14862 is solved
run: pnpm playwright install chromium

- name: Stub
run: yarn stub
- name: Build (stub)
run: pnpm build:stub

- name: Test (fixtures)
run: yarn test:fixtures:webpack
run: pnpm test:fixtures:webpack

test-types:
needs:
Expand All @@ -165,13 +212,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: corepack enable
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
cache: "pnpm"

- name: Install dependencies
run: yarn --immutable
run: pnpm install

- name: Restore dist cache
uses: actions/cache@v3
Expand All @@ -180,7 +228,7 @@ jobs:
key: ${{ matrix.os }}-node-v${{ matrix.node }}-${{ github.sha }}

- name: Test (types)
run: yarn test:types
run: pnpm test:types

build-release:
if: |
Expand All @@ -205,13 +253,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: corepack enable
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
cache: "pnpm"

- name: Install dependencies
run: yarn --immutable
run: pnpm install

- name: Restore dist cache
uses: actions/cache@v3
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/docs-e2e.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: docs-e2e

on:
workflow_dispatch:
inputs:
url:
required: false
description: The URL to run the test suite against.
type: string
deployment_status:

jobs:
crawl-docs:
environment:
name: ${{ github.event.deployment.environment || 'Production' }}
url: ${{ github.event.inputs.url || github.event.deployment.payload.web_url || github.event.deployment_status.target_url }}
if: github.event.deployment_status.state == 'success' || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- run: corepack enable
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: "pnpm"

- name: Install dependencies
run: pnpm install

- run: node ./scripts/crawl.mjs
env:
BASE_URL: ${{ github.event.inputs.url || github.event.deployment.payload.web_url || github.event.deployment_status.target_url }}
15 changes: 8 additions & 7 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ name: Docs
on:
push:
paths:
- 'docs/**'
- '.github/workflows/docs.yml'
- "docs/**"
- ".github/workflows/docs.yml"
branches:
- main
pull_request:
paths:
- 'docs/**'
- '.github/workflows/docs.yml'
- "docs/**"
- ".github/workflows/docs.yml"
branches:
- main

Expand All @@ -25,13 +25,14 @@ jobs:

steps:
- uses: actions/checkout@v3
- run: corepack enable
- uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node }}
cache: 'yarn'
cache: "pnpm"

- name: Install dependencies
run: yarn --immutable
run: pnpm install

- name: Lint (docs)
run: yarn lint:docs
run: pnpm lint:docs
7 changes: 2 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ node_modules
jspm_packages

package-lock.json
# */**/yarn.lock
*/**/yarn.lock
/.yarn

# Logs
*.log
Expand All @@ -13,10 +14,6 @@ package-lock.json
.tmp
.cache

# Yarn
**/.yarn/cache
**/.yarn/*state*

# Generated dirs
dist
.nuxt
Expand Down
6 changes: 3 additions & 3 deletions .gitpod.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
tasks:
- init: |
npx yarn install
npx yarn stub
command: npx yarn play
npx pnpm install
npx pnpm build:stub
command: npx pnpm play
ports:
- port: 3000
Expand Down
2 changes: 2 additions & 0 deletions .markdownlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ MD024:
MD025: false
# Allow inline HTML
MD033: false
# Allow non blank lines around list
MD032: false
1 change: 1 addition & 0 deletions .markdownlintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

docs/content/index.md
docs/content/**/*.nuxt.config.md
docs/content/changelog.md
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
shamefully-hoist=true
strict-peer-dependencies=false
shell-emulator=true
3 changes: 3 additions & 0 deletions .stackblitz/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"startCommand": "pnpm build:stub && pnpm play"
}
363 changes: 0 additions & 363 deletions .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs

This file was deleted.

9 changes: 0 additions & 9 deletions .yarn/plugins/@yarnpkg/plugin-typescript.cjs

This file was deleted.

Loading

0 comments on commit 456dc1d

Please sign in to comment.