From 03194da67fd333c07783e275010188d166e04510 Mon Sep 17 00:00:00 2001
From: "Eduardo L. Buratti" <elburatti@inf.ufpr.br>
Date: Fri, 14 Oct 2016 09:50:25 -0300
Subject: [PATCH] Use types from @types organization in npm instead of the
typings tool
---
.gitignore | 1 +
package.json | 26 ++++++++++++++++----------
tsconfig.json | 13 ++++++++++---
typings.json | 11 -----------
4 files changed, 27 insertions(+), 24 deletions(-)
delete mode 100644 typings.json
diff --git a/.gitignore b/.gitignore
index 3578f038..08fde363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
/coverage
/typings
/build
+/dist
diff --git a/package.json b/package.json
index d5f1c7bc..f78b8bf6 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,8 @@
"description": "BlenDB",
"main": "index.js",
"scripts": {
- "postinstall": "typings install",
"start": "node index",
- "pretest": "tslint -s node_modules/tslint-stylish -t stylish src/**/*.ts test/**/*.ts",
+ "lint": "tslint -s node_modules/tslint-stylish -t stylish src/**/*.ts test/**/*.ts",
"test": "ts-node node_modules/istanbul/lib/cli.js cover -x \"**/*.spec.ts\" -e .ts _mocha",
"show-coverage": "xdg-open coverage/lcov-report/index.html",
"doc-api": "raml2html -i specs/blendb-api-v1.raml -o doc/api-v1-reference.html"
@@ -18,18 +17,25 @@
"author": "Centro de Computação Científica e Software Livre (C3SL)",
"license": "GPL-3.0",
"dependencies": {
- "express": "^4.14.0",
+ "@types/chai": "^3.4.33",
+ "@types/d3": "^3.5.36",
+ "@types/express": "^4.0.33",
+ "@types/mocha": "^2.2.32",
+ "@types/pug": "^2.0.1",
+ "express": "^4.0.33",
+ "mississippi": "^1.2.0",
+ "node-uuid": "^1.4.7",
"osprey": "^0.3.2",
- "ts-node": "^1.2.3",
- "typescript": "^1.8.10",
- "typings": "^1.3.2"
+ "pug": "^2.0.0-beta6",
+ "ts-node": "^1.3.0",
+ "typescript": "^2.0.3"
},
"devDependencies": {
- "chai": "^3.5.0",
+ "chai": "^3.4.33",
"istanbul": "1.1.0-alpha.1",
- "mocha": "^3.0.2",
- "raml2html": "^3.0.0",
- "tslint": "^3.14.0",
+ "mocha": "^3.1.0",
+ "raml2html": "^3.0.1",
+ "tslint": "^3.15.1",
"tslint-stylish": "^2.1.0-beta"
}
}
diff --git a/tsconfig.json b/tsconfig.json
index fbde5211..37c0501b 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,12 +1,19 @@
{
"compilerOptions": {
"pretty": true,
- "target": "es5",
+ "target": "es6",
"module": "commonjs",
- "noImplicitAny": true
+ "noImplicitAny": true,
+ "outDir": "dist/"
},
"exclude": [
"node_modules"
],
- "compileOnSave": false
+ "compileOnSave": false,
+ "typeRoots": [
+ "node_modules/@types"
+ ],
+ "types": [
+ "d3-force"
+ ]
}
diff --git a/typings.json b/typings.json
deleted file mode 100644
index 82bbd7ca..00000000
--- a/typings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "globalDependencies": {
- "chai": "registry:dt/chai#3.4.0+20160601211834",
- "express": "registry:dt/express#4.0.0+20160708185218",
- "express-serve-static-core": "registry:dt/express-serve-static-core#4.0.0+20160817171221",
- "mime": "registry:dt/mime#0.0.0+20160316155526",
- "mocha": "registry:env/mocha#2.2.5+20160723033700",
- "node": "registry:env/node#6.0.0+20160813135048",
- "serve-static": "registry:dt/serve-static#0.0.0+20160606155157"
- }
-}
--
GitLab