Merge pull request #507 from IntegratedBreedingPlatform/IBP-4681-Upgr…

…adeNodeVersion

IBP-4681 Upgrade Node version to 14.17

pom.xml

@@ -15,8 +15,8 @@
 		<spring.version>4.1.6.RELEASE</spring.version>
 		<spring.security.version>3.2.5.RELEASE</spring.security.version>
 		<modelmapper.version>0.7.3</modelmapper.version>
-		<node.version>v8.11.3</node.version>
-		<yarn.version>v1.21.1</yarn.version>
+		<node.version>v14.17.0</node.version>
+		<yarn.version>v1.22.10</yarn.version>
 		<frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
 		<envConfig>${user.name}</envConfig>
 	</properties>

src/main/jhipster/package.json

@@ -82,7 +82,6 @@
     "karma-sourcemap-loader": "0.3.7",
     "karma-webpack": "2.0.4",
     "merge-jsons-webpack-plugin": "1.0.14",
-    "node-sass": "4.5.3",
     "phantomjs-prebuilt": "2.1.16",
     "postcss-loader": "2.1.1",
     "protractor": "5.1.2",
@@ -91,7 +90,8 @@
     "puppeteer": "^1.20.0",
     "raw-loader": "0.5.1",
     "rimraf": "2.6.1",
-    "sass-loader": "6.0.6",
+    "sass": "^1.34.1",
+    "sass-loader": "^7.3.1",
     "simple-progress-webpack-plugin": "1.1.2",
     "source-map": "0.6.1",
     "sourcemap-istanbul-instrumenter-loader": "0.2.0",

src/main/web/gulp/tasks/angular.js

@@ -20,7 +20,7 @@ var gulp = require('gulp'),
 	minifyCSS = require('gulp-minify-css'),
 	prefix = require('gulp-autoprefixer'),
 	pixrem = require('gulp-pixrem'),
-	sass = require('gulp-sass'),
+	sass = require('gulp-dart-sass'),
 
 	jshint = require('gulp-jshint');
 

src/main/web/gulp/tasks/sass.js

@@ -9,7 +9,7 @@ var argv = require('yargs').argv,
 	prefix = require('gulp-autoprefixer'),
 	pixrem = require('gulp-pixrem'),
 	concat = require('gulp-concat'),
-	sass = require('gulp-sass');
+	sass = require('gulp-dart-sass');
 
 gulp.task('sass', ['libSass', 'clientSass', 'ontologySass']);
 

src/main/web/package.json

@@ -13,8 +13,7 @@
     "ng2:clean": "gulp angular2Clean",
     "ng2:dist": "gulp angular2Dist",
     "ng2:build": "gulp angular2",
-    "hotswap": "gulp hotswap",
-    "postinstall": "npm rebuild node-sass"
+    "hotswap": "gulp hotswap"
   },
   "repository": {
     "type": "git",
@@ -75,6 +74,7 @@
     "gulp-cached": "^1.0.1",
     "gulp-changed": "^1.0.0",
     "gulp-concat": "^2.4.3",
+    "gulp-dart-sass": "^1.0.2",
     "gulp-flatten": "0.0.4",
     "gulp-if": "^1.2.5",
     "gulp-imagemin": "^2.0.0",
@@ -85,7 +85,6 @@
     "gulp-pixrem": "^0.1.1",
     "gulp-rename": "^1.2.0",
     "gulp-replace": "^0.5.2",
-    "gulp-sass": "^2.0.4",
     "gulp-sourcemaps": "^1.12.1",
     "gulp-typescript": "^2.13.6",
     "gulp-uglify": "^1.5.4",
@@ -107,5 +106,8 @@
     "puppeteer": "^1.20.0",
     "typescript": "^2.0.10",
     "yargs": "^1.3.2"
+  },
+  "resolutions": {
+      "graceful-fs": "^4.2.4"
   }
 }