Merge pull request #593 from api-platform/staging

Author: soyuka

docker-compose.override.yml

@@ -1,5 +1,3 @@
-version: "3.4"
-
 # Development environment override
 services:
   php:

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.4"
-
 services:
   php:
     image: ${IMAGES_PREFIX:-}app-php

pwa/Dockerfile

@@ -7,7 +7,8 @@ RUN apk add --no-cache libc6-compat bash git
 
 WORKDIR /srv/app
 
-RUN corepack enable && \
+RUN npm install --global corepack@latest && \
+	corepack enable && \
 	corepack prepare --activate pnpm@latest && \
 	pnpm config -g set store-dir /.pnpm-store
 
@@ -18,6 +19,8 @@ RUN corepack enable && \
 
 FROM php as php_documentation_generator
 
+ENV COMPOSER_ALLOW_SUPERUSER=1
+
 RUN apt-get update && apt-get install -y gnupg git libzip-dev zip
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 # this is used to preload data see phpwasm
@@ -79,7 +82,7 @@ RUN --mount=type=secret,id=GITHUB_KEY \
 	if [ -z "$GITHUB_KEY" ]; then \
 		 echo "Please set the GITHUB_KEY secret" && exit 1 ; \
 	fi  \
-	&& pnpm run prebuild
+	&& npm i ts-node && npm run prebuild
 
 # ADD https://soyuka.me/contributors.json ./data/contributors.json
 
@@ -95,7 +98,7 @@ RUN --mount=type=secret,id=GITHUB_KEY \
 	if [ -z "$GITHUB_KEY" ]; then \
 		 echo "Please set the GITHUB_KEY secret" && exit 1 ; \
 	fi  \
-	&& pnpm run postbuild
+	&& npm i ts-node && npm run postbuild
 
 # Production image, copy all the files and run next
 FROM node:18-alpine AS prod

pwa/consts.ts

@@ -1,4 +1,5 @@
 export const versions = [
+  "4.1",
   "4.0",
   "3.4",
   "3.3",
@@ -15,6 +16,6 @@ export const versions = [
   "main",
 ];
 
-export const refVersions: string[] = ["4.0", "3.4", "3.3", "3.2", "main"];
+export const refVersions: string[] = ["4.1", "4.0", "3.4", "3.3", "3.2", "main"];
 
-export const current = "4.0";
+export const current = "4.1";

pwa/contributors.js

@@ -0,0 +1,14 @@
+import { getAllContributors } from "./api/contributorsRank";
+const fs = require("fs");
+const path = require("path");
+
+async function getContributors() {
+  const allContributors = await getAllContributors();
+  fs.writeFileSync(
+    path.join(process.cwd(), "data/contributors.json"),
+    JSON.stringify(allContributors, null, 2),
+    "utf-8"
+  );
+}
+
+getContributors();

pwa/docs-versions.txt

@@ -1,3 +1,4 @@
+4.1
 4.0
 3.4
 3.3

pwa/pnpm-lock.yaml

@@ -0,0 +1,11 @@
+const cpr = require("cpr");
+const path = require("path");
+
+cpr(path.join(__dirname, 'node_modules/shiki/themes'), path.join(__dirname, '.next/standalone/node_modules/shiki/themes'), function(err: any, files: any) {
+  err && console.error(err)
+});
+
+cpr(path.join(__dirname, 'node_modules/shiki/languages'), path.join(__dirname, '.next/standalone/node_modules/shiki/languages'), function(err: any, files: any) {
+  err && console.error(err)
+});
+