From fd798568cf46b500bda40b95b8a82c58766dfd57 Mon Sep 17 00:00:00 2001 From: Mathis Fullriede Date: Wed, 14 Aug 2024 09:06:53 +0200 Subject: [PATCH] add tempwise resolution for axios because nx --- .pnp.cjs | 22 ++++++---------------- package.json | 7 +++++-- yarn.lock | 11 ----------- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/.pnp.cjs b/.pnp.cjs index 55fa516f..12919502 100644 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -4566,21 +4566,11 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["axios", [\ - ["npm:1.7.3", {\ - "packageLocation": "./.yarn/cache/axios-npm-1.7.3-a63743a582-7f92af2057.zip/node_modules/axios/",\ - "packageDependencies": [\ - ["axios", "npm:1.7.3"],\ - ["follow-redirects", "virtual:a63743a5822c3f4f0080debf0a45615212b5bd005b763a14221b5559794a4eab59edf521118fa1c78a2444ffb22b1d205323e984eccd051abda1334fb302f130#npm:1.15.6"],\ - ["form-data", "npm:4.0.0"],\ - ["proxy-from-env", "npm:1.1.0"]\ - ],\ - "linkType": "HARD"\ - }],\ ["npm:1.7.4", {\ "packageLocation": "./.yarn/cache/axios-npm-1.7.4-cc1c89ddba-7a1429be1e.zip/node_modules/axios/",\ "packageDependencies": [\ ["axios", "npm:1.7.4"],\ - ["follow-redirects", "virtual:a63743a5822c3f4f0080debf0a45615212b5bd005b763a14221b5559794a4eab59edf521118fa1c78a2444ffb22b1d205323e984eccd051abda1334fb302f130#npm:1.15.6"],\ + ["follow-redirects", "virtual:cc1c89ddbaa2ee6988ad04cd8f48fb510e98268b86b9002d50ceca7bd737255eca4ec5ce4ed954e6ba12356c7138528653644b23c509c9a7726b952c51404b15#npm:1.15.6"],\ ["form-data", "npm:4.0.0"],\ ["proxy-from-env", "npm:1.1.0"]\ ],\ @@ -6882,10 +6872,10 @@ const RAW_RUNTIME_STATE = ],\ "linkType": "SOFT"\ }],\ - ["virtual:a63743a5822c3f4f0080debf0a45615212b5bd005b763a14221b5559794a4eab59edf521118fa1c78a2444ffb22b1d205323e984eccd051abda1334fb302f130#npm:1.15.6", {\ - "packageLocation": "./.yarn/__virtual__/follow-redirects-virtual-74498d9869/0/cache/follow-redirects-npm-1.15.6-50635fe51d-70c7612c4c.zip/node_modules/follow-redirects/",\ + ["virtual:cc1c89ddbaa2ee6988ad04cd8f48fb510e98268b86b9002d50ceca7bd737255eca4ec5ce4ed954e6ba12356c7138528653644b23c509c9a7726b952c51404b15#npm:1.15.6", {\ + "packageLocation": "./.yarn/__virtual__/follow-redirects-virtual-b46b84e192/0/cache/follow-redirects-npm-1.15.6-50635fe51d-70c7612c4c.zip/node_modules/follow-redirects/",\ "packageDependencies": [\ - ["follow-redirects", "virtual:a63743a5822c3f4f0080debf0a45615212b5bd005b763a14221b5559794a4eab59edf521118fa1c78a2444ffb22b1d205323e984eccd051abda1334fb302f130#npm:1.15.6"],\ + ["follow-redirects", "virtual:cc1c89ddbaa2ee6988ad04cd8f48fb510e98268b86b9002d50ceca7bd737255eca4ec5ce4ed954e6ba12356c7138528653644b23c509c9a7726b952c51404b15#npm:1.15.6"],\ ["@types/debug", null],\ ["debug", null]\ ],\ @@ -10618,7 +10608,7 @@ const RAW_RUNTIME_STATE = ["@yarnpkg/lockfile", "npm:1.1.0"],\ ["@yarnpkg/parsers", "npm:3.0.0-rc.46"],\ ["@zkochan/js-yaml", "npm:0.0.6"],\ - ["axios", "npm:1.7.3"],\ + ["axios", "npm:1.7.4"],\ ["chalk", "npm:4.1.2"],\ ["cli-cursor", "npm:3.1.0"],\ ["cli-spinners", "npm:2.6.1"],\ @@ -10680,7 +10670,7 @@ const RAW_RUNTIME_STATE = ["@yarnpkg/lockfile", "npm:1.1.0"],\ ["@yarnpkg/parsers", "npm:3.0.0-rc.46"],\ ["@zkochan/js-yaml", "npm:0.0.7"],\ - ["axios", "npm:1.7.3"],\ + ["axios", "npm:1.7.4"],\ ["chalk", "npm:4.1.2"],\ ["cli-cursor", "npm:3.1.0"],\ ["cli-spinners", "npm:2.6.1"],\ diff --git a/package.json b/package.json index 44d9d994..2608f9f7 100644 --- a/package.json +++ b/package.json @@ -7,11 +7,11 @@ "scripts": { "build": "nx run-many -t build", "format": "nx run-many -t format", + "postinstall": "yarn dlx simple-git-hooks", "lint": "nx run-many -t lint", "test": "nx run-many -t test && run test:licenses", "test:licenses": "run test:licenses:base --unknown --failOn 'UNLICENSED;UNKNOWN' --excludePrivatePackages", - "test:licenses:base": "run pnpify license-checker-rseidelsohn --excludePackages 'root'", - "postinstall": "yarn dlx simple-git-hooks" + "test:licenses:base": "run pnpify license-checker-rseidelsohn --excludePackages 'root'" }, "simple-git-hooks": { "post-checkout": "yarn install", @@ -36,6 +36,9 @@ "prettier-plugin-sort-json": "^3.1.0", "typescript": "^5.5.4" }, + "resolutions": { + "axios": "^1.7.4" + }, "workspaces": [ "packages/*" ] diff --git a/yarn.lock b/yarn.lock index 2b189a91..8e558e1c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3524,17 +3524,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.6.0, axios@npm:^1.7.2": - version: 1.7.3 - resolution: "axios@npm:1.7.3" - dependencies: - follow-redirects: "npm:^1.15.6" - form-data: "npm:^4.0.0" - proxy-from-env: "npm:^1.1.0" - checksum: 10/7f92af205705a8fb4a9d35666b663729507657f252a1d39d83582590119941872d49078017cf992e32f47aa3b7317f5439f77be772a173dac2ae0fedd38f43ae - languageName: node - linkType: hard - "axios@npm:^1.7.4": version: 1.7.4 resolution: "axios@npm:1.7.4"