From 7dd77efeaa12b23ca0316220a48ed023d2a099b2 Mon Sep 17 00:00:00 2001 From: Stephanie Hays Date: Thu, 16 May 2024 10:40:24 -0500 Subject: [PATCH] containers --- .devcontainer/devcontainer.json | 42 ++++++ .github/workflows/pullrequest.yaml | 2 - Dockerfile | 12 ++ astro.config.mjs | 3 +- package.json | 8 +- yarn.lock | 206 ++++++++++++++--------------- 6 files changed, 164 insertions(+), 109 deletions(-) create mode 100644 .devcontainer/devcontainer.json create mode 100644 Dockerfile diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json new file mode 100644 index 00000000000..01c8d22eb8c --- /dev/null +++ b/.devcontainer/devcontainer.json @@ -0,0 +1,42 @@ +// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at: +// https://github.com/withastro/astro/blob/main/.devcontainer/with-mdx/devcontainer.json +{ + "name": "Astro", + + "build": { + "dockerfile": "../Dockerfile" + }, + + "portsAttributes": { + "5086": { + "label": "Application", + "onAutoForward": "openPreview" + } + }, + + "forwardPorts": [5086], + + "postAttachCommand": "yarn dev", + + "customizations": { + "codespaces": { + "openFiles": ["README.md"] + }, + "vscode": { + "extensions": [ + "ms-dotnettools.csharp", + "DavidAnson.vscode-markdownlint", + "shardulm94.trailing-spaces", + "nhoizey.gremlins", + "streetsidesoftware.code-spell-checker", + "bierner.emojisense", + "astro-build.astro-vscode", + "esbenp.prettier-vscode", + "unifiedjs.vscode-mdx", + "ms-vscode.vscode-typescript-next", + "dbaeumer.vscode-eslint" + ] + } + }, + "remoteUser": "node" +} diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml index 0ea701d4855..af0f5daa6e9 100644 --- a/.github/workflows/pullrequest.yaml +++ b/.github/workflows/pullrequest.yaml @@ -13,7 +13,5 @@ jobs: uses: actions/setup-node@v4 with: node-version: '20' - - name: Install dependencies - run: yarn install --immutable - name: Build site run: yarn build diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000000..10e0d8542c8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,12 @@ +FROM node:lts +WORKDIR /app + +COPY package.json yarn.lock ./ + +COPY . . + +RUN corepack enable + +EXPOSE 5086 + +CMD [ "yarn", "dev" ] diff --git a/astro.config.mjs b/astro.config.mjs index 461a6af47c2..b9910e9918c 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -8,7 +8,8 @@ export default defineConfig({ site: 'https://docs.chocolatey.org', // trailingSlash: 'always', server: { - port: 5086 + port: 5086, + host: true }, markdown: { syntaxHighlight: false, // Temporarily disable syntax highlighting and rely on Prism.js via choco-theme diff --git a/package.json b/package.json index 10ed395fa34..4036bbb6415 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,13 @@ "type": "module", "version": "0.0.1", "scripts": { - "dev": "yarn choco-theme && npx astro dev", - "start": "npx astro dev", - "build": "yarn choco-theme && npx astro check && npx astro build", + "dev": "yarn dependencies && yarn telemetry && yarn choco-theme && npx astro dev", + "start": "yarn dev", + "build": "yarn dependencies && yarn telemetry && yarn choco-theme && npx astro check && npx astro build", "preview": "npx astro preview", "astro": "npx astro", + "telemetry": "npx astro telemetry disable", + "dependencies": "yarn install --immutable", "choco-theme": "npx --quiet ts-node --skipIgnore node_modules/choco-theme/build/choco-theme.ts --repository=docs" }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index fe8d3f16f14..a4d0503eb2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -974,9 +974,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/aix-ppc64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/aix-ppc64@npm:0.21.2" +"@esbuild/aix-ppc64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/aix-ppc64@npm:0.21.3" conditions: os=aix & cpu=ppc64 languageName: node linkType: hard @@ -988,9 +988,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/android-arm64@npm:0.21.2" +"@esbuild/android-arm64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/android-arm64@npm:0.21.3" conditions: os=android & cpu=arm64 languageName: node linkType: hard @@ -1002,9 +1002,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-arm@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/android-arm@npm:0.21.2" +"@esbuild/android-arm@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/android-arm@npm:0.21.3" conditions: os=android & cpu=arm languageName: node linkType: hard @@ -1016,9 +1016,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/android-x64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/android-x64@npm:0.21.2" +"@esbuild/android-x64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/android-x64@npm:0.21.3" conditions: os=android & cpu=x64 languageName: node linkType: hard @@ -1030,9 +1030,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-arm64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/darwin-arm64@npm:0.21.2" +"@esbuild/darwin-arm64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/darwin-arm64@npm:0.21.3" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -1044,9 +1044,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/darwin-x64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/darwin-x64@npm:0.21.2" +"@esbuild/darwin-x64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/darwin-x64@npm:0.21.3" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -1058,9 +1058,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-arm64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/freebsd-arm64@npm:0.21.2" +"@esbuild/freebsd-arm64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/freebsd-arm64@npm:0.21.3" conditions: os=freebsd & cpu=arm64 languageName: node linkType: hard @@ -1072,9 +1072,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/freebsd-x64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/freebsd-x64@npm:0.21.2" +"@esbuild/freebsd-x64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/freebsd-x64@npm:0.21.3" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard @@ -1086,9 +1086,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/linux-arm64@npm:0.21.2" +"@esbuild/linux-arm64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/linux-arm64@npm:0.21.3" conditions: os=linux & cpu=arm64 languageName: node linkType: hard @@ -1100,9 +1100,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-arm@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/linux-arm@npm:0.21.2" +"@esbuild/linux-arm@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/linux-arm@npm:0.21.3" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -1114,9 +1114,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ia32@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/linux-ia32@npm:0.21.2" +"@esbuild/linux-ia32@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/linux-ia32@npm:0.21.3" conditions: os=linux & cpu=ia32 languageName: node linkType: hard @@ -1128,9 +1128,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/linux-loong64@npm:0.21.2" +"@esbuild/linux-loong64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/linux-loong64@npm:0.21.3" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -1142,9 +1142,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-mips64el@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/linux-mips64el@npm:0.21.2" +"@esbuild/linux-mips64el@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/linux-mips64el@npm:0.21.3" conditions: os=linux & cpu=mips64el languageName: node linkType: hard @@ -1156,9 +1156,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-ppc64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/linux-ppc64@npm:0.21.2" +"@esbuild/linux-ppc64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/linux-ppc64@npm:0.21.3" conditions: os=linux & cpu=ppc64 languageName: node linkType: hard @@ -1170,9 +1170,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-riscv64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/linux-riscv64@npm:0.21.2" +"@esbuild/linux-riscv64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/linux-riscv64@npm:0.21.3" conditions: os=linux & cpu=riscv64 languageName: node linkType: hard @@ -1184,9 +1184,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-s390x@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/linux-s390x@npm:0.21.2" +"@esbuild/linux-s390x@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/linux-s390x@npm:0.21.3" conditions: os=linux & cpu=s390x languageName: node linkType: hard @@ -1198,9 +1198,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-x64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/linux-x64@npm:0.21.2" +"@esbuild/linux-x64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/linux-x64@npm:0.21.3" conditions: os=linux & cpu=x64 languageName: node linkType: hard @@ -1212,9 +1212,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/netbsd-x64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/netbsd-x64@npm:0.21.2" +"@esbuild/netbsd-x64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/netbsd-x64@npm:0.21.3" conditions: os=netbsd & cpu=x64 languageName: node linkType: hard @@ -1226,9 +1226,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/openbsd-x64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/openbsd-x64@npm:0.21.2" +"@esbuild/openbsd-x64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/openbsd-x64@npm:0.21.3" conditions: os=openbsd & cpu=x64 languageName: node linkType: hard @@ -1240,9 +1240,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/sunos-x64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/sunos-x64@npm:0.21.2" +"@esbuild/sunos-x64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/sunos-x64@npm:0.21.3" conditions: os=sunos & cpu=x64 languageName: node linkType: hard @@ -1254,9 +1254,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-arm64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/win32-arm64@npm:0.21.2" +"@esbuild/win32-arm64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/win32-arm64@npm:0.21.3" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -1268,9 +1268,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-ia32@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/win32-ia32@npm:0.21.2" +"@esbuild/win32-ia32@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/win32-ia32@npm:0.21.3" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -1282,9 +1282,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/win32-x64@npm:0.21.2": - version: 0.21.2 - resolution: "@esbuild/win32-x64@npm:0.21.2" +"@esbuild/win32-x64@npm:0.21.3": + version: 0.21.3 + resolution: "@esbuild/win32-x64@npm:0.21.3" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -2997,7 +2997,7 @@ __metadata: "choco-astro@https://github.com/st3phhays/choco-astro#astro": version: 0.1.0 - resolution: "choco-astro@https://github.com/st3phhays/choco-astro.git#commit=45ba148fcafdc81fb275d02b3e8dd5c8f715d26d" + resolution: "choco-astro@https://github.com/st3phhays/choco-astro.git#commit=fe008c4bb908741115366b7eaa4e2944911b7f24" dependencies: "@astrojs/check": "npm:0.7.0" "@astrojs/mdx": "npm:^3.0.0" @@ -3735,9 +3735,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.4.668": - version: 1.4.769 - resolution: "electron-to-chromium@npm:1.4.769" - checksum: 10c0/6b77b9d3f236799339035a9be50a43157ea5c14e3178430094cfeb0b46c03963b5aff01f3c64739821bc03274e8ef9e450b5262f9381e19af1f0cd41e762fed7 + version: 1.4.771 + resolution: "electron-to-chromium@npm:1.4.771" + checksum: 10c0/e43c7e0c0abb38747ff95ee26e9655125f1ec7745e7b1be2e396e3ab919a30c4fb7a943c63d4a54918ba22dcc3c2c82242c804f24337590c5887213fe427ece3 languageName: node linkType: hard @@ -4009,32 +4009,32 @@ __metadata: linkType: hard "esbuild@npm:^0.21.2": - version: 0.21.2 - resolution: "esbuild@npm:0.21.2" - dependencies: - "@esbuild/aix-ppc64": "npm:0.21.2" - "@esbuild/android-arm": "npm:0.21.2" - "@esbuild/android-arm64": "npm:0.21.2" - "@esbuild/android-x64": "npm:0.21.2" - "@esbuild/darwin-arm64": "npm:0.21.2" - "@esbuild/darwin-x64": "npm:0.21.2" - "@esbuild/freebsd-arm64": "npm:0.21.2" - "@esbuild/freebsd-x64": "npm:0.21.2" - "@esbuild/linux-arm": "npm:0.21.2" - "@esbuild/linux-arm64": "npm:0.21.2" - "@esbuild/linux-ia32": "npm:0.21.2" - "@esbuild/linux-loong64": "npm:0.21.2" - "@esbuild/linux-mips64el": "npm:0.21.2" - "@esbuild/linux-ppc64": "npm:0.21.2" - "@esbuild/linux-riscv64": "npm:0.21.2" - "@esbuild/linux-s390x": "npm:0.21.2" - "@esbuild/linux-x64": "npm:0.21.2" - "@esbuild/netbsd-x64": "npm:0.21.2" - "@esbuild/openbsd-x64": "npm:0.21.2" - "@esbuild/sunos-x64": "npm:0.21.2" - "@esbuild/win32-arm64": "npm:0.21.2" - "@esbuild/win32-ia32": "npm:0.21.2" - "@esbuild/win32-x64": "npm:0.21.2" + version: 0.21.3 + resolution: "esbuild@npm:0.21.3" + dependencies: + "@esbuild/aix-ppc64": "npm:0.21.3" + "@esbuild/android-arm": "npm:0.21.3" + "@esbuild/android-arm64": "npm:0.21.3" + "@esbuild/android-x64": "npm:0.21.3" + "@esbuild/darwin-arm64": "npm:0.21.3" + "@esbuild/darwin-x64": "npm:0.21.3" + "@esbuild/freebsd-arm64": "npm:0.21.3" + "@esbuild/freebsd-x64": "npm:0.21.3" + "@esbuild/linux-arm": "npm:0.21.3" + "@esbuild/linux-arm64": "npm:0.21.3" + "@esbuild/linux-ia32": "npm:0.21.3" + "@esbuild/linux-loong64": "npm:0.21.3" + "@esbuild/linux-mips64el": "npm:0.21.3" + "@esbuild/linux-ppc64": "npm:0.21.3" + "@esbuild/linux-riscv64": "npm:0.21.3" + "@esbuild/linux-s390x": "npm:0.21.3" + "@esbuild/linux-x64": "npm:0.21.3" + "@esbuild/netbsd-x64": "npm:0.21.3" + "@esbuild/openbsd-x64": "npm:0.21.3" + "@esbuild/sunos-x64": "npm:0.21.3" + "@esbuild/win32-arm64": "npm:0.21.3" + "@esbuild/win32-ia32": "npm:0.21.3" + "@esbuild/win32-x64": "npm:0.21.3" dependenciesMeta: "@esbuild/aix-ppc64": optional: true @@ -4084,7 +4084,7 @@ __metadata: optional: true bin: esbuild: bin/esbuild - checksum: 10c0/72e68e85a496d61a38964b5bcd8122cfb6b0421737af0766b1a1dc63f704aefd596e6571ca9507dcb6b7d5749a828cdeeafcf4fd3bba2e761b9e14d69682d896 + checksum: 10c0/5bf85ccd11cc7e7fbbb7ca3458a0fa019ec9b38e1ed9e61f0866b29419e7348231da0aa336e4645c3bda8e757fa20bd3fd8a5f73256308488086a6c7ec9b6ac5 languageName: node linkType: hard @@ -10559,12 +10559,12 @@ __metadata: linkType: hard "which-pm@npm:^2.1.1": - version: 2.1.1 - resolution: "which-pm@npm:2.1.1" + version: 2.2.0 + resolution: "which-pm@npm:2.2.0" dependencies: load-yaml-file: "npm:^0.2.0" path-exists: "npm:^4.0.0" - checksum: 10c0/13222d6342832ca8d8c9f6148dbea9d44829422ce1e6e0cf5abb3d43c045947cb98f8c908a8de1b7ed0e2094e315a4bdb869129a58bfb09c44f77d8f8b4df183 + checksum: 10c0/60af1574fded50552188a7a7db401276fd4962ecc20831ae21cf157ef0babb82fd8e544ec29ac589681212c314ddea067975dafe7428bec11b2df85fe2066333 languageName: node linkType: hard