commit: bb954482ee123e48756ebf8884966ea47ffedf6e
parent 5bfe3e61a960056ca45b269624621b7473883730
Author: HJ <30-hj@users.noreply.git.pleroma.social>
Date: Wed, 8 Jan 2025 11:28:33 +0000
Merge branch 'tusooa/no-check-npm' into 'develop'
Do not check npm version
See merge request pleroma/pleroma-fe!1969
Diffstat:
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/build/check-versions.js b/build/check-versions.js
@@ -11,11 +11,6 @@ var versionRequirements = [
name: 'node',
currentVersion: semver.clean(process.version),
versionRequirement: packageConfig.engines.node
- },
- {
- name: 'npm',
- currentVersion: exec('npm --version'),
- versionRequirement: packageConfig.engines.npm
}
]
diff --git a/changelog.d/no-check-npm.skip b/changelog.d/no-check-npm.skip
diff --git a/package.json b/package.json
@@ -10,8 +10,8 @@
"unit": "karma start test/unit/karma.conf.js --single-run",
"unit:watch": "karma start test/unit/karma.conf.js --single-run=false",
"e2e": "node test/e2e/runner.js",
- "test": "npm run unit && npm run e2e",
- "stylelint": "npx stylelint '**/*.scss' '**/*.vue'",
+ "test": "yarn run unit && yarn run e2e",
+ "stylelint": "yarn exec stylelint '**/*.scss' '**/*.vue'",
"lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
"lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
},
@@ -131,8 +131,7 @@
"webpack-merge": "0.20.0"
},
"engines": {
- "node": ">= 16.0.0",
- "npm": ">= 3.0.0"
+ "node": ">= 16.0.0"
},
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
}