Merge pull request #163 from aminya/update [skip ci]

package.json

@@ -65,55 +65,54 @@
     "@actions/io": "^1.1.2",
     "@actions/tool-cache": "^2.0.1",
     "@npmcli/ci-detect": "github:aminya/ci-detect#37fe40075bebec96794ba0a7c4a6d5c70cbea00d",
-    "admina": "^0.1.3",
-    "ci-log": "workspace:1.0.0",
-    "escape-path-with-spaces": "github:aminya/escape-path-with-spaces#d9f81ee649203ddc55783a2f96ada59df06118e3",
-    "escape-quotes": "^1.0.2",
-    "escape-string-regexp": "^5.0.0",
-    "exec-powershell": "workspace:1.0.0",
-    "execa": "^5.1.1",
-    "is-url-online": "^1.5.0",
-    "mri": "^1.2.0",
-    "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1",
-    "numerous": "1.0.3",
-    "path-exists": "^4.0.0",
-    "patha": "^0.4.1",
-    "quote-unquote": "^1.0.0",
-    "retry-as-promised": "^7.0.3",
-    "semver": "7.3.8",
-    "setup-python": "github:actions/setup-python#v4.5.0",
-    "time-delta": "github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e",
-    "ubuntu-version": "^2.0.0",
-    "untildify-user": "workspace:1.0.0",
-    "user-access": "workspace:1.0.0",
-    "which": "^3.0.0",
-
     "@types/cross-spawn": "^6.0.2",
-    "@types/jest": "^29.2.5",
+    "@types/jest": "^29.2.6",
     "@types/mri": "^1.1.1",
     "@types/node": "^18.11.18",
     "@types/semver": "^7.3.13",
     "@types/which": "^2.0.1",
+    "admina": "^0.1.3",
     "caxa": "^3.0.1",
+    "ci-log": "workspace:1.0.0",
     "cross-env": "7.0.3",
     "cross-spawn": "^7.0.3",
-    "cspell": "^6.18.1",
+    "cspell": "^6.19.2",
+    "escape-path-with-spaces": "github:aminya/escape-path-with-spaces#d9f81ee649203ddc55783a2f96ada59df06118e3",
+    "escape-quotes": "^1.0.2",
+    "escape-string-regexp": "^5.0.0",
     "eslint": "^8.32.0",
     "eslint-config-atomic": "^1.18.2",
+    "exec-powershell": "workspace:1.0.0",
+    "execa": "^5.1.1",
     "gen-readme": "^1.6.0",
+    "is-url-online": "^1.5.0",
     "jest": "^29.3.1",
+    "mri": "^1.2.0",
+    "msvc-dev-cmd": "github:aminya/msvc-dev-cmd#9f672c1",
     "npm-check-updates": "^16.6.2",
     "npm-run-all2": "^6.0.4",
-    "parcel": "2.8.2",
+    "numerous": "1.0.3",
+    "parcel": "2.8.3",
+    "path-exists": "^4.0.0",
+    "patha": "^0.4.1",
     "prettier": "2.7.1",
     "prettier-config-atomic": "^3.1.0",
+    "quote-unquote": "^1.0.0",
     "readme-md-generator": "^1.0.0",
+    "retry-as-promised": "^7.0.3",
+    "semver": "7.3.8",
+    "setup-python": "github:actions/setup-python#v4.5.0",
     "shx": "0.3.4",
     "terser-config-atomic": "^0.1.1",
+    "time-delta": "github:aminya/time-delta#69d91a41cef28e569be9a2991129f5f7d1f0d00e",
     "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
     "ts-readme": "^1.1.3",
