refactor(deps): brought back the devtools package as Lerna's hoisting…

… is not sufficient affects: @serenity-js/cucumber-2, @serenity-js/devtools, serenity-js
serenity-js · May 18, 2017 · 31b2e7b · 31b2e7b
1 parent bd6a564
commit 31b2e7b
Show file tree

Hide file tree

Showing 12 changed files with 59 additions and 8,210 deletions.
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -32,13 +32,13 @@
     "commit": "git-cz",
     "lerna": "lerna",
     "gitbook": "gitbook",
-    "postinstall": "lerna bootstrap --loglevel silly"
+    "postinstall": "lerna bootstrap --hoist"
   },
   "devDependencies": {
     "@types/chai": "3.4.34",
     "@types/chai-as-promised": "0.0.29",
     "@types/mocha": "2.2.39",
-    "@types/node": "6.0.65",
+    "@types/node": "6.0.73",
     "@types/sinon": "1.16.34",
     "@types/sinon-chai": "2.7.27",
     "chai": "3.5.0",

diff --git a/packages/cucumber-2/package.json b/packages/cucumber-2/package.json
@@ -45,6 +45,7 @@
     "serenity-js": ">= 1.4"
   },
   "devDependencies": {
+    "@serenity-js/devtools": "*",
     "@types/cucumber": "2.0.0",
     "cucumber": "2.0.0-rc.9",
     "serenity-js": "*"

diff --git a/packages/devtools/bin/istanbul-merge b/packages/devtools/bin/istanbul-merge
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('istanbul-merge/bin/istanbul-merge');
diff --git a/packages/devtools/bin/mocha b/packages/devtools/bin/mocha
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('mocha/bin/mocha');
diff --git a/packages/devtools/bin/nyc b/packages/devtools/bin/nyc
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('nyc/bin/nyc');
diff --git a/packages/devtools/bin/rimraf b/packages/devtools/bin/rimraf
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('rimraf/bin');
diff --git a/packages/devtools/bin/tsc b/packages/devtools/bin/tsc
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('typescript/bin/tsc');
diff --git a/packages/devtools/bin/tslint b/packages/devtools/bin/tslint
@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require("tslint/bin/tslint");
diff --git a/packages/devtools/package.json b/packages/devtools/package.json
@@ -0,0 +1,32 @@
+{
+  "name": "@serenity-js/devtools",
+  "private": true,
+  "version": "0.0.0",
+  "description": "Serenity/JS dev tools",
+  "author": "Jan Molak <jan.molak@smartcodeltd.co.uk>",
+  "homepage": "http://serenity-js.org",
+  "license": "Apache-2.0",
+  "bin": {
+    "istanbul-merge": "./bin/istanbul-merge",
+    "mocha": "./bin/mocha",
+    "nyc": "./bin/nyc",
+    "rimraf": "./bin/rimraf",
+    "tsc": "./bin/tsc",
+    "tslint": "./bin/tslint"
+  },
+  "scripts": {
+    "clean": "exit 0;",
+    "verify": "exit 0;"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/jan-molak/serenity-js.git"
+  },
+  "bugs": {
+    "url": "https://github.com/jan-molak/serenity-js/issues"
+  },
+  "engines": {
+    "node": ">= 6.9.0",
+    "npm": ">= 3"
+  }
+}
diff --git a/packages/serenity-js/package.json b/packages/serenity-js/package.json
@@ -44,23 +44,24 @@
   },
   "dependencies": {
     "@types/graceful-fs": "2.0.29",
-    "@types/lodash": "4.14.52",
+    "@types/lodash": "4.14.55",
     "@types/mkdirp": "0.3.29",
-    "@types/node": "6.0.63",
+    "@types/node": "6.0.73",
     "@types/selenium-webdriver": "2.53.39",
     "co": "4.6.0",
     "glob": "7.1.1",
     "graceful-fs": "4.1.11",
     "is-generator": "1.0.3",
     "lodash": "4.17.4",
     "mkdirp": "0.5.1",
-    "moment": "2.17.1",
+    "moment": "2.18.1",
     "selenium-webdriver": "3.0.1",
-    "stacktrace-js": "1.3.1",
+    "stacktrace-js": "2.0.0",
     "ts-md5": "1.2.0",
     "util-arity": "1.1.0"
   },
   "devDependencies": {
+    "@serenity-js/devtools": "*",
     "@types/cucumber": "0.0.35",
     "@types/express": "4.0.35",
     "@types/glob": "5.0.30",

diff --git a/packages/serenity-js/tsconfig.json b/packages/serenity-js/tsconfig.json
@@ -24,7 +24,7 @@
   },
 
   "files": [
-    "node_modules/chai-smoothie/lib/chai-smoothie.d.ts"
+    "../../node_modules/chai-smoothie/lib/chai-smoothie.d.ts"
   ],
 
   "include": [