Merge remote-tracking branch 'github/pull/575'

[chef.git] / cookbooks / nodejs / recipes / default.rb

diff --git a/cookbooks/nodejs/recipes/default.rb b/cookbooks/nodejs/recipes/default.rb
index 87af7d65655b9f18a5325822047f61c154071843..9483d5893f9f98d0ebf824b98d8f480355ff01ad 100644 (file)
--- a/cookbooks/nodejs/recipes/default.rb
+++ b/cookbooks/nodejs/recipes/default.rb
@@ -1,8 +1,8 @@
 #
-# Cookbook Name:: nodejs
+# Cookbook:: nodejs
 # Recipe:: default
 #
-# Copyright 2013, OpenStreetMap Foundation
+# Copyright:: 2013, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,13 +17,12 @@
 # limitations under the License.
 #
 
+include_recipe "apt::nodesource"
+include_recipe "apt::yarn"
+
 package %w[
   nodejs
-  npm
+  yarn
   g++
   make
 ]
-
-if node[:lsb][:release].to_f < 18.04
-  package "nodejs-legacy"
-end