Skip to content

Commit 653f716

Browse files
authored
Merge pull request #222 from stevebauman/nuxt3
Version 2
2 parents c5feedd + e95d42b commit 653f716

File tree

372 files changed

+44385
-27052
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

372 files changed

+44385
-27052
lines changed

.github/workflows/run-tests.yml

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,22 @@
11
name: run-tests
22

33
on:
4-
push:
4+
push:
5+
branches:
6+
- master
57
pull_request:
6-
schedule:
7-
- cron: '0 0 * * *'
88

99
jobs:
1010
run-tests:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
14-
- uses: actions/setup-node@v3
13+
- uses: actions/checkout@v4
14+
- uses: actions/setup-node@v4
1515
with:
16-
node-version: 16
16+
node-version: 20
1717

18-
- name: Install Showcode Dependencies
19-
run: yarn
18+
- name: Install Dependencies
19+
run: npm ci
2020

21-
- name: Run Showcode
22-
run: yarn run dev &
23-
24-
- name: Install Composer Dependencies
25-
working-directory: ./browser
26-
run: composer install --no-progress --prefer-dist --optimize-autoloader
27-
28-
- name: Upgrade Chrome Driver
29-
working-directory: ./browser
30-
run: php application dusk:chrome-driver
31-
32-
- name: Run Dusk Tests
33-
working-directory: ./browser
34-
run: php application pest:dusk test
35-
36-
- name: Upload Screenshots
37-
if: failure()
38-
uses: actions/upload-artifact@v2
39-
with:
40-
name: screenshots
41-
path: browser/storage/screenshots
42-
43-
- name: Upload Console Logs
44-
if: failure()
45-
uses: actions/upload-artifact@v2
46-
with:
47-
name: console
48-
path: browser/storage/console
21+
- name: Run Tests
22+
run: npx vitest run

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ typings/
7272
# Nuxt generate
7373
/dist
7474

75+
# Nuxt build output
76+
.output
77+
7578
# vuepress build output
7679
.vuepress/dist
7780

.nuxtrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
setups.@nuxt/test-utils="4.0.0"

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
22

.prettierrc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"arrowParens": "always",
33
"bracketSpacing": true,
44
"endOfLine": "lf",
5-
"htmlWhitespaceSensitivity": "css",
5+
"htmlWhitespaceSensitivity": "ignore",
66
"insertPragma": false,
7-
"jsxBracketSameLine": false,
7+
"bracketSameLine": false,
88
"jsxSingleQuote": false,
99
"singleQuote": true,
1010
"printWidth": 100,
@@ -15,5 +15,6 @@
1515
"trailingComma": "es5",
1616
"useTabs": false,
1717
"vueIndentScriptAndStyle": false,
18-
"tabWidth": 4
18+
"tabWidth": 4,
19+
"plugins": ["prettier-plugin-tailwindcss"]
1920
}

app/app.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<template>
2+
<NuxtPage />
3+
</template>
Lines changed: 38 additions & 36 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 67 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
h2,
66
h3,
77
h4 {
8-
@apply mb-4 font-semibold leading-snug text-ui-gray-100;
8+
@apply mb-4 font-semibold leading-snug text-zinc-800;
99
}
1010

1111
h1 {
@@ -22,7 +22,7 @@
2222
}
2323

2424
a {
25-
@apply underline text-ui-violet-500;
25+
@apply underline text-violet-800;
2626
}
2727

2828
ul {
@@ -51,7 +51,7 @@
5151
}
5252

5353
hr {
54-
@apply my-6 border-ui-gray-900;
54+
@apply my-6 border-white;
5555
}
5656

