Skip to content

Commit

Permalink
Merge branch 'main' into userquin/feat-svg-sprite
Browse files Browse the repository at this point in the history
# Conflicts:
#	examples/vite-vue3/src/App.vue
#	playground/src/auto-imports.d.ts
  • Loading branch information
userquin committed Aug 6, 2023
2 parents 22d1414 + 93a0812 commit b753cf3
Show file tree
Hide file tree
Showing 416 changed files with 9,679 additions and 5,770 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
or are unsure if this is really a bug, make sure to:
- Read the `README.md` of using the package
- Already used the [Interactive Docs](https://uno.antfu.me)
- Already used the [Interactive Docs](https://unocss.dev/interactive/)
- Ask on [GitHub Discussion](https://github.com/unocss/unocss/discussions) or join our [Discord Chat Server](https://chat.antfu.me)
- type: input
Expand All @@ -30,7 +30,7 @@ body:
id: reproduction
attributes:
label: Reproduction
description: Please provide a link to [Playground](https://uno.antfu.me/play) or [StackBlitz](https://stackblitz.com/fork/github/unocss/unocss/tree/main/examples/vite-vue3) or a github repo that can reproduce the problem you ran into. A [minimal reproduction](https://stackoverflow.com/help/minimal-reproducible-example) is required unless you are absolutely sure that the issue is obvious and the provided information is enough to understand the problem.
description: Please provide a link to [Playground](https://unocss.dev/play/) or [StackBlitz](https://stackblitz.com/fork/github/unocss/unocss/tree/main/examples/vite-vue3) or a github repo that can reproduce the problem you ran into. A [minimal reproduction](https://stackoverflow.com/help/minimal-reproducible-example) is required unless you are absolutely sure that the issue is obvious and the provided information is enough to understand the problem. [Why reproduction is required](https://antfu.me/posts/why-reproductions-are-required).
placeholder: Reproduction
validations:
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ body:
required: true
- label: Read the `README.md` of using the package.
required: true
- label: Already used the [Interactive Docs](https://uno.antfu.me).
- label: Already used the [Interactive Docs](https://unocss.dev/interactive/).
required: false
- label: Check that there isn't already an issue that request the same feature to avoid creating a duplicate.
required: true
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
branches:
- main

merge_group: {}

jobs:
lint:
runs-on: ubuntu-latest
Expand Down
3 changes: 2 additions & 1 deletion .tazerc.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
"@vue/cli-plugin-babel",
"@vue/cli-service",
"unbuild",
"msw"
"msw",
"prettier"
],
"packageMode": {
"vue": "minor",
Expand Down
1 change: 1 addition & 0 deletions alias.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export const alias: Record<string, string> = {
'@unocss/transformer-variant-group': r('./packages/transformer-variant-group/src/'),
'unocss': r('./packages/unocss/src/'),
'@unocss/vite': r('./packages/vite/src/'),
'@unocss/vscode': r('./packages/vscode/src/'),
'@unocss/postcss': r('./packages/postcss/src/'),
'@unocss/webpack': r('./packages/webpack/src/'),
}
6 changes: 3 additions & 3 deletions bench/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"autoprefixer": "^10.4.14",
"fs-extra": "^11.1.1",
"local-pkg": "^0.4.3",
"postcss": "^8.4.23",
"tailwindcss": "^3.3.2",
"postcss": "^8.4.27",
"tailwindcss": "^3.3.3",
"unocss": "workspace:*",
"vite": "^4.3.8",
"vite": "^4.4.7",
"vite-plugin-windicss": "^1.9.0",
"vue": "^3.2.47",
"windicss": "^3.5.6"
Expand Down
4 changes: 2 additions & 2 deletions bench/run.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable no-console */
import { execSync } from 'child_process'
import { join } from 'path'
import { execSync } from 'node:child_process'
import { join } from 'node:path'
import fs from 'fs-extra'
import { escapeSelector } from '@unocss/core'
import { dir, getVersions, targets } from './meta.mjs'
Expand Down
28 changes: 20 additions & 8 deletions docs/.vitepress/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ const Configs: DefaultTheme.NavItemWithLink[] = [
{ text: 'Transformers', link: '/config/transformers' },
{ text: 'Preflights', link: '/config/preflights' },
{ text: 'Layers', link: '/config/layers' },
{ text: 'AutoComplete', link: '/config/autocomplete' },
{ text: 'Presets', link: '/config/presets' },
]

Expand All @@ -40,6 +41,7 @@ const Integrations: DefaultTheme.NavItemWithLink[] = [
{ text: 'PostCSS', link: '/integrations/postcss' },
{ text: 'ESLint', link: '/integrations/eslint' },
{ text: 'VSCode extension', link: '/integrations/vscode' },
{ text: 'JetBrains IDE Plugin', link: '/integrations/jetbrains' },
]

const Presets: DefaultTheme.NavItemWithLink[] = [
Expand Down Expand Up @@ -87,13 +89,17 @@ const Nav: DefaultTheme.NavItem[] = [
{
text: 'Integrations',
items: [
{
text: 'Overview',
link: '/integrations/',
},
{
text: 'Integrations',
items: Integrations,
},
{
text: 'Examples',
link: 'https://github.com/unocss/unocss/tree/main/examples',
link: '/integrations/#examples',
},
],
activeMatch: '^/integrations/',
Expand Down Expand Up @@ -162,19 +168,25 @@ const SidebarGuide: DefaultTheme.SidebarItem[] = [
},
{
text: 'Integrations',
items: Integrations,
},
{
text: 'Presets',
link: '/presets/',
items: [
{
text: 'Overview',
link: '/integrations/',
},
...Integrations,
{
text: 'Examples',
link: '/integrations/#examples',
},
],
},
{
text: 'Config',
link: '/config/',
},
{
text: 'Examples',
link: 'https://github.com/unocss/unocss/tree/main/examples',
text: 'Presets',
link: '/presets/',
},
]

Expand Down
214 changes: 214 additions & 0 deletions docs/.vitepress/content.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
export interface Integration {
icon: string
name: string
link: string
target?: string
secondary?: string
}

export interface Example {
name: string
path: string
stackblitz?: boolean
codesandbox?: boolean
icon?: string
icons?: string[]
}

// @unocss-include

export const integrations: Integration[] = [
{ name: 'Vite', link: '/integrations/vite', icon: 'i-logos-vitejs' },
{ name: 'Nuxt', link: '/integrations/nuxt', icon: 'i-logos-nuxt-icon' },
{ name: 'Astro', link: '/integrations/astro', icon: 'i-logos-astro-icon dark:invert' },
{ name: 'Svelte', secondary: '(Scoped)', link: '/integrations/svelte-scoped', icon: 'i-logos-svelte-icon' },
{ name: 'Webpack', link: '/integrations/webpack', icon: 'i-logos-webpack' },
{ name: 'CDN Runtime', link: '/integrations/runtime', icon: 'i-logos-javascript' },
{ name: 'CLI', link: '/integrations/cli', icon: 'i-carbon-terminal' },
{ name: 'PostCSS', link: '/integrations/postcss', icon: 'i-logos-postcss' },
{ name: 'ESLint', link: '/integrations/eslint', icon: 'i-logos-eslint' },
{ name: 'VSCode', link: '/integrations/vscode', icon: 'i-logos-visual-studio-code' },
]

export const examples: Example[] = [
{
name: 'astro',
path: 'examples/astro',
icon: 'i-logos-astro-icon dark:invert',
stackblitz: true,
},
{
name: 'quasar',
path: 'examples/quasar',
icon: 'i-vscode-icons-file-type-quasar',
stackblitz: true,
},
{
name: 'sveltekit-scoped',
path: 'examples/sveltekit-scoped',
icon: 'i-logos-svelte-icon',
stackblitz: true,
},
{
name: 'vite-solid',
path: 'examples/vite-solid',
icon: 'i-logos-solidjs-icon',
stackblitz: true,
},
{
name: 'vue-cli4',
path: 'examples/vue-cli4',
icon: 'i-logos-vue',
stackblitz: true,
},
{
name: 'astro-vue',
path: 'examples/astro-vue',
icons: [
'i-logos-astro-icon dark:invert',
'i-logos-vue',
],
stackblitz: true,
},
{
name: 'qwik',
path: 'examples/qwik',
icon: 'i-logos-qwik-icon',
// stackblitz: true,
},
{
name: 'vite-elm',
path: 'examples/vite-elm',
icon: 'i-logos-elm',
// stackblitz: true,
},
{
name: 'vite-svelte',
path: 'examples/vite-svelte',
icons: [
'i-logos-vitejs',
'i-logos-svelte-icon',
],
stackblitz: true,
},
{
name: 'vue-cli5',
path: 'examples/vue-cli5',
icon: 'i-logos-vue',
stackblitz: true,
},
{
name: 'next',
path: 'examples/next',
icon: 'i-logos-nextjs-icon',
// stackblitz: true,
codesandbox: true,
},
{
name: 'react',
path: 'examples/react',
icon: 'i-logos-react',
stackblitz: true,
},
{
name: 'vite-lightningcss',
path: 'examples/vite-lightningcss',
icon: 'i-ph-lightning text-yellow',
// lightingcss is not supported by stackblitz yet
// stackblitz: true,
},
{
name: 'vite-lit',
path: 'examples/vite-lit',
icon: 'i-logos-lit-icon',
stackblitz: true,
},
{
name: 'vite-svelte-postcss',
path: 'examples/vite-svelte-postcss',
icons: [
'i-logos-postcss',
'i-logos-svelte-icon',
],
stackblitz: true,
},
{
name: 'nuxt2',
path: 'examples/nuxt2',
icon: 'i-logos-nuxt-icon',
stackblitz: true,
},
{
name: 'remix',
path: 'examples/remix',
icon: 'i-logos-remix-icon dark:invert',
stackblitz: true,
},
{
name: 'vite-preact',
path: 'examples/vite-preact',
icon: 'i-logos-preact',
stackblitz: true,
},
{
name: 'vite-vue3',
path: 'examples/vite-vue3',
icons: [
'i-logos-vitejs',
'i-logos-vue',
],
stackblitz: true,
},
{
name: 'nuxt2-webpack',
path: 'examples/nuxt2-webpack',
icons: [
'i-logos-webpack',
'i-logos-nuxt-icon',
],
stackblitz: true,
},
{
name: 'sveltekit',
path: 'examples/sveltekit',
icon: 'i-logos-svelte-icon',
stackblitz: true,
},
{
name: 'vite-pug',
path: 'examples/vite-pug',
icon: 'i-logos-pug',
stackblitz: true,
},
{
name: 'vite-vue3-postcss',
path: 'examples/vite-vue3-postcss',
icons: [
'i-logos-postcss',
'i-logos-vue',
],
stackblitz: true,
},
{
name: 'nuxt3',
path: 'examples/nuxt3',
icon: 'i-logos-nuxt-icon',
stackblitz: true,
},
{
name: 'sveltekit-preprocess',
path: 'examples/sveltekit-preprocess',
icon: 'i-logos-svelte-icon',
stackblitz: true,
},
{
name: 'vite-react',
path: 'examples/vite-react',
icons: [
'i-logos-vitejs',
'i-logos-react',
],
stackblitz: true,
},
]
.sort((a, b) => a.name.localeCompare(b.name))
Empty file added docs/.vitepress/generate.ts
Empty file.

0 comments on commit b753cf3

Please sign in to comment.