Use npm run for better compatibility

mufancom · Feb 3, 2024 · 2aa1661 · 2aa1661
2 parents 0fa9222 + 5981744
commit 2aa1661
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/general/src/composables/package.json.ts b/general/src/composables/package.json.ts
@@ -125,7 +125,7 @@ export default composable<ResolvedOptions>(
       '3': SCRIPT_3_DICT[packageManager],
       lint: 'eslint --no-error-on-unmatched-pattern --report-unused-disable-directives .',
       'lint-prettier': 'prettier --check .',
-      test: `${packageManager} lint-prettier && ${packageManager} lint`,
+      test: 'npm run lint-prettier && npm run lint',
     };
 
     for (const {name, alias} of packagesSortedByName) {

diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "build": "rimraf --glob */bld && tsc --build",
     "lint": "eslint --no-error-on-unmatched-pattern --report-unused-disable-directives . && run-in-every eslint-project --parallel --echo -- eslint --no-error-on-unmatched-pattern --report-unused-disable-directives .",
     "lint-prettier": "prettier --check .",
-    "test": "yarn lint-prettier && yarn build && yarn lint"
+    "test": "npm run lint-prettier && npm run build && npm run lint"
   },
   "dependencies": {
     "@magicspace/core": "^0.3.6",

diff --git a/typescript/src/composables/package.json.ts b/typescript/src/composables/package.json.ts
@@ -120,7 +120,7 @@ export default composable<ResolvedOptions>(
         scripts = extendObjectProperties(
           scripts,
           {
-            test: extendPackageScript(scripts.test, `${packageManager} build`, {
+            test: extendPackageScript(scripts.test, 'npm run build', {
               after: '*lint-prettier*',
             }),
           },
@@ -135,10 +135,7 @@ export default composable<ResolvedOptions>(
             {
               'bare-test':
                 'cross-env NODE_OPTIONS=--experimental-vm-modules jest',
-              test: extendPackageScript(
-                scripts.test,
-                `${packageManager} bare-test`,
-              ),
+              test: extendPackageScript(scripts.test, 'npm run bare-test'),
             },
             {
               before: 'test',