5757
img {
@@ -64,11 +64,11 @@
6464
pre,
6565
strong,
6666
blockquote {
67-
@apply my-4 text-base leading-7 text-ui-gray-100;
67+
@apply my-4 text-base leading-7 text-zinc-800;
6868
}
6969

7070
blockquote {
71-
@apply px-4 py-2 border-l-4 border-ui-violet-500 bg-ui-violet-900;
71+
@apply px-4 py-2 border-l-4 border-violet-800 bg-violet-600;
7272
p:first-child {
7373
@apply mt-0;
7474
}
@@ -96,11 +96,11 @@
9696
-moz-hyphens: none;
9797
-ms-hyphens: none;
9898
hyphens: none;
99-
@apply font-mono leading-6 rounded-lg bg-ui-gray-900 text-ui-gray-100;
99+
@apply font-mono leading-6 rounded-lg bg-white text-zinc-800;
100100
}
101101

102102
pre:not(code) {
103-
@apply p-2 border border-ui-gray-800;
103+
@apply p-2 border border-zinc-200;
104104
}
105105

106106
pre[class*="language-"] {
@@ -112,7 +112,7 @@
112112
}
113113

114114
code:not(pre code) {
115-
@apply p-1 border border-ui-gray-800;
115+
@apply p-1 border border-zinc-200;
116116

117117
&:before,
118118
&:after {
@@ -125,26 +125,80 @@
125125
}
126126

127127
kbd {
128-
@apply px-2 py-1 text-sm border rounded shadow-sm border-ui-gray-500 bg-ui-gray-700 text-ui-gray-200;
128+
@apply px-2 py-1 text-sm border rounded shadow-sm border-zinc-400 bg-zinc-100 text-zinc-700;
129129
}
130130

131131
table {
132-
@apply w-full overflow-hidden text-left divide-y rounded-lg shadow-sm divide-ui-gray-500;
132+
@apply w-full overflow-hidden text-left divide-y rounded-lg shadow-sm divide-zinc-400;
133133

134134
thead {
135-
@apply text-xs font-semibold tracking-wider uppercase bg-ui-gray-600 text-ui-gray-300;
135+
@apply text-xs font-semibold tracking-wider uppercase bg-zinc-50 text-zinc-600;
136136
}
137137

138138
tbody {
139-
@apply divide-y divide-ui-gray-500;
139+
@apply divide-y divide-zinc-400;
140140
}
141141

142142
th {
143143
@apply p-2;
144144
}
145145

146146
td {
147-
@apply p-2 text-sm leading-relaxed text-ui-gray-200 bg-ui-gray-900 border-ui-gray-500;
147+
@apply p-2 text-sm leading-relaxed text-zinc-700 bg-white border-zinc-400;
148+
}
149+
}
150+
}
151+
152+
.dark .nuxt-content {
153+
h1, h2, h3, h4 {
154+
@apply text-zinc-100;
155+
}
156+
157+
a {
158+
@apply text-violet-500;
159+
}
160+
161+
hr {
162+
@apply border-black;
163+
}
164+
165+
p, ol, ul, pre, strong, blockquote {
166+
@apply text-zinc-100;
167+
}
168+
169+
blockquote {
170+
@apply border-violet-500 bg-violet-900;
171+
}
172+
173+
code, pre {
174+
@apply bg-black text-zinc-100;
175+
}
176+
177+
pre:not(code) {
178+
@apply border-zinc-950;
179+
}
180+
181+
code:not(pre code) {
182+
@apply border-zinc-950;
183+
}
184+
185+
kbd {
186+
@apply border-zinc-500 bg-zinc-900 text-zinc-200;
187+
}
188+
189+
table {
190+
@apply divide-zinc-500;
191+
192+
thead {
193+
@apply bg-zinc-600 text-zinc-300;
194+
}
195+
196+
tbody {
197+
@apply divide-zinc-500;
198+
}
199+
200+
td {
201+
@apply text-zinc-200 bg-black border-zinc-500;
148202
}
149203
}
150204
}
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[color-scheme="dark"] {
1+
.dark {
22
code[class*="language-"]::-moz-selection,
33
pre[class*="language-"]::-moz-selection,
44
code[class*="language-"]::-moz-selection,
@@ -26,7 +26,7 @@
2626
}
2727

2828
.token.package {
29-
@apply text-ui-gray-100;
29+
@apply text-zinc-100;
3030
}
3131

3232
.token.atrule {
@@ -70,7 +70,7 @@
7070
}
7171

7272
.token.class-name {
73-
@apply text-ui-gray-100;
73+
@apply text-zinc-100;
7474
}
7575

7676
.token.comment {
@@ -143,7 +143,7 @@
143143
}
144144

145145
.token:not(.tag) > .punctuation {
146-
@apply text-ui-gray-100;
146+
@apply text-zinc-100;
147147
}
148148

149149
.token.tag > .punctuation {
@@ -184,6 +184,6 @@
184184

185185
.token.class-name-fully-qualified,
186186
.token.class-name {
187-
@apply text-ui-gray-100;
187+
@apply text-zinc-100;
188188
}
189189
}

0 commit comments

Comments
 (0)