Fix scripts for npm by extracting run command out

smithy-lang · Feb 23, 2022 · 563987f · 563987f
1 parent d02ff59
commit 563987f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...codegen/src/main/java/software/amazon/smithy/typescript/codegen/PackageJsonGenerator.java b/...codegen/src/main/java/software/amazon/smithy/typescript/codegen/PackageJsonGenerator.java
@@ -73,7 +73,7 @@ static void writePackageJson(
         template = template.replace("${package}", settings.getPackageName());
         template = template.replace("${packageDescription}", settings.getPackageDescription());
         template = template.replace("${packageVersion}", settings.getPackageVersion());
-        template = template.replace("${packageManager}", settings.getPackageManager().getCommand());
+        template = template.replace("${packageManager}", settings.getPackageManager().toString());
         manifest.writeFile("package.json", template);
     }
 }
diff --git a/...t-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptSettings.java b/...t-codegen/src/main/java/software/amazon/smithy/typescript/codegen/TypeScriptSettings.java
@@ -395,7 +395,7 @@ public SymbolProvider createSymbolProvider(Model model, TypeScriptSettings setti
 
     public enum PackageManager {
         YARN("yarn"),
-        NPM("npm run-script");
+        NPM("npm");
 
         private final String command;
 

diff --git a/...pt-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/base-package.json b/...pt-codegen/src/main/resources/software/amazon/smithy/typescript/codegen/base-package.json
@@ -10,7 +10,7 @@
     "build:types": "tsc -p tsconfig.types.json",
     "build:types:downlevel": "downlevel-dts dist-types dist-types/ts3.4",
     "clean": "rimraf ./dist-* && rimraf *.tsbuildinfo",
-    "prepack": "${packageManager} clean && ${packageManager} build"
+    "prepack": "${packageManager} run clean && ${packageManager} run build"
   },
   "main": "./dist-cjs/index.js",
   "types": "./dist-types/index.d.ts",