update dev dependencies and workflow (#166)

Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>

.dockerignore

@@ -1,12 +1,2 @@
 /coverage
-
+/node_modules
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*

.eslintrc.json

@@ -0,0 +1,20 @@
+{
+  "env": {
+    "node": true,
+    "es2021": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:prettier/recommended"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": [
+    "@typescript-eslint",
+    "prettier"
+  ]
+}

.gitattributes

@@ -1,4 +1,2 @@
-/.yarn/releases/** binary
-/.yarn/plugins/** binary
 /dist/** linguist-generated=true
 /lib/** linguist-generated=true

.gitignore

@@ -1,5 +1,6 @@
 /.dev
-/lib
+node_modules
+lib
 
 # Jetbrains
 /.idea
@@ -46,11 +47,10 @@ bower_components
 build/Release
 
 # Dependency directories
-node_modules/
 jspm_packages/
 
-# Snowpack dependency directory (https://snowpack.dev/)
+# TypeScript v1 declaration files
-web_modules/
+typings/
 
 # TypeScript cache
 *.tsbuildinfo
@@ -61,12 +61,6 @@ web_modules/
 # Optional eslint cache
 .eslintcache
 
-# Microbundle cache
-.rpt2_cache/
-.rts2_cache_cjs/
-.rts2_cache_es/
-.rts2_cache_umd/
-
 # Optional REPL history
 .node_repl_history
 
@@ -82,21 +76,12 @@ web_modules/
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache
-.parcel-cache
 
-# Next.js build output
+# next.js build output
 .next
-out
 
-# Nuxt.js build / generate output
+# nuxt.js build output
 .nuxt
-#dist
-
-# Gatsby files
-.cache/
-# Comment in the public line in if your project uses Gatsby and not Next.js
-# https://nextjs.org/blog/next-9-1#public-directory-support
-# public
 
 # vuepress build output
 .vuepress/dist
@@ -109,16 +94,3 @@ out
 
 # DynamoDB Local files
 .dynamodb/
-
-# TernJS port file
-.tern-port
-
-# Stores VSCode versions used for testing VSCode extensions
-.vscode-test
-
-# yarn v2
-.yarn/cache
-.yarn/unplugged
-.yarn/build-state.yml
-.yarn/install-state.gz
-.pnp.*

.prettierignore

@@ -1,6 +0,0 @@
-# Dependency directories
-node_modules/
-jspm_packages/
-
-# yarn v2
-.yarn/

.yarnrc.yml

@@ -1,7 +0,0 @@
-nodeLinker: node-modules
-
-plugins:
-  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
-    spec: "@yarnpkg/plugin-interactive-tools"
-
-yarnPath: .yarn/releases/yarn-sources.cjs

codecov.yml

@@ -0,0 +1,3 @@
+comment: false
+github_checks:
+  annotations: false

dev.Dockerfile

@@ -0,0 +1,61 @@
+# syntax=docker/dockerfile:1
+
+ARG NODE_VERSION=12
+
+FROM node:${NODE_VERSION}-alpine AS base
+RUN apk add --no-cache cpio findutils git
+WORKDIR /src
+
+FROM base AS deps
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn install && mkdir /vendor && cp yarn.lock /vendor
+
+FROM scratch AS vendor-update
+COPY --from=deps /vendor /
+
+FROM deps AS vendor-validate
+RUN --mount=type=bind,target=.,rw <<EOT
+set -e
+git add -A
+cp -rf /vendor/* .
+if [ -n "$(git status --porcelain -- yarn.lock)" ]; then
+  echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor-update"'
+  git status --porcelain -- yarn.lock
+  exit 1
+fi
+EOT
+
+FROM deps AS build
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn run build && mkdir /out && cp -Rf dist /out/
+
+FROM scratch AS build-update
+COPY --from=build /out /
+
+FROM build AS build-validate
+RUN --mount=type=bind,target=.,rw <<EOT
+set -e
+git add -A
+cp -rf /out/* .
+if [ -n "$(git status --porcelain -- dist)" ]; then
+  echo >&2 'ERROR: Build result differs. Please build first with "docker buildx bake build"'
+  git status --porcelain -- dist
+  exit 1
+fi
+EOT
+
+FROM deps AS format
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn run format \
+  && mkdir /out && find . -name '*.ts' -not -path './node_modules/*' | cpio -pdm /out
+
+FROM scratch AS format-update
+COPY --from=format /out /
+
+FROM deps AS lint
+RUN --mount=type=bind,target=.,rw \
+  --mount=type=cache,target=/src/node_modules \
+  yarn run lint

dist/licenses.txt

@@ -59,16 +59,6 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-@vercel/ncc
-MIT
-Copyright 2018 ZEIT, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 addressparser
 MIT
 Copyright (c) 2014-2016 Andris Reinman
@@ -112,7 +102,7 @@ graceful-fs
 ISC
 The ISC License
 
-Copyright (c) Isaac Z. Schlueter, Ben Noordhuis, and Contributors
+Copyright (c) 2011-2022 Isaac Z. Schlueter, Ben Noordhuis, and Contributors
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

docker-bake.hcl

@@ -1,13 +1,3 @@
-variable "NODE_VERSION" {
-  default = "12"
-}
-
-target "node-version" {
-  args = {
-    NODE_VERSION = NODE_VERSION
-  }
-}
-
 group "default" {
   targets = ["build"]
 }
@@ -17,44 +7,41 @@ group "pre-checkin" {
 }
 
 group "validate" {
-  targets = ["vendor-validate", "format-validate", "build-validate"]
+  targets = ["lint", "build-validate", "vendor-validate"]
-}
-
-target "vendor-update" {
-  inherits = ["node-version"]
-  dockerfile = "./hack/build.Dockerfile"
-  target = "vendor-update"
-  output = ["."]
-}
-
-target "vendor-validate" {
-  inherits = ["node-version"]
-  dockerfile = "./hack/build.Dockerfile"
-  target = "vendor-validate"
 }
 
 target "build" {
-  inherits = ["node-version"]
+  dockerfile = "dev.Dockerfile"
-  dockerfile = "./hack/build.Dockerfile"
   target = "build-update"
   output = ["."]
 }
 
 target "build-validate" {
-  inherits = ["node-version"]
+  dockerfile = "dev.Dockerfile"
-  dockerfile = "./hack/build.Dockerfile"
   target = "build-validate"
+  output = ["type=cacheonly"]
 }
 
 target "format" {
-  inherits = ["node-version"]
+  dockerfile = "dev.Dockerfile"
-  dockerfile = "./hack/build.Dockerfile"
   target = "format-update"
   output = ["."]
 }
 
-target "format-validate" {
+target "lint" {
-  inherits = ["node-version"]
+  dockerfile = "dev.Dockerfile"
-  dockerfile = "./hack/build.Dockerfile"
+  target = "lint"
-  target = "format-validate"
+  output = ["type=cacheonly"]
+}
+
+target "vendor-update" {
+  dockerfile = "dev.Dockerfile"
+  target = "vendor-update"
+  output = ["."]
+}
+
+target "vendor-validate" {
+  dockerfile = "dev.Dockerfile"
+  target = "vendor-validate"
+  output = ["type=cacheonly"]
 }

hack/build.Dockerfile

@@ -1,59 +0,0 @@
-# syntax=docker/dockerfile:1.2
-ARG NODE_VERSION
-
-FROM node:${NODE_VERSION}-alpine AS base
-RUN apk add --no-cache cpio findutils git tar
-RUN yarn config set --home enableTelemetry 0
-WORKDIR /src
-
-FROM base AS deps
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache \
-  --mount=type=cache,target=/src/node_modules \
-  yarn install && mkdir /vendor && cp yarn.lock /vendor
-
-FROM scratch AS vendor-update
-COPY --from=deps /vendor /
-
-FROM deps AS vendor-validate
-RUN --mount=type=bind,target=.,rw \
-  git add -A && cp -rf /vendor/* .; \
-  if [ -n "$(git status --porcelain -- yarn.lock)" ]; then \
-    echo >&2 'ERROR: Vendor result differs. Please vendor your package with "docker buildx bake vendor-update"'; \
-    git status --porcelain -- yarn.lock; \
-    exit 1; \
-  fi
-
-FROM deps AS build
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache \
-  --mount=type=cache,target=/src/node_modules \
-  yarn run build && yarn run package && mkdir /out && cp -Rf dist /out/
-
-FROM scratch AS build-update
-COPY --from=build /out /
-
-FROM build AS build-validate
-RUN --mount=type=bind,target=.,rw \
-  git add -A && cp -rf /out/* .; \
-  if [ -n "$(git status --porcelain -- dist)" ]; then \
-    echo >&2 'ERROR: Build result differs. Please build first with "docker buildx bake build"'; \
-    git status --porcelain -- dist; \
-    exit 1; \
-  fi
-
-FROM deps AS format
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache \
-  --mount=type=cache,target=/src/node_modules \
-  yarn run format \
-  && mkdir /out && find . -name '*.ts' -not -path './node_modules/*' -not -path './.yarn/*' | cpio -pdm /out
-
-FROM scratch AS format-update
-COPY --from=format /out /
-
-FROM deps AS format-validate
-RUN --mount=type=bind,target=.,rw \
-  --mount=type=cache,target=/src/.yarn/cache \
-  --mount=type=cache,target=/src/node_modules \
-  yarn run format-check

package.json

@@ -3,10 +3,10 @@
   "description": "GitHub Action to deploy to GitHub Pages",
   "main": "lib/main.js",
   "scripts": {
-    "build": "tsc",
+    "build": "ncc build src/main.ts --source-map --minify --license licenses.txt",
-    "format": "prettier --write **/*.ts",
+    "lint": "eslint src/**/*.ts",
-    "format-check": "prettier --check **/*.ts",
+    "format": "eslint --fix src/**/*.ts",
-    "package": "ncc build --source-map --license licenses.txt"
+    "all": "yarn run build && yarn run format"
   },
   "repository": {
     "type": "git",
@@ -27,12 +27,16 @@
     "fs-extra": "^10.0.0"
   },
   "devDependencies": {
-    "@actions/io": "^1.1.0",
     "@types/fs-extra": "^9.0.11",
-    "@types/node": "^15.3.0",
+    "@types/node": "^16.11.26",
-    "@vercel/ncc": "^0.28.5",
+    "@typescript-eslint/eslint-plugin": "^5.14.0",
-    "prettier": "^2.3.0",
+    "@typescript-eslint/parser": "^5.14.0",
-    "typescript": "^4.2.4",
+    "@vercel/ncc": "^0.33.3",
-    "typescript-formatter": "^7.2.2"
+    "eslint": "^8.11.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "prettier": "^2.3.1",
+    "ts-node": "^10.7.0",
+    "typescript": "^4.4.4"
   }
 }

