Added nodejs-npm-engine Buildpack

Cargo.toml

@@ -3,6 +3,7 @@ members = [
   "buildpacks/nodejs-engine",
   "buildpacks/nodejs-corepack",
   "buildpacks/nodejs-function-invoker",
+  "buildpacks/nodejs-npm-engine",
   "buildpacks/nodejs-pnpm-install",
   "buildpacks/nodejs-yarn",
   "common/nodejs-utils",
@@ -18,7 +19,7 @@ publish = false
 [workspace.dependencies]
 heroku-nodejs-utils = { path = "./common/nodejs-utils" }
 indoc = "2"
-libcnb-test = "0.13"
+libcnb-test = { git = "https://github.com/heroku/libcnb.rs", branch = "libcnb_test_local_and_meta_buildpack_support" }
 libcnb = "0.13"
 libherokubuildpack = "0.13"
 serde = "1"

buildpacks/nodejs-engine/src/main.rs

@@ -36,7 +36,7 @@ impl Buildpack for NodeJsEngineBuildpack {
     type Error = NodeJsEngineBuildpackError;
 
     fn detect(&self, context: DetectContext<Self>) -> libcnb::Result<DetectResult, Self::Error> {
-        let mut plan_builder = BuildPlanBuilder::new().provides("node");
+        let mut plan_builder = BuildPlanBuilder::new().provides("node").provides("npm");
 
         // If there are common node artifacts, this buildpack should both
         // provide and require node so that it may be used without other

buildpacks/nodejs-npm-engine/CHANGELOG.md

@@ -7,39 +7,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-- Added npm version 8.17.0.
-- Added npm version 9.5.0.
-- Added npm version 8.5.0.
-- Added npm version 8.2.0.
-- Added npm version 8.7.0.
-- Added npm version 8.12.0.
-- Added npm version 9.3.1.
-- Added npm version 8.13.1.
-- Added npm version 9.6.6.
-- Added npm version 8.0.0.
-- Added npm version 9.4.2.
-- Added npm version 8.4.0.
-- Added npm version 8.5.5.
-- Added npm version 8.3.1.
-- Added npm version 9.1.0.
-- Added npm version 8.5.1.
-- Added npm version 9.6.1.
-- Added npm version 9.1.3.
-- Added npm version 8.15.0.
-- Added npm version 9.1.1.
-- Added npm version 8.16.0.
-- Added npm version 9.6.5.
-- Added npm version 9.6.0.
-- Added npm version 8.3.0.
-- Added npm version 9.6.6.
-- Added npm version 8.12.0.
-- Added npm version 9.1.3.
-- Added npm version 8.3.0.
-- Added npm version 8.5.5.
-- Added npm version 9.6.5.
-- Added npm version 9.5.0.
-- Added npm version 9.3.1.
-- Added npm version 8.7.0.
-- Added npm version 8.17.0.
-- Added npm version 8.16.0.
-- Added npm version 8.4.0.
+- Initial release

buildpacks/nodejs-npm-engine/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "heroku-npm-engine-buildpack"
+description = "Heroku Node.js npm Engine Cloud Native Buildpack"
+version.workspace = true
+rust-version.workspace = true
+edition.workspace = true
+publish.workspace = true
+
+[dependencies]
+heroku-nodejs-utils.workspace = true
+libcnb.workspace = true
+libherokubuildpack.workspace = true
+serde.workspace = true
+indoc.workspace = true
+tempfile.workspace = true
+toml.workspace = true
+
+[dev-dependencies]
+libcnb-test.workspace = true
+serde_json.workspace = true
+test_support.workspace = true

buildpacks/nodejs-npm-engine/README.md

@@ -0,0 +1 @@
+# TODO

buildpacks/nodejs-npm-engine/buildpack.toml

@@ -0,0 +1,28 @@
+api = "0.9"
+
+[buildpack]
+id = "heroku/nodejs-npm-engine"
+version = "1.1.4"
+name = "Heroku Node.js npm Setup"
+homepage = "https://github.com/heroku/buildpacks-nodejs"
+keywords = ["node", "node.js", "nodejs", "javascript", "js", "npm", "engine"]
+
+[[buildpack.licenses]]
+type = "MIT"
+
+[[stacks]]
+id = "*"
+
+[[stacks]]
+id = "heroku-20"
+
+[[stacks]]
+id = "heroku-22"
+
+[[stacks]]
+id = "io.buildpacks.stacks.bionic"
+
+[metadata]
+[metadata.release]
+[metadata.release.docker]
+repository = "docker.io/heroku/buildpack-nodejs-npm-engine"

buildpacks/nodejs-npm-engine/src/cmd.rs

@@ -0,0 +1,37 @@
+use heroku_nodejs_utils::vrs::Version;
+use libcnb::Env;
+use std::process::{Command, ExitStatus};
+
+type Result<T> = std::result::Result<T, Error>;
+
+#[derive(Debug)]
+pub(crate) enum Error {
+    Wait(std::io::Error),
+    Exit(ExitStatus),
+    Parse(String),
+}
+
+pub(crate) fn node_version(env: &Env) -> Result<Version> {
+    exec_version_command("node", env)
+}
+
+pub(crate) fn npm_version(env: &Env) -> Result<Version> {
+    exec_version_command("npm", env)
+}
+
+fn exec_version_command(program: &str, env: &Env) -> Result<Version> {
+    let output = Command::new(program)
+        .args(["--version"])
+        .envs(env)
+        .output()
+        .map_err(Error::Wait)?;
+
+    if !output.status.success() {
+        return Err(Error::Exit(output.status));
+    }
+
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    stdout
+        .parse::<Version>()
+        .map_err(|_| Error::Parse(stdout.into_owned()))
+}

buildpacks/nodejs-npm-engine/src/errors.rs

@@ -0,0 +1,20 @@
+use crate::cmd;
+use crate::layers::npm_engine::NpmEngineLayerError;
+use heroku_nodejs_utils::package_json::PackageJsonError;
+use heroku_nodejs_utils::vrs::Requirement;
+use libcnb::Error;
+
+#[derive(Debug)]
+pub(crate) enum NpmEngineBuildpackError {
+    PackageJson(PackageJsonError),
+    MissingNpmEngineRequirement,
+    InventoryParse(toml::de::Error),
+    NpmVersionResolve(Requirement),
+    NpmSetupLayer(NpmEngineLayerError),
+    NodeVersionCommand(cmd::Error),
+    NpmVersionCommand(cmd::Error),
+}
+
+pub(crate) fn on_error(_error: Error<NpmEngineBuildpackError>) {
+    todo!()
+}

buildpacks/nodejs-npm-engine/src/layers/mod.rs

@@ -0,0 +1 @@
+pub(crate) mod npm_engine;