chore: merge main

MassivDash · Jul 18, 2024 · 5e88578 · 5e88578
1 parent 5687714
commit 5e88578
Showing 1 changed file with 94 additions and 98 deletions.
diff --git a/package.json b/package.json
@@ -14,110 +14,106 @@
     "url": "https://github.com/actions/typescript-action/issues"
 =======
   "name": "ado-npmrc-all-os",
-  "description": "Azure Dev Ops .npmrc maker for all OS",
-  "version": "0.0.0",
-  "author": "Luke Celitan, Spaceout.pl",
-  "private": true,
-  "homepage": "https://github.com/MassivDash/ado-npmrc-ts-action",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/MassivDash/ado-npmrc-ts-action"
-  },
-  "bugs": {
-    "url": "https://github.com/MassivDash/ado-npmrc-ts-action/issues"
+    "description": "Azure Dev Ops .npmrc maker for all OS",
+    "version": "0.0.0",
+    "author": "Luke Celitan, Spaceout.pl",
+    "private": true,
+    "homepage": "https://github.com/MassivDash/ado-npmrc-ts-action",
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/MassivDash/ado-npmrc-ts-action"
+    },
+    "bugs": {
+      "url": "https://github.com/MassivDash/ado-npmrc-ts-action/issues"
 >>>>>>> releases/v1
-  },
-  "keywords": [
-    "actions",
-    "node",
+    },
+    "keywords": [
+      "actions",
+      "node",
 <<<<<<< HEAD
     "setup"
 =======
     "setup",
-    "ado",
-    "azure",
-    "devops",
-    "artifacts",
-    "feed",
-    "azure devops"
+      "ado",
+      "azure",
+      "devops",
+      "artifacts",
+      "feed",
+      "azure devops"
 >>>>>>> releases/v1
-  ],
-  "exports": {
-    ".": "./dist/index.js"
-  },
-  "engines": {
-    "node": ">=20"
-  },
-  "scripts": {
-    "bundle": "npm run format:write && npm run package",
-    "ci-test": "npx jest",
-    "coverage": "npx make-coverage-badge --output-path ./badges/coverage.svg",
-    "format:write": "npx prettier --write .",
-    "format:check": "npx prettier --check .",
-    "lint": "npx eslint . -c ./.github/linters/.eslintrc.yml",
-    "package": "npx ncc build src/index.ts -o dist --source-map --license licenses.txt",
-    "package:watch": "npm run package -- --watch",
-    "test": "npx jest",
-    "all": "npm run format:write && npm run lint && npm run test && npm run coverage && npm run package"
-  },
-  "license": "MIT",
-  "jest": {
-    "preset": "ts-jest",
-    "verbose": true,
-    "clearMocks": true,
-    "testEnvironment": "node",
-    "moduleFileExtensions": [
-      "js",
-      "ts"
-    ],
-    "testMatch": [
-      "**/*.test.ts"
     ],
-    "testPathIgnorePatterns": [
-      "/node_modules/",
-      "/dist/"
-    ],
-    "transform": {
-      "^.+\\.ts$": "ts-jest"
+    "exports": {
+      ".": "./dist/index.js"
     },
-    "coverageReporters": [
-      "json-summary",
-      "text",
-      "lcov"
-    ],
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "./src/**"
-<<<<<<< HEAD
-    ]
-=======
-    ],
-    "moduleNameMapper": {
-      "@libs$": "<rootDir>/src/libs/index.ts",
-      "@libs/(.*)$": "<rootDir>/src/libs/$1"
+    "engines": {
+      "node": ">=20"
+    },
+    "scripts": {
+      "bundle": "npm run format:write && npm run package",
+      "ci-test": "npx jest",
+      "coverage": "npx make-coverage-badge --output-path ./badges/coverage.svg",
+      "format:write": "npx prettier --write .",
+      "format:check": "npx prettier --check .",
+      "lint": "npx eslint . -c ./.github/linters/.eslintrc.yml",
+      "package": "npx ncc build src/index.ts -o dist --source-map --license licenses.txt",
+      "package:watch": "npm run package -- --watch",
+      "test": "npx jest",
+      "all": "npm run format:write && npm run lint && npm run test && npm run coverage && npm run package"
+    },
+    "license": "MIT",
+    "jest": {
+      "preset": "ts-jest",
+      "verbose": true,
+      "clearMocks": true,
+      "testEnvironment": "node",
+      "moduleFileExtensions": [
+        "js",
+        "ts"
+      ],
+      "testMatch": [
+        "**/*.test.ts"
+      ],
+      "testPathIgnorePatterns": [
+        "/node_modules/",
+        "/dist/"
+      ],
+      "transform": {
+        "^.+\\.ts$": "ts-jest"
+      },
+      "coverageReporters": [
+        "json-summary",
+        "text",
+        "lcov"
+      ],
+      "collectCoverage": true,
+      "collectCoverageFrom": [
+        "./src/**"
+      ],
+      "moduleNameMapper": {
+        "@libs$": "<rootDir>/src/libs/index.ts",
+        "@libs/(.*)$": "<rootDir>/src/libs/$1"
+      }
+    },
+    "dependencies": {
+      "@actions/core": "^1.10.1"
+    },
+    "devDependencies": {
+      "@jest/globals": "^29.7.0",
+      "@types/jest": "^29.5.12",
+      "@types/node": "^20.14.10",
+      "@typescript-eslint/eslint-plugin": "^7.16.0",
+      "@typescript-eslint/parser": "^7.16.0",
+      "@vercel/ncc": "^0.38.1",
+      "eslint": "^8.57.0",
+      "eslint-plugin-github": "^5.0.1",
+      "eslint-plugin-jest": "^28.6.0",
+      "eslint-plugin-jsonc": "^2.16.0",
+      "eslint-plugin-prettier": "^5.1.3",
+      "jest": "^29.7.0",
+      "make-coverage-badge": "^1.2.0",
+      "prettier": "^3.3.3",
+      "prettier-eslint": "^16.3.0",
+      "ts-jest": "^29.2.2",
+      "typescript": "^5.5.3"
     }
->>>>>>> releases/v1
-  },
-  "dependencies": {
-    "@actions/core": "^1.10.1"
-  },
-  "devDependencies": {
-    "@jest/globals": "^29.7.0",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^20.14.10",
-    "@typescript-eslint/eslint-plugin": "^7.16.0",
-    "@typescript-eslint/parser": "^7.16.0",
-    "@vercel/ncc": "^0.38.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-github": "^5.0.1",
-    "eslint-plugin-jest": "^28.6.0",
-    "eslint-plugin-jsonc": "^2.16.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "jest": "^29.7.0",
-    "make-coverage-badge": "^1.2.0",
-    "prettier": "^3.3.3",
-    "prettier-eslint": "^16.3.0",
-    "ts-jest": "^29.2.2",
-    "typescript": "^5.5.3"
-  }
-}
+  }