src/exec.ts

@@ -8,8 +8,8 @@ export interface ExecResult {
 }
 
 export const exec = async (command: string, args: string[] = [], silent: boolean): Promise<ExecResult> => {
-  let stdout: string = '';
+  let stdout = '';
-  let stderr: string = '';
+  let stderr = '';
 
   const options: ExecOptions = {
     silent: silent,

src/git.ts

@@ -52,7 +52,7 @@ export async function setConfig(key: string, value: string): Promise<void> {
 }
 
 export async function add(pattern: string, verbose: boolean): Promise<void> {
-  let args: Array<string> = ['add'];
+  const args: Array<string> = ['add'];
   if (verbose) {
     args.push('--verbose');
   }
@@ -61,7 +61,7 @@ export async function add(pattern: string, verbose: boolean): Promise<void> {
 }
 
 export async function commit(allowEmptyCommit: boolean, author: string, message: string): Promise<void> {
-  let args: Array<string> = [];
+  const args: Array<string> = [];
   args.push('commit');
   if (allowEmptyCommit) {
     args.push('--allow-empty');
@@ -83,7 +83,7 @@ export async function showStat(): Promise<string> {
 }
 
 export async function push(remoteURL: string, branch: string, force: boolean): Promise<void> {
-  let args: Array<string> = [];
+  const args: Array<string> = [];
   args.push('push');
   if (force) {
     args.push('--force');

tsconfig.json

@@ -2,17 +2,14 @@
   "compilerOptions": {
     "target": "es6",
     "module": "commonjs",
-    "lib": [
-      "es6",
-      "dom"
-    ],
     "newLine": "lf",
     "outDir": "./lib",
     "rootDir": "./src",
+    "esModuleInterop": true,
+    "forceConsistentCasingInFileNames": true,
     "strict": true,
     "noImplicitAny": false,
-    "esModuleInterop": true,
+    "useUnknownInCatchVariables": false,
-    "sourceMap": true
   },
-  "exclude": ["node_modules", "**/*.test.ts"]
+  "exclude": ["node_modules"]
 }