Sync with upstream v205

.github/workflows/ci.yml

@@ -0,0 +1,58 @@
+name: CI
+
+on:
+  push:
+    branches: ["main"]
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+
+  unit-test:
+    runs-on: ubuntu-22.04
+    container:
+      image: heroku/heroku:${{ matrix.stack_number }}-build
+    strategy:
+      matrix:
+        stack_number: ["18", "20", "22"]
+    env:
+      STACK: heroku-${{ matrix.stack_number }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Unit tests on heroku:${{ matrix.stack_number }}-build
+        run: test/unit
+
+  functional-test:
+    runs-on: ubuntu-22.04
+    container:
+      image: heroku/heroku:${{ matrix.stack_number }}-build
+    strategy:
+      matrix:
+        stack_number: ["18", "20", "22"]
+    env:
+      STACK: heroku-${{ matrix.stack_number }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Functional tests on heroku:${{ matrix.stack_number }}-build
+        run: test/run
+
+  hatchet-test:
+    runs-on: ubuntu-22.04
+    env:
+      HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+      HEROKU_API_USER: ${{ secrets.HEROKU_API_USER }}
+      HATCHET_EXPENSIVE_MODE: "1"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: '2.7'
+          bundler-cache: true
+      - name: Run hatchet tests
+        run: make hatchet

.github/workflows/hatchet_app_cleaner.yml

@@ -0,0 +1,31 @@
+name: Hatchet app cleaner
+
+on:
+  schedule:
+    # Daily at 6am UTC.
+    - cron: "0 6 * * *"
+  # Allow the workflow to be manually triggered too.
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+jobs:
+  hatchet-app-cleaner:
+    runs-on: ubuntu-latest
+    env:
+      HEROKU_API_KEY: ${{ secrets.HEROKU_API_KEY }}
+      HEROKU_API_USER: ${{ secrets.HEROKU_API_USER }}
+      HEROKU_DISABLE_AUTOUPDATE: 1
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install Ruby and dependencies
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: "2.7"
+      - name: Run Hatchet destroy
+        # Only apps older than 10 minutes are destroyed, to ensure that any
+        # in progress CI runs are not interrupted.
+        run: bundle exec hatchet destroy --older-than 10

.gitignore

@@ -2,3 +2,4 @@
 .DS_Store
 repos/*
 .idea
+.build

CHANGELOG.md

@@ -17,7 +17,54 @@
 
 ## main
 
-## v195 (2022-04-12)
+## v205 (2023-03-13)
+
+- Added node version 18.15.0
+- Added yarn version 4.0.0-rc.40
+
+## v204 (2023-03-03)
+
+- Switch to inventory-based Node.js and Yarn version resolver ([#1061](https://github.com/heroku/heroku-buildpack-nodejs/pull/1061))
+
+## v203 (2023-02-10)
+
+- Allow yarn version selection for yarn berry projects ([#1060](https://github.com/heroku/heroku-buildpack-nodejs/pull/1060))
+
+## v202 (2022-11-03)
+
+- Update go to 1.19 and recompile resolve-version ([#1050](https://github.com/heroku/heroku-buildpack-nodejs/pull/1050))
+
+## v201 (2022-10-19)
+
+- Add metrics and tests for Node.js 19.x line ([#1046](https://github.com/heroku/heroku-buildpack-nodejs/pull/1046))
+- Update default node version to 18.x for heroku-20 and newer ([#1045](https://github.com/heroku/heroku-buildpack-nodejs/pull/1045))
+
+## v200 (2022-10-19)
+
+- Dependency pruning support for Yarn 2 / 3 / 4 ([#1040](https://github.com/heroku/heroku-buildpack-nodejs/pull/1040))
+
+## v199 (2022-10-03)
+
+- Remove dependency on semver.herokuapp.com ([#1037](https://github.com/heroku/heroku-buildpack-nodejs/pull/1037))
+
+## v198 (2022-06-15)
+
+- Adjust curl retry and connection timeout handling ([#1017](https://github.com/heroku/heroku-buildpack-nodejs/pull/1017))
+- `jq` is no longer installed by the buildpack([#1016](https://github.com/heroku/heroku-buildpack-nodejs/pull/1016))
+- Switch away from deprecated path-based S3 URLs ([#1013](https://github.com/heroku/heroku-buildpack-nodejs/pull/1013))
+
+## v197 (2022-06-07)
+- Drop the `yarn-native-cache` feature flag ([#1004](https://github.com/heroku/heroku-buildpack-nodejs/pull/1004))
+- Fix for `npm ci` caching ([#1009](https://github.com/heroku/heroku-buildpack-nodejs/pull/1009))
+- Fix skip pruning behavior with Yarn 2 ([#1008](https://github.com/heroku/heroku-buildpack-nodejs/pull/1008))
+
+## v196 (2022-05-31)
+- Add metrics plugin for Node 17 and 18 ([#1002](https://github.com/heroku/heroku-buildpack-nodejs/pull/1002))
+- Add warning message for Node 18+ incompatibility with heroku-18 ([#1002](https://github.com/heroku/heroku-buildpack-nodejs/pull/1002))
+- Enable Yarn 2 `devDependency` pruning using a custom plugin for all customers ([#1001](https://github.com/heroku/heroku-buildpack-nodejs/pull/1001))
+- Test against Heroku-22 ([#1003](https://github.com/heroku/heroku-buildpack-nodejs/pull/1003))
+
+## v195 (2022-04-13)
 - Enable Yarn 2 `devDependency` pruning using a custom plugin for 20% of customers ([#999](https://github.com/heroku/heroku-buildpack-nodejs/pull/999))
 - Set xtrace mode in buildpack when BUILDPACK_XTRACE environment variable is set ([#925](https://github.com/heroku/heroku-buildpack-nodejs/pull/925))
 

CONTRIBUTING.md

@@ -30,7 +30,7 @@ There are unit tests that are run with `shunit`. For any change you make, write
 
 ### Running Tests
 
-To run the tests, run `make test`. You will need Docker installed. This will start a test run of all 3 Heroku stack images that will run serially. If you want to test one stack image (which is usually adequate), run `make heroku-20` (or whatever stack image you'd like to test).
+To run the tests, run `make test`. You will need Docker installed. This will start a test run of all 3 Heroku stack images that will run serially. If you want to test one stack image (which is usually adequate), run `make heroku-22` (or whatever stack image you'd like to test).
 
 ## Opening a Pull Request
 

Gemfile.lock

@@ -3,14 +3,14 @@ GEM
   specs:
     diff-lcs (1.5.0)
     erubis (2.7.0)
-    excon (0.86.0)
+    excon (0.99.0)
     heroics (0.1.2)
       erubis (~> 2.0)
       excon
       moneta
       multi_json (>= 1.9.2)
       webrick
-    heroku_hatchet (7.3.4)
+    heroku_hatchet (8.0.1)
       excon (~> 0)
       platform-api (~> 3)
       rrrretry (~> 1)
@@ -22,25 +22,25 @@ GEM
     parallel_split_test (0.10.0)
       parallel (>= 0.5.13)
       rspec-core (>= 3.9.0)
-    platform-api (3.3.0)
+    platform-api (3.5.0)
       heroics (~> 0.1.1)
       moneta (~> 1.0.0)
       rate_throttle_client (~> 0.1.0)
     rake (13.0.6)
     rate_throttle_client (0.1.2)
     rrrretry (1.0.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.12.0)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.11.0)
+    rspec-support (3.12.0)
     sem_version (2.0.1)
-    thor (1.1.0)
+    thor (1.2.1)
     threaded (0.0.4)
-    webrick (1.7.0)
+    webrick (1.8.1)
 
 PLATFORMS
   ruby

bin/compile

@@ -81,6 +81,7 @@ build_start_time=$(nowms)
 handle_failure() {
   meta_set "node-build-success" "false"
   header "Build failed"
+  fail_using_yarn2_with_yarn_production_environment_variable_set "$LOG_FILE"
   fail_yarn_outdated "$LOG_FILE"
   fail_yarn_lockfile_outdated "$LOG_FILE"
   fail_node_install "$LOG_FILE" "$BUILD_DIR"
@@ -204,12 +205,6 @@ fi
 [ ! "$NPM_CONFIG_CACHE" ] && NPM_CONFIG_CACHE=$(mktemp -d -t npmcache.XXXXX)
 export YARN_CACHE_FOLDER NPM_CONFIG_CACHE
 
-[[ $(features_get "cache-native-yarn-cache") == "false" ]] && USE_YARN_CACHE=false
-
-if [[ -z "$USE_NPM_INSTALL" ]] && [[ $(features_get_with_blank "use-npm-ci") == "false" ]]; then
-  USE_NPM_INSTALL=true
-fi
-
 install_bins() {
   local node_engine npm_engine yarn_engine npm_version node_version
 
@@ -276,6 +271,14 @@ install_bins() {
 header "Installing binaries" | output "$LOG_FILE"
 install_bins | output "$LOG_FILE"
 
+if [[ -z "$USE_NPM_INSTALL" ]]; then
+  if [[ "$(should_use_npm_ci "$BUILD_DIR")" == "true" ]]; then
+    USE_NPM_INSTALL=false
+  else
+    USE_NPM_INSTALL=true
+  fi
+fi
+
 restore_cache() {
   local cache_status cache_directories restore_cache_start_time
   restore_cache_start_time=$(nowms)
@@ -298,7 +301,7 @@ restore_cache() {
   elif [[ "$cache_status" == "valid" ]]; then
     header "Restoring cache"
     if [[ "$cache_directories" == "" ]]; then
-      restore_default_cache_directories "$BUILD_DIR" "$CACHE_DIR" "$YARN_CACHE_FOLDER"
+      restore_default_cache_directories "$BUILD_DIR" "$CACHE_DIR" "$YARN_CACHE_FOLDER" "$NPM_CONFIG_CACHE"
     else
       restore_custom_cache_directories "$BUILD_DIR" "$CACHE_DIR" "$cache_directories"
     fi
@@ -369,7 +372,7 @@ cache_build() {
     :
   elif [[ "$cache_directories" == "" ]]; then
     header "Caching build"
-    save_default_cache_directories "$BUILD_DIR" "$CACHE_DIR" "$YARN_CACHE_FOLDER"
+    save_default_cache_directories "$BUILD_DIR" "$CACHE_DIR" "$YARN_CACHE_FOLDER" "$NPM_CONFIG_CACHE"
   else
     header "Caching build"
     save_custom_cache_directories "$BUILD_DIR" "$CACHE_DIR" "$cache_directories"

bin/report

@@ -147,12 +147,8 @@ kv_pair "yarn_prune_time" "$(meta_get "yarn-prune-time")"
 kv_pair "yarn_prune_memory" "$(meta_get "yarn-prune-memory")"
 
 # testing resolve-version differences
-kv_pair "resolve_v1_node" "$(meta_get "resolve-v1-node")"
-kv_pair "resolve_v1_yarn" "$(meta_get "resolve-v1-yarn")"
 kv_pair "resolve_v2_node" "$(meta_get "resolve-v2-node")"
 kv_pair "resolve_v2_yarn" "$(meta_get "resolve-v2-yarn")"
-kv_pair "resolve_is_equal_node" "$(meta_get "resolve-is-equal-node")"
-kv_pair "resolve_is_equal_yarn" "$(meta_get "resolve-is-equal-yarn")"
 kv_pair_string "resolve_v2_error" "$(meta_get "resolve-v2-error")"
 
 # save which features were turned on or off

buildpack.toml

@@ -3,10 +3,29 @@ name = "Node.js"
 
   [publish.Ignore]
   files = [
-      ".circle/",
+      ".circleci/",
       ".github/",
+      ".git2gus/",
       "etc/",
       "spec/",
       "test/",
-      "makefile"
+      "makefile",
+      "Gemfile.lock",
+      "Gemfile",
+      "hatchet.json",
+      "go.mod",
+      "go.sum",
+      "hatchet.lock",
+      "cmd/",
+      # TODO: get rid of these ignores once the yarn plugins are moved into a separate repo
+      #       for now we just need the compiled plugin in yarn2-plugin/prune-dev-dependencies/bundles
+      "yarn2-plugins/prune-dev-dependencies/.editorconfig",
+      "yarn2-plugins/prune-dev-dependencies/package-lock.json",
+      "yarn2-plugins/prune-dev-dependencies/.gitignore",
+      "yarn2-plugins/prune-dev-dependencies/package.json",
+      "yarn2-plugins/prune-dev-dependencies/tsconfig.json",
+      "yarn2-plugins/prune-dev-dependencies/README.md",
+      "yarn2-plugins/prune-dev-dependencies/tests",
+      "yarn2-plugins/prune-dev-dependencies/jest.config.js",
+      "yarn2-plugins/prune-dev-dependencies/src",
   ]