Skip to content

Commit 54a8386

Browse files
authored
Merge pull request #2241 from maevsi/feat/deps/vio-v21
feat(deps): upgrade @dargmuesli/nuxt-vio to v21
2 parents 2e4e687 + 4a4324c commit 54a8386

File tree

111 files changed

+3194
-2630
lines changed

Some content is hidden

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

111 files changed

+3194
-2630
lines changed

.renovaterc.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
{
66
"allowedVersions": "1.15.6",
77
"matchPackageNames": ["h3"]
8-
},
9-
{
10-
"allowedVersions": "5.1.12",
11-
"matchPackageNames": ["nuxt-og-image"]
128
}
139
]
1410
}

Dockerfile

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ RUN --mount=type=cache,id=apk-cache,target=/var/cache/apk \
2323
mkcert \
2424
&& corepack enable
2525

26-
COPY ./docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
27-
2826

2927
#############
3028
# Serve Nuxt in development mode.
@@ -40,6 +38,8 @@ RUN mkdir \
4038
/srv/.pnpm-store \
4139
/srv/app/node_modules
4240

41+
COPY ./docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
42+
4343
VOLUME /srv/.pnpm-store
4444
VOLUME /srv/app
4545
VOLUME /srv/app/node_modules
@@ -60,7 +60,7 @@ EXPOSE 3000
6060
FROM base-image AS prepare
6161

6262
COPY ./pnpm-lock.yaml ./pnpm-workspace.yaml ./package.json ./
63-
# COPY ./patches ./patches
63+
COPY ./patches ./patches
6464

6565
# TODO: evaluate dropping libc arguments by running e2e tests separately
6666
RUN --mount=type=cache,id=pnpm-store,target=/root/.local/share/pnpm/store \
@@ -123,7 +123,7 @@ RUN pnpm -r run test
123123
########################
124124
# Nuxt: test (e2e, base-image)
125125

126-
FROM mcr.microsoft.com/playwright:v1.58.2 AS test-e2e-base-image
126+
FROM mcr.microsoft.com/playwright:v1.59.1 AS test-e2e-base-image
127127

128128
# The `CI` environment variable must be set for pnpm to run in headless mode
129129
ENV CI=true
@@ -207,7 +207,7 @@ RUN pnpm --dir tests run test:e2e:server:node
207207
FROM base-image AS collect
208208

209209
COPY --from=build-node --chown=node /srv/app/src/.output ./.output
210-
COPY --from=build-node --chown=node /srv/app/src/scripts ./scripts
210+
COPY --from=build-node --chown=node /srv/app/src/node/server/node.mjs ./node/server/node.mjs
211211
COPY --from=build-node --chown=node /srv/app/src/package.json ./package.json
212212
# COPY --from=build-static /srv/app/package.json /dev/null
213213
COPY --from=lint /srv/app/package.json /dev/null
@@ -240,6 +240,7 @@ COPY --from=test-e2e-node /srv/app/package.json /dev/null
240240

241241
FROM collect AS production
242242

243+
ENV CI=false
243244
ENV NODE_ENV=production
244245

245246
ARG RELEASE_NAME
@@ -249,6 +250,8 @@ ENV RELEASE_NAME=${RELEASE_NAME}
249250
RUN --mount=type=cache,id=apk-cache,target=/var/cache/apk \
250251
apk upgrade
251252

253+
COPY ./docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
254+
252255
USER node
253256

254257
ENTRYPOINT ["docker-entrypoint.sh"]

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Find events, guests and friends: [vibetype.app](https://vibetype.app/).
1212

1313
This project is deployed within the [maevsi/stack](https://github.com/maevsi/stack/) in accordance with the [dargstack template](https://github.com/dargstack/dargstack_template/) to make deployment a breeze.
1414

15-
![Welcome](https://vibetype.app/__og-image__/image/og.png "Vibetype")
15+
![Welcome](https://vibetype.app/_og/d/a_VIBETYPE's+logo.,c_Default.takumi,description_~RmluZCBldmVudHMsIGd1ZXN0cyBhbmQgZnJpZW5kcyDwn5KZ4p2k77iP8J-SmiDwn4-b77iP,title_Vibetype.png "Vibetype")
1616

1717
## Table of Contents
1818
1. **[Contributing](#contributing)**

package.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
"overrides": {
2727
"debug": "4.4.3",
2828
"h3": "1.15.6",
29-
"nuxt-og-image": "5.1.12",
3029
"parse5-parser-stream": "8.0.0"
30+
},
31+
"patchedDependencies": {
32+
"nuxt-link-checker": "patches/nuxt-link-checker.patch"
3133
}
3234
},
3335
"private": true,
@@ -47,7 +49,8 @@
4749
"test:e2e:docker:server:node": "pnpm --dir tests run test:e2e:docker:server:node",
4850
"test:e2e:docker:server:node:update": "pnpm --dir tests run test:e2e:docker:server:node:update",
4951
"test:e2e:docker:server:static": "pnpm --dir tests run test:e2e:docker:server:static",
50-
"test:e2e:docker:server:static:update": "pnpm --dir tests run test:e2e:docker:server:static:update"
52+
"test:e2e:docker:server:static:update": "pnpm --dir tests run test:e2e:docker:server:static:update",
53+
"test:e2e:ui": "pnpm run --dir tests test:e2e:ui"
5154
},
5255
"type": "module"
5356
}

patches/nuxt-link-checker.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/dist/eslint.mjs b/dist/eslint.mjs
2+
index 03e90f6a8d4487518cf0f0905cf756649f858c31..d92a041a9b9af3546146e1dfcda50129a5915b53 100644
3+
--- a/dist/eslint.mjs
4+
+++ b/dist/eslint.mjs
5+
@@ -37,7 +37,7 @@ const markdownProcessor = {
6+
const links = extractMarkdownLinks(text);
7+
if (!links.length) {
8+
lineMapStack.push(/* @__PURE__ */ new Map());
9+
- return [{ text, filename: "0.md" }];
10+
+ return [];
11+
}
12+
const virtualLines = [];
13+
const lineMap = /* @__PURE__ */ new Map();

0 commit comments

Comments
 (0)