Test upgrade to Yarn 1.1.0

jhipster · Sep 25, 2017 · aebed46 · aebed46
1 parent bc9eb28
commit aebed46
Show file tree

Hide file tree

Showing 4 changed files with 206 additions and 58 deletions.
diff --git a/generators/client/templates/angular/_package.json b/generators/client/templates/angular/_package.json
@@ -134,19 +134,31 @@
   },
   "scripts": {
     "lint": "tslint --type-check --project './tsconfig.json' -e 'node_modules/**'",
-    "lint:fix": "<%= clientPackageManager %> run lint -- --fix",
+    <%_ if (clientPackageManager === 'npm') { _%>
+    "lint:fix": "npm run lint -- --fix",
+    <%_ } else { _%>
+    "lint:fix": "yarn run lint --fix",
+    <%_ } _%>
     "ngc": "ngc -p tsconfig-aot.json",
     "cleanup": "rimraf <%= BUILD_DIR %>{aot,www}",
     "clean-www": "rimraf <%= BUILD_DIR %>/www/app/{src,<%= BUILD_DIR %>}",
     "start": "<%= clientPackageManager %> run webpack:dev",
     "serve": "<%= clientPackageManager %> run start",
     "build": "<%= clientPackageManager %> run webpack:prod",
     "test": "karma start src/test/javascript/karma.conf.js",
+    <%_ if (clientPackageManager === 'npm') { _%>
     "test:watch": "<%= clientPackageManager %> test -- --watch",
     "webpack:dev": "<%= clientPackageManager %> run webpack-dev-server -- --config webpack/webpack.dev.js --progress --inline --hot --profile --port=9060 --watch-content-base",
     "webpack:build:main": "<%= clientPackageManager %> run webpack -- --config webpack/webpack.dev.js --progress --profile",
     "webpack:build": "<%= clientPackageManager %> run cleanup && <%= clientPackageManager %> run webpack:build:main",
     "webpack:prod:main": "<%= clientPackageManager %> run webpack -- --config webpack/webpack.prod.js --progress --profile",
+    <%_ } else { _%>
+    "test:watch": "<%= clientPackageManager %> test --watch",
+    "webpack:dev": "<%= clientPackageManager %> run webpack-dev-server --config webpack/webpack.dev.js --progress --inline --hot --profile --port=9060 --watch-content-base",
+    "webpack:build:main": "<%= clientPackageManager %> run webpack --config webpack/webpack.dev.js --progress --profile",
+    "webpack:build": "<%= clientPackageManager %> run cleanup && <%= clientPackageManager %> run webpack:build:main",
+    "webpack:prod:main": "<%= clientPackageManager %> run webpack --config webpack/webpack.prod.js --progress --profile",
+    <%_ } _%>
     "webpack:prod": "<%= clientPackageManager %> run cleanup && <%= clientPackageManager %> run webpack:prod:main && <%= clientPackageManager %> run clean-www",
     "webpack:test": "<%= clientPackageManager %> run test",
     "webpack-dev-server": "node --max_old_space_size=4096 node_modules/webpack-dev-server/bin/webpack-dev-server.js",

diff --git a/generators/generator-constants.js b/generators/generator-constants.js
@@ -47,8 +47,8 @@ const DOCKER_SWAGGER_EDITOR = 'swaggerapi/swagger-editor:latest';
 const DOCKER_COMPOSE_FORMAT_VERSION = '2';
 
 // version of Node, Yarn, NPM
-const NODE_VERSION = '6.11.1';
-const YARN_VERSION = '0.27.5';
+const NODE_VERSION = '6.11.3';
+const YARN_VERSION = '1.1.0';
 const NPM_VERSION = '5.3.0';
 
 // all constants used throughout all generators

diff --git a/generators/server/templates/_pom.xml b/generators/server/templates/_pom.xml
@@ -65,7 +65,7 @@
         <!-- Overridden to get metrics-jcache -->
         <dropwizard-metrics.version>3.2.2</dropwizard-metrics.version>
         <%_ if (!skipClient) { _%>
-        <frontend-maven-plugin.version>1.4</frontend-maven-plugin.version>
+        <frontend-maven-plugin.version>1.6</frontend-maven-plugin.version>
         <%_ } _%>
         <%_ if (gatlingTests) { _%>
         <gatling.version>2.2.5</gatling.version>