From f8130d4ddecac1f122be0f3b308091bcff2aff95 Mon Sep 17 00:00:00 2001 From: Grigory Date: Sat, 4 Nov 2023 02:15:51 +0500 Subject: [PATCH 1/3] chore(package.json): add `packageManager` && make scripts pm-independent --- .github/workflows/build.yml | 1 - .github/workflows/lint.yml | 1 - .github/workflows/push.yml | 1 - package.json | 5 +++-- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07946d21..85bb896b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,7 +15,6 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2 with: - version: latest run_install: false - name: Install Node.js (v20) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index aef08fe4..86a1b17a 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -18,7 +18,6 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2 with: - version: latest run_install: false - name: Install Node.js (v20) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 6a19758c..1072ae27 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -20,7 +20,6 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v2 with: - version: latest run_install: false - name: Install Node.js (v20) diff --git a/package.json b/package.json index 789e9190..d1b9ba28 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,11 @@ "bugs": { "url": "https://github.com/spicetify/spicetify-marketplace/issues" }, + "packageManager": "pnpm@8.10.2", "scripts": { "build": "spicetify-creator", "build:local": "spicetify-creator --out=dist --minify", - "build:prod": "pnpm build:local && pnpm copy:docs", + "build:prod": "npm run build:local && npm run copy:docs", "copy:docs": "copyfiles README.md dist/", "lint": "eslint --fix src", "lint:ci": "eslint src", @@ -21,7 +22,7 @@ "prepare": "husky install" }, "engines": { - "node": ">=20" + "node": ">=18" }, "devDependencies": { "@types/chroma-js": "^2.4.1", From c7704b30fe7d384d4bcf1e3a45d441afb7d5d1ac Mon Sep 17 00:00:00 2001 From: ririxi Date: Sat, 4 Nov 2023 19:11:12 +0000 Subject: [PATCH 2/3] feat: add pnpm to strict engines --- .npmrc | 1 + package.json | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 .npmrc diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..4fd02195 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +engine-strict=true \ No newline at end of file diff --git a/package.json b/package.json index 3a16f23a..42aba9f1 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "scripts": { "build": "spicetify-creator", "build:local": "spicetify-creator --out=dist --minify", - "build:prod": "npm run build:local && npm run copy:docs", + "build:prod": "pnpm run build:local && pnpm run copy:docs", "copy:docs": "copyfiles README.md dist/", "lint": "eslint --fix src", "lint:ci": "eslint src", @@ -22,7 +22,10 @@ "prepare": "husky install" }, "engines": { - "node": ">=18" + "yarn": "please-use-pnpm", + "npm": "please-use-pnpm", + "pnpm": ">=8", + "node": ">=20" }, "devDependencies": { "@types/chroma-js": "^2.4.2", From 8a9b799abb1d7e610659b462fafefc37fe4b8b1d Mon Sep 17 00:00:00 2001 From: ririxi Date: Sat, 4 Nov 2023 20:19:34 +0100 Subject: [PATCH 3/3] style(npmrc): add newline Co-authored-by: Isaac --- .npmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.npmrc b/.npmrc index 4fd02195..b6f27f13 100644 --- a/.npmrc +++ b/.npmrc @@ -1 +1 @@ -engine-strict=true \ No newline at end of file +engine-strict=true