Просмотр исходного кода

Use packeto to get node scripts

Mohammed Nafees 4 лет назад
Родитель
Сommit
bb2ef1a4de
3 измененных файлов с 8 добавлено и 9 удалено
  1. 5 9
      cmd/test-runtime/runtimes/nodejs.go
  2. 1 0
      go.mod
  3. 2 0
      go.sum

+ 5 - 9
cmd/test-runtime/runtimes/nodejs.go

@@ -7,11 +7,11 @@ import (
 	"sync"
 	"sync"
 
 
 	nodemodulebom "github.com/paketo-buildpacks/node-module-bom"
 	nodemodulebom "github.com/paketo-buildpacks/node-module-bom"
+	noderunscript "github.com/paketo-buildpacks/node-run-script"
 	npminstall "github.com/paketo-buildpacks/npm-install"
 	npminstall "github.com/paketo-buildpacks/npm-install"
 	"github.com/paketo-buildpacks/packit"
 	"github.com/paketo-buildpacks/packit"
 	yarninstall "github.com/paketo-buildpacks/yarn-install"
 	yarninstall "github.com/paketo-buildpacks/yarn-install"
 	"github.com/pelletier/go-toml"
 	"github.com/pelletier/go-toml"
-	"k8s.io/apimachinery/pkg/util/json"
 )
 )
 
 
 const (
 const (
@@ -194,19 +194,15 @@ func (runtime *nodeRuntime) Detect(workingDir string) (BuildpackInfo, map[string
 
 
 	if atLeastOne {
 	if atLeastOne {
 		// it is safe to assume that the project contains a package.json
 		// it is safe to assume that the project contains a package.json
-		var packageJSONContents map[string]interface{}
 		packageJSONPath := filepath.Join(workingDir, "package.json")
 		packageJSONPath := filepath.Join(workingDir, "package.json")
-		data, err := os.ReadFile(packageJSONPath)
-		if err != nil {
-			fmt.Printf("Error reading %s: %v\n", packageJSONPath, err)
-			os.Exit(1)
-		}
-		err = json.Unmarshal(data, &packageJSONContents)
+
+		scriptManager := noderunscript.NewScriptManager()
+		scripts, err := scriptManager.GetPackageScripts(workingDir)
 		if err != nil {
 		if err != nil {
 			fmt.Printf("Error reading %s: %v\n", packageJSONPath, err)
 			fmt.Printf("Error reading %s: %v\n", packageJSONPath, err)
 			os.Exit(1)
 			os.Exit(1)
 		}
 		}
-		scripts := packageJSONContents["scripts"].(map[string]interface{})
+
 		packageJSONParser := npminstall.NewPackageJSONParser()
 		packageJSONParser := npminstall.NewPackageJSONParser()
 		engineVersion, err := packageJSONParser.ParseVersion(packageJSONPath)
 		engineVersion, err := packageJSONParser.ParseVersion(packageJSONPath)
 		if err != nil {
 		if err != nil {

+ 1 - 0
go.mod

@@ -42,6 +42,7 @@ require (
 	github.com/paketo-buildpacks/conda-env-update v0.2.2
 	github.com/paketo-buildpacks/conda-env-update v0.2.2
 	github.com/paketo-buildpacks/go-mod-vendor v0.3.1
 	github.com/paketo-buildpacks/go-mod-vendor v0.3.1
 	github.com/paketo-buildpacks/node-module-bom v0.1.2
 	github.com/paketo-buildpacks/node-module-bom v0.1.2
+	github.com/paketo-buildpacks/node-run-script v0.2.0
 	github.com/paketo-buildpacks/npm-install v0.5.0
 	github.com/paketo-buildpacks/npm-install v0.5.0
 	github.com/paketo-buildpacks/packit v1.3.0
 	github.com/paketo-buildpacks/packit v1.3.0
 	github.com/paketo-buildpacks/pipenv-install v0.2.3
 	github.com/paketo-buildpacks/pipenv-install v0.2.3

+ 2 - 0
go.sum

@@ -1058,6 +1058,8 @@ github.com/paketo-buildpacks/go-mod-vendor v0.3.1 h1:4ltB7mmMg2dGRNDLxwPMLoY98re
 github.com/paketo-buildpacks/go-mod-vendor v0.3.1/go.mod h1:ycd4yAggQShyoQg+bXZyaxazx/Nms98f1SH9NkG/I3k=
 github.com/paketo-buildpacks/go-mod-vendor v0.3.1/go.mod h1:ycd4yAggQShyoQg+bXZyaxazx/Nms98f1SH9NkG/I3k=
 github.com/paketo-buildpacks/node-module-bom v0.1.2 h1:mJSBiuMzOlqlZ22nJR8Akxorv0PECM60k6hWz+RMxIE=
 github.com/paketo-buildpacks/node-module-bom v0.1.2 h1:mJSBiuMzOlqlZ22nJR8Akxorv0PECM60k6hWz+RMxIE=
 github.com/paketo-buildpacks/node-module-bom v0.1.2/go.mod h1:gLG2ixUiwOanH2iy/wEdipfhEUXIoEHzgtK1eYYzGl4=
 github.com/paketo-buildpacks/node-module-bom v0.1.2/go.mod h1:gLG2ixUiwOanH2iy/wEdipfhEUXIoEHzgtK1eYYzGl4=
+github.com/paketo-buildpacks/node-run-script v0.2.0 h1:IAmnpavIuBM49RaKDIK/OdRbo12TfdUCzJ88CvYe4Kk=
+github.com/paketo-buildpacks/node-run-script v0.2.0/go.mod h1:5SexxOVrn+IfafiZthaFNUo/DM0ugOA83kWAffkPbVE=
 github.com/paketo-buildpacks/npm-install v0.5.0 h1:PWIdaa14IcLllbv1LyZa5mVh5r6DbpdB3bDSxz5+r94=
 github.com/paketo-buildpacks/npm-install v0.5.0 h1:PWIdaa14IcLllbv1LyZa5mVh5r6DbpdB3bDSxz5+r94=
 github.com/paketo-buildpacks/npm-install v0.5.0/go.mod h1:lJ+qayMglLeNbeDxnppIMTKKKNDO+sejM5qiPCBMwzw=
 github.com/paketo-buildpacks/npm-install v0.5.0/go.mod h1:lJ+qayMglLeNbeDxnppIMTKKKNDO+sejM5qiPCBMwzw=
 github.com/paketo-buildpacks/occam v0.0.22/go.mod h1:aPNRyPEgYp4a01O4UKAuFWYnRmY4ujeuV3x6yAa1hxs=
 github.com/paketo-buildpacks/occam v0.0.22/go.mod h1:aPNRyPEgYp4a01O4UKAuFWYnRmY4ujeuV3x6yAa1hxs=