From 252b30da8918affeaae08d3f7a5512b0666876a4 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Sat, 13 Nov 2021 10:36:07 -0500 Subject: [PATCH] update codespaces config --- .devcontainer/Dockerfile | 13 ++++--------- .devcontainer/devcontainer.json | 19 ++++++++----------- package.json | 4 ++-- yarn.lock | 16 ++++++++-------- 4 files changed, 22 insertions(+), 30 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a8216ad7..bca33e4b 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,9 +1,4 @@ -# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/ubuntu/.devcontainer/base.Dockerfile - -# [Choice] Ubuntu version (use hirsuite or bionic on local arm64/Apple Silicon): hirsute, focal, bionic -ARG VARIANT="hirsute" -FROM mcr.microsoft.com/vscode/devcontainers/base:0-${VARIANT} - -# [Optional] Uncomment this section to install additional OS packages. -# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ -# && apt-get -y install --no-install-recommends +# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.205.2/containers/javascript-node/.devcontainer/base.Dockerfile +# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 16, 14, 12, 16-bullseye, 14-bullseye, 12-bullseye, 16-buster, 14-buster, 12-buster +ARG VARIANT=16-bullseye +FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0b78c707..f5b04ab3 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,28 +5,25 @@ "runArgs": ["--init"], "build": { "dockerfile": "Dockerfile", - // Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic - // Use hirsute or bionic on local arm64/Apple Silicon. - "args": { "VARIANT": "hirsute" } + // Update 'VARIANT' to pick a Node version: 16, 14, 12. + // Append -bullseye or -buster to pin to an OS version. + // Use -bullseye variants on local arm64/Apple Silicon. + "args": { "VARIANT": "16-bullseye" } }, "features": { - "git": "os-provided", - "github-cli": "latest", - "node": "16" + "git": "os-provided" }, - // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. - "remoteUser": "vscode", - // Use 'postCreateCommand' to run commands after the container is created. - "postStartCommand": "yarn install --frozen-lockfile && git update-index --assume-unchanged data/manifest.json", + "postStartCommand": "yarn install --frozen-lockfile && git update-index --assume-unchanged data/manifest.json && git config pull.rebase true", // Use 'forwardPorts' to make a list of ports inside the container available locally. "forwardPorts": [1337], "portsAttributes": { "1337": { - "label": "Webpack" + "label": "Webpack", + "onAutoForward": "notify" } }, diff --git a/package.json b/package.json index af5c1bd1..f68c6f9a 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "postcss-loader": "^6.2.0", "postcss-normalize-charset": "^5.0.1", "postcss-svgo": "^5.0.3", - "prettier": "^2.4.1", + "prettier": "~2.4.1", "sass": "^1.43.4", "sass-loader": "^12.3.0", "simple-git-hooks": "^2.7.0", @@ -105,7 +105,7 @@ "webpack": "^5.64.0", "webpack-assets-manifest": "^5.0.6", "webpack-cli": "^4.9.1", - "webpack-dev-server": "^4.4.0" + "webpack-dev-server": "^4.5.0" }, "optionalDependencies": { "imagemin-gifsicle": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index ff7559b9..049f596b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3353,9 +3353,9 @@ ee-first@1.1.1: integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= electron-to-chromium@^1.3.886: - version "1.3.895" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.895.tgz#9b0f8f2e32d8283bbb200156fd5d8dfd775f31ed" - integrity sha512-9Ww3fB8CWctjqHwkOt7DQbMZMpal2x2reod+/lU4b9axO1XJEDUpPMBxs7YnjLhhqpKXIIB5SRYN/B4K0QpvyQ== + version "1.3.896" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.896.tgz#4a94efe4870b1687eafd5c378198a49da06e8a1b" + integrity sha512-NcGkBVXePiuUrPLV8IxP43n1EOtdg+dudVjrfVEUd/bOqpQUFZ2diL5PPYzbgEhZFEltdXV3AcyKwGnEQ5lhMA== emoji-regex@^8.0.0: version "8.0.0" @@ -7769,7 +7769,7 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.4.1: +prettier@~2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA== @@ -9961,10 +9961,10 @@ webpack-dev-middleware@^5.2.1: range-parser "^1.2.1" schema-utils "^3.1.0" -webpack-dev-server@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.4.0.tgz#10ec17088f840c9ccb2ebb0b43c49ec293206f7e" - integrity sha512-+S0XRIbsopVjPFjCO8I07FXYBWYqkFmuP56ucGMTs2hA/gV4q2M9xTmNo5Tg4o8ffRR+Nm3AsXnQXxKRyYovrA== +webpack-dev-server@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.5.0.tgz#614b5112cfa4730a4801bb4ddebb3be5b0d70497" + integrity sha512-Ss4WptsUjYa+3hPI4iYZYEc8FrtnfkaPrm5WTjk9ux5kiCS718836srs0ppKMHRaCHP5mQ6g4JZGcfDdGbCjpQ== dependencies: ansi-html-community "^0.0.8" bonjour "^3.5.0"