-    "typescript": "^4.9.4"
+    "typescript": "^4.9.4",
+    "ubuntu-version": "^2.0.0",
+    "untildify-user": "workspace:1.0.0",
+    "user-access": "workspace:1.0.0",
+    "which": "^3.0.0"
   },
   "engines": {
     "node": ">=12.x"

src/main.ts

@@ -1,56 +1,50 @@
 #!/usr/bin/env node
 /* eslint-disable node/shebang */
 
-import { getInput, endGroup, startGroup, notice } from "@actions/core"
+import { endGroup, getInput, notice, startGroup } from "@actions/core"
+import ciDetect from "@npmcli/ci-detect"
+import { error, info, success, warning } from "ci-log"
+import mri from "mri"
+import * as numerous from "numerous"
+import numerousLocale from "numerous/locales/en.js"
+import { join } from "patha"
+import semverValid from "semver/functions/valid"
+import * as timeDelta from "time-delta"
+import timeDeltaLocale from "time-delta/locales/en.js"
+import { untildifyUser } from "untildify-user"
+
+import { setupBazel } from "./bazel/bazel"
 import { setupBrew } from "./brew/brew"
 import { setupCcache } from "./ccache/ccache"
-import { setupMake } from "./make/make"
-import { setupTask } from "./task/task"
 import { setupChocolatey } from "./chocolatey/chocolatey"
 import { setupCmake } from "./cmake/cmake"
 import { setupConan } from "./conan/conan"
 import { setupCppcheck } from "./cppcheck/cppcheck"
 import { setupDoxygen } from "./doxygen/doxygen"
+import { setupGcc } from "./gcc/gcc"
 import { activateGcovGCC, activateGcovLLVM, setupGcovr } from "./gcovr/gcovr"
-import { setupLLVM, setupClangTools } from "./llvm/llvm"
+import { setupGraphviz } from "./graphviz/graphviz"
+import { setupKcov } from "./kcov/kcov"
+import { setupClangTools, setupLLVM } from "./llvm/llvm"
+import { setupMake } from "./make/make"
 import { setupMeson } from "./meson/meson"
 import { setupMSVC } from "./msvc/msvc"
+import { setupNala } from "./nala/nala"
 import { setupNinja } from "./ninja/ninja"
 import { setupOpencppcoverage } from "./opencppcoverage/opencppcoverage"
-import { setupPython } from "./python/python"
-import mri from "mri"
-import { untildifyUser } from "untildify-user"
-import ciDetect from "@npmcli/ci-detect"
-import * as timeDelta from "time-delta"
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import timeDeltaLocale from "time-delta/locales/en.js"
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import * as numerous from "numerous"
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import numerousLocale from "numerous/locales/en.js"
-import { ubuntuVersion } from "./utils/env/ubuntu_version"
-
-import semverValid from "semver/functions/valid"
-import { getVersion, syncVersions } from "./versions/versions"
-import { setupGcc } from "./gcc/gcc"
-import { InstallationInfo } from "./utils/setup/setupBin"
-import { error, info, success, warning } from "ci-log"
-import { setupVcpkg } from "./vcpkg/vcpkg"
-import { join } from "patha"
-import { setupVCVarsall } from "./vcvarsall/vcvarsall"
-import { setupKcov } from "./kcov/kcov"
-import { addEnv, finalizeCpprc } from "./utils/env/addEnv"
-import { setupSevenZip } from "./sevenzip/sevenzip"
-import { setupGraphviz } from "./graphviz/graphviz"
-import { setupNala } from "./nala/nala"
-import { setupBazel } from "./bazel/bazel"
 import { setupPowershell } from "./powershell/powershell"
-import { isArch } from "./utils/env/isArch"
-import { setupPacmanPack } from "./utils/setup/setupPacmanPack"
+import { setupPython } from "./python/python"
 import { setupSccache } from "./sccache/sccache"
+import { setupSevenZip } from "./sevenzip/sevenzip"
+import { setupTask } from "./task/task"
+import { addEnv, finalizeCpprc } from "./utils/env/addEnv"
+import { isArch } from "./utils/env/isArch"
+import { ubuntuVersion } from "./utils/env/ubuntu_version"
+import { InstallationInfo } from "./utils/setup/setupBin"
+import { setupPacmanPack } from "./utils/setup/setupPacmanPack"
+import { setupVcpkg } from "./vcpkg/vcpkg"
+import { setupVCVarsall } from "./vcvarsall/vcvarsall"
+import { getVersion, syncVersions } from "./versions/versions"
 
 /** The setup functions */
 const setups = {
@@ -119,7 +113,7 @@ export async function main(args: string[]): Promise<number> {
 
   const timeFormatter = timeDelta.create({ autoloadLocales: true })
   timeDelta.addLocale(timeDeltaLocale as timeDelta.Locale)
-  numerous.addLocale(numerousLocale)
+  numerous.addLocale(numerousLocale as numerous.Locale)
   let time1: number
   let time2: number
 

src/types/numerous.d.ts

@@ -0,0 +1,13 @@
+declare module "numerous" {
+  export type Locale = unknown
+
+  /** Adds pluralization data for the specified locale. Should be called in browser. */
+  export function addLocale(localeData: Locale | Locale[])
+}
+
+declare module "numerous/locales/en.js" {
+  import { Locale } from "numerous"
+
+  declare const En = Locale
+  export = En
+}

src/types/time-delta.d.ts

@@ -0,0 +1,6 @@
+declare module "time-delta/locales/en.js" {
+  import { Locale } from "time-delta"
+
+  declare const En = Locale
+  export = En
+}