Merge pull request #107 from xebia-france/fix/node-sass

Use SASS and LTS node
publicissapient-france · Feb 23, 2021 · 601972e · 601972e
2 parents 4c9ed38 + 24c5179
commit 601972e
Show file tree

Hide file tree

Showing 5 changed files with 34,411 additions and 19,444 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,5 @@
 # Kanban board
 
-[![Stories in Ready](https://badge.waffle.io/xebia-france/xskillz-v2.png?label=ready&title=Ready)](https://waffle.io/xebia-france/xskillz-v2)
-
 # Back
 
 [![npm version](https://badge.fury.io/js/npm.svg)](https://badge.fury.io/js/npm) [![Coverage Status](https://coveralls.io/repos/github/xebia-france/xskillz-v2/badge.svg?branch=master)](https://coveralls.io/github/xebia-france/xskillz-v2?branch=master) [![Build Status](https://travis-ci.org/xebia-france/xskillz-v2.svg?branch=master)](https://travis-ci.org/xebia-france/xskillz-v2)

diff --git a/web/Makefile b/web/Makefile
@@ -1,4 +1,4 @@
-NODE_VERSION=6.2
+NODE_VERSION=14
 
 NAME=skillz-web
 IMAGE_NAME=xebiafrance/$(NAME)
@@ -11,10 +11,7 @@ install:
 test: install
 	docker run --rm -t -v $(PWD):/usr/src/$(NAME) -w /usr/src/$(NAME) node:$(NODE_VERSION) npm test
 
-nodesass: test
-	docker run --rm -t -v $(PWD):/usr/src/$(NAME) -w /usr/src/$(NAME) node:$(NODE_VERSION) npm rebuild node-sass
-
-package: nodesass
+package: test
 	docker run --rm -t -v $(PWD):/usr/src/$(NAME) -w /usr/src/$(NAME) node:$(NODE_VERSION) npm run build:production
 
 build-image:
@@ -24,4 +21,4 @@ push-image:
 	docker push $(IMAGE_NAME)
 
 clean:
-	docker rmi -f $(docker images | grep "^<none>" | awk "{print $3}")
+	docker rmi -f $(docker images | grep "^<none>" | awk "{print $3}")