From 3eac62d5ef4935708185b54b7d10c3ad9f2b5cb1 Mon Sep 17 00:00:00 2001 From: Daniel Uber Date: Fri, 7 Jan 2022 14:34:08 -0600 Subject: [PATCH] Stop removing canvas before yarn during bin/setup (#15966) --- bin/setup | 9 --------- 1 file changed, 9 deletions(-) diff --git a/bin/setup b/bin/setup index 7e1fc4aa4..2c1679c5d 100755 --- a/bin/setup +++ b/bin/setup @@ -22,15 +22,6 @@ FileUtils.chdir APP_ROOT do system! "gem list \"^foreman$\" -i --silent || gem install foreman" - # TODO: temporary fix for node 16 upgrade, remove after release as this triggers reinstallation - # of the canvas library (with its extension compiled against the versioned node symbol) - if File.exist?("node_modules/canvas/") - FileUtils.rm_rf("node_modules/canvas/") - # having removed the module ourselves, - # we need to coerce yarn, or remove the .yarn-integrity file - system("yarn install --check-files") - end - # Install JavaScript dependencies if using Yarn system("bin/yarn")