← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~twom/launchpad:sassy-css-yarn-upgrade into launchpad:master

 

Tom Wardill has proposed merging ~twom/launchpad:sassy-css-yarn-upgrade into launchpad:master.

Commit message:
Upgrade Yarn to the latest version.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~twom/launchpad/+git/launchpad/+merge/384614

Yarn has had some security releases and needs updating for the newer Node LTS, we should upgrade to the latest.

This can't land until the staging and production upgrade to Node 8 is complete.
This can't land until https://code.launchpad.net/~twom/lp-source-dependencies/+git/lp-source-dependencies/+merge/384613 is landed.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~twom/launchpad:sassy-css-yarn-upgrade into launchpad:master.
diff --git a/Makefile b/Makefile
index 418cf98..7dceba0 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ ICING=lib/canonical/launchpad/icing
 LP_BUILT_JS_ROOT=${ICING}/build
 
 JS_BUILD_DIR := build/js
-YARN_VERSION := 1.2.1
+YARN_VERSION := 1.22.4
 YARN_BUILD := $(JS_BUILD_DIR)/yarn
 YARN := utilities/yarn
 YUI_SYMLINK := $(JS_BUILD_DIR)/yui
@@ -186,7 +186,7 @@ $(JS_BUILD_DIR):
 
 $(YARN_BUILD): | $(JS_BUILD_DIR)
 	mkdir -p $@/tmp
-	tar -C $@/tmp -xf download-cache/dist/yarn-$(YARN_VERSION).tar.gz
+	tar -C $@/tmp -xf download-cache/dist/yarn-v$(YARN_VERSION).tar.gz
 	mv $@/tmp/yarn-v$(YARN_VERSION)/* $@
 	$(RM) -r $@/tmp