Skip to content

Commit

Permalink
Merge branch 'main' into fix/ts-import-not-found
Browse files Browse the repository at this point in the history
  • Loading branch information
Tahul authored Nov 28, 2023
2 parents 8710fc5 + 807030e commit 228e97c
Show file tree
Hide file tree
Showing 207 changed files with 10,264 additions and 6,460 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,15 +113,15 @@ Example: [`examples/vite-react/vite.config.ts`](./examples/vite-react/vite.confi
<details>
<summary>Use our theme or create yours</summary><br>

Use our default theme, [🎨 Palette](./packages/palette):
Use our default theme, [🎨 Pigments](./packages/pigments):

```ts
// vite.config.ts
export default defineConfig({
plugins: [
Pinceau({
theme: {
layers: ['@pinceau/palette']
layers: ['@pinceau/pigments']
}
})
]
Expand Down
2 changes: 1 addition & 1 deletion docs/content/2.styling/0.your-first-component.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ For this button, we have multiple requirements, it must:

::div{style="margin-bottom: var(--space-8);"}
::list
- Support all existing and future colors from our theme color palette
- Support all existing and future colors from our theme color pigments.
- Have `sm`, `md`, `lg` and `xl` sizes
- Support `--button-primary` and `--button-secondary` local tokens for advanced customization
- Have type-safe component properties
Expand Down
2 changes: 1 addition & 1 deletion docs/nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default defineNuxtConfig({
buildDir: resolve('./node_modules/.pinceau'),
layers: [
{
path: resolve('../../packages/palette/'),
path: resolve('../../packages/pigments/'),
},
],
},
Expand Down
10 changes: 5 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
"preview": "nuxt preview"
},
"devDependencies": {
"@nuxt/content": "^2.8.5",
"@nuxt/content": "^2.9.0",
"@nuxt/devtools": "latest",
"@pinceau/nuxt": "workspace:*",
"@pinceau/palette": "workspace:*",
"@pinceau/pigments": "workspace:*",
"@vueuse/motion": "^2.0.0",
"nuxt": "^3.7.4",
"nuxt-icon": "^0.5.0",
"vue": "^3.3.4",
"nuxt": "^3.8.1",
"nuxt-icon": "^0.6.6",
"vue": "^3.3.8",
"vue-router": "^4.2.5"
}
}
4 changes: 3 additions & 1 deletion eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default antfu(
'jsdoc/require-returns': 'off',
'ts/no-namespace': 'off',
'new-cap': 'off',
'vue/require-explicit-emits': 'off',
},
},
{
Expand All @@ -26,11 +27,12 @@ export default antfu(
'**/*.md',
'**/examples/**',
'**/package.json',
'packages/palette/output/',
'packages/pigments/output/',
'**/tests/fixtures/',
'**/tests/tmp/',
'.vscode',
'**/grammars/*.tmLanguage.js',
'packages/outputs/',
],
},
)
8 changes: 4 additions & 4 deletions examples/astro-svelte/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"start": "astro dev --port=3000"
},
"dependencies": {
"vue": "^3.3.4"
"vue": "^3.3.8"
},
"devDependencies": {
"@astrojs/svelte": "^4.0.3",
"@astrojs/svelte": "^4.0.4",
"@pinceau/astro": "workspace:*",
"@pinceau/configs": "workspace:*",
"@pinceau/palette": "workspace:*",
"@pinceau/pigments": "workspace:*",
"@pinceau/outputs": "workspace:*", "@pinceau/svelte": "workspace:*",
"astro": "^3.3.0"
"astro": "^3.5.5"
},
"stackblitz": {
"installDependencies": false,
Expand Down
21 changes: 0 additions & 21 deletions examples/astro-svelte/src/components/Card.astro

This file was deleted.

3 changes: 3 additions & 0 deletions examples/astro-svelte/src/components/Example.svelte
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<div>
Example Vue component
</div>
5 changes: 0 additions & 5 deletions examples/astro-svelte/src/components/Example.vue

This file was deleted.

15 changes: 0 additions & 15 deletions examples/astro-svelte/src/pages/foo.astro

This file was deleted.

14 changes: 3 additions & 11 deletions examples/astro-svelte/src/pages/index.astro
Original file line number Diff line number Diff line change
@@ -1,22 +1,14 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
import Example from '../components/Example.vue';
import Example from '../components/Example.svelte';
---

<Layout title="Welcome to Astro.">
<main>
<h1>Welcome to <span>Astro</span></h1>
<p class="instructions">
Check out the <code>src/pages</code> directory to get started.<br />
</p>
<h1>Welcome to <span>Pinceau</span></h1>
<ul role="list" >
<Card
href="/foo"
title="/foo"
body="Go to page foo."
/>
<Example client:only="vue" />
<Example client:only="svelte" />
</ul>
</main>
</Layout>
8 changes: 4 additions & 4 deletions examples/astro-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"start": "astro dev --port=3000"
},
"dependencies": {
"vue": "^3.3.4"
"vue": "^3.3.8"
},
"devDependencies": {
"@astrojs/vue": "^3.0.1",
"@astrojs/vue": "^3.0.4",
"@pinceau/astro": "workspace:*",
"@pinceau/configs": "workspace:*",
"@pinceau/palette": "workspace:*",
"@pinceau/pigments": "workspace:*",
"@pinceau/outputs": "workspace:*", "@pinceau/vue": "workspace:*",
"astro": "^3.3.0"
"astro": "^3.5.5"
},
"stackblitz": {
"installDependencies": false,
Expand Down
21 changes: 0 additions & 21 deletions examples/astro-vue/src/components/Card.astro

This file was deleted.

15 changes: 0 additions & 15 deletions examples/astro-vue/src/pages/foo.astro

This file was deleted.

13 changes: 2 additions & 11 deletions examples/astro-vue/src/pages/index.astro
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
---
import Layout from '../layouts/Layout.astro';
import Card from '../components/Card.astro';
import Example from '../components/Example.vue';
---

<Layout title="Welcome to Astro.">
<Layout title="Welcome to Pinceau">
<main>
<h1>Welcome to <span>Astro</span></h1>
<p class="instructions">
Check out the <code>src/pages</code> directory to get started.<br />
</p>
<h1>Welcome to <span>Pinceau</span></h1>
<ul role="list" >
<Card
href="/foo"
title="/foo"
body="Go to page foo."
/>
<Example client:only="vue" />
</ul>
</main>
Expand Down
4 changes: 2 additions & 2 deletions examples/astro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
},
"devDependencies": {
"@pinceau/astro": "workspace:*",
"astro": "^3.3.0",
"canvas-confetti": "^1.9.0"
"astro": "^3.5.5",
"canvas-confetti": "^1.9.1"
},
"stackblitz": {
"installDependencies": false,
Expand Down
14 changes: 2 additions & 12 deletions examples/nuxt/app.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
<script setup lang="ts">
const TestComponent = $styled.a({
})
</script>

<template>
<App
:styled="{
backgroundColor: '$color.blue.1'
}"
>
<main>
<NuxtPage />
</App>
</main>
</template>
6 changes: 3 additions & 3 deletions examples/nuxt/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
},
"dependencies": {
"@pinceau/nuxt": "workspace:*",
"@pinceau/palette": "workspace:*"
"@pinceau/pigments": "workspace:*"
},
"devDependencies": {
"@pinceau/configs": "workspace:*",
"@pinceau/palette": "workspace:*",
"@pinceau/outputs": "workspace:*", "nuxt": "^3.7.4"
"@pinceau/pigments": "workspace:*",
"@pinceau/outputs": "workspace:*", "nuxt": "^3.8.1"
},
"stackblitz": {
"installDependencies": false,
Expand Down
2 changes: 1 addition & 1 deletion examples/nuxt/pages/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div>
<MyButton size="xl" color="green" />
Hello World
</div>
</template>
48 changes: 0 additions & 48 deletions examples/shared/App.vue

This file was deleted.

Loading

0 comments on commit 228e97c

Please sign in to comment.