From 8fe4d2a9d9b628fb569491a62f631b60d583ca78 Mon Sep 17 00:00:00 2001 From: deeplydrumming Date: Thu, 25 Jul 2024 21:18:31 +0100 Subject: [PATCH] successfully migrated to pnpm !!! changed all scripts --- .gitignore | 1 + .npmrc | 1 + deemix/package.json | 3 ++- deezer-js/package.json | 2 +- package.json | 16 ++++++++-------- pnpm-workspace.yaml | 0 server/package.json | 13 +++++++------ server/src/helpers/server-callbacks.ts | 8 ++++---- webui/package.json | 6 +++--- 9 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 .npmrc create mode 100644 pnpm-workspace.yaml diff --git a/.gitignore b/.gitignore index a6608b5..7c9c210 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,7 @@ build/Release node_modules/ jspm_packages/ yarn.lock +pnpm-lock.yaml # Typescript v1 declaration files typings/ diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..d67f374 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +node-linker=hoisted diff --git a/deemix/package.json b/deemix/package.json index 4f041bd..1dfbfdb 100644 --- a/deemix/package.json +++ b/deemix/package.json @@ -20,7 +20,8 @@ "got": "^11.8.2", "html-entities": "^2.3.3", "metaflac-js2": "^1.0.8", - "spotify-web-api-node-plus": "../spotify-web-api-node-plus" + "spotify-web-api-node-plus": "../spotify-web-api-node-plus", + "tough-cookie": "^4.0.0" }, "devDependencies": { "eslint": "^9.7.0" diff --git a/deezer-js/package.json b/deezer-js/package.json index a2c780e..1470a71 100644 --- a/deezer-js/package.json +++ b/deezer-js/package.json @@ -13,7 +13,7 @@ "author": "RemixDev", "license": "GPL-3.0-or-later", "dependencies": { - "got": "^11.8.2", + "got": "11.8.2", "tough-cookie": "^4.0.0" }, "devDependencies": { diff --git a/package.json b/package.json index f0bca32..857be00 100644 --- a/package.json +++ b/package.json @@ -7,15 +7,15 @@ "license": "GPL-3.0-only", "scripts": { "install-all-dev": "yarn install && yarn --cwd deemix install && yarn --cwd deezer-js install && yarn --cwd server install && yarn --cwd spotify-web-api-node-plus install && yarn --cwd webui install", - "dev": "yarn --cwd webui dev", + "dev": "pnpm -C webui dev", "start": "electron . --dev ", - "predist": "yarn build-server && yarn build-webui", - "dist": "yarn set-version && electron-builder && yarn reset-version", - "dist:dir": "yarn set-version && yarn predist && electron-builder --dir && yarn reset-version", - "dist-server": "yarn set-version && yarn predist && ./node_modules/.bin/pkg --out-dir dist ./server/package.json && yarn reset-version", - "start-server": "yarn --cwd server start", - "build-server": "yarn --cwd server build", - "build-webui": "yarn --cwd webui build", + "predist": "pnpm build-server && pnpm build-webui", + "dist": "pnpm set-version && electron-builder && pnpm reset-version", + "dist:dir": "pnpm set-version && pnpm predist && electron-builder --dir && pnpm reset-version", + "dist-server": "pnpm set-version && pnpm predist && pkg --out-dir dist ./server/package.json && pnpm reset-version", + "start-server": "pnpm -C server start", + "build-server": "pnpm -C server build", + "build-webui": "pnpm -C webui build", "set-version": "node scripts/set-version.js", "reset-version": "node scripts/reset-version.js" }, diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml new file mode 100644 index 0000000..e69de29 diff --git a/server/package.json b/server/package.json index bf31f90..1583039 100644 --- a/server/package.json +++ b/server/package.json @@ -6,7 +6,7 @@ "start": "node dist/app.js", "build": "webpack --env production", "sourcemap": "webpack --env production sourcemap", - "prewatch": "yarn lint-build", + "prewatch": "pnpm lint-build", "watch": "webpack --watch", "lint": "eslint \"./{src, tests}/**\" --fix", "lint-build": "eslint \"./src/**\" --fix", @@ -41,6 +41,7 @@ "@types/yargs": "17.0.32", "bufferutil": "4.0.8", "cookie-parser": "1.4.6", + "dateformat": "^5.0.3", "debug": "2.6.9", "deemix": "../deemix", "deezer-js": "../deezer-js", @@ -48,6 +49,7 @@ "ejs": "3.1.10", "express": "4.19.2", "express-session": "^1.17.3", + "got": "^11.8.2", "memorystore": "1.6.7", "morgan": "1.10.0", "nodemon": "2.0.7", @@ -63,14 +65,13 @@ "yargs": "17.7.2" }, "devDependencies": { - "@nuxtjs/eslint-config": "6.0.0", - "@types/jest": "26.0.22", - "@types/supertest": "2.0.11", + "@types/jest": "29.5.12", + "@types/supertest": "6.0.2", "@typescript-eslint/eslint-plugin": "4.21.0", "@typescript-eslint/parser": "4.21.0", "eslint": "7.23.0", - "eslint-config-prettier": "8.1.0", - "eslint-plugin-prettier": "3.3.1", + "eslint-config-prettier": "^8.1.0", + "eslint-plugin-prettier": "^3.3.1", "jest": "26.6.3", "prettier": "2.2.1", "supertest": "6.1.3", diff --git a/server/src/helpers/server-callbacks.ts b/server/src/helpers/server-callbacks.ts index 3faf2d0..c28f330 100644 --- a/server/src/helpers/server-callbacks.ts +++ b/server/src/helpers/server-callbacks.ts @@ -17,14 +17,14 @@ export function getErrorCb(port: number | string | boolean) { // handle specific listen errors with friendly messages switch (error.code) { - case 'EACCES': { + case 'EACCES': logger.error(bind + ' requires elevated privileges') process.exit(1) - } - case 'EADDRINUSE': { + break + case 'EADDRINUSE': logger.error(bind + ' is already in use') process.exit(1) - } + break default: throw error } diff --git a/webui/package.json b/webui/package.json index 6abd8e8..162925c 100644 --- a/webui/package.json +++ b/webui/package.json @@ -7,8 +7,8 @@ "build:js": "rollup -c", "minify": "esbuild public/js/bundle.temp.js --outfile=public/js/bundle.js --minify", "build": "npm-run-all --sequential clean build:js minify clean-temp", - "start:gui": "yarn --cwd ../ start", - "watch:server": "yarn --cwd ../server watch", + "start:gui": "pnpm -C ../ start", + "watch:server": "pnpm -C ../server watch", "watch:js": "rollup -c -w", "dev": "npm-run-all --parallel watch:server watch:js", "lint": "eslint src/**/*.{js,vue,mjs} --fix", @@ -26,7 +26,6 @@ "esbuild": "0.12.19", "flag-icon-css": "3.5.0", "lodash-es": "4.17.21", - "npm-run-all": "4.1.5", "postcss": "8.4.39", "rimraf": "3.0.2", "rollup": "2.56.1", @@ -54,6 +53,7 @@ "eslint-config-prettier": "8.3.0", "eslint-plugin-prettier": "3.4.0", "jest": "27.0.6", + "npm-run-all": "^4.1.5", "prettier": "2.3.2", "typescript": "4.3.5", "vue-template-compiler": "2.6.14"