diff --git a/package.json b/package.json index 4e1b195b2f0ad9ca4be93f2b0273d06819c510f0..971bacb9a1a9f4fde888e6e7302fc8ba98fd46d8 100644 --- a/package.json +++ b/package.json @@ -9,25 +9,25 @@ "module": "build/index.js", "dependencies": {}, "devDependencies": { - "@types/jasmine": "2.5.47", - "@types/node": "6.0.46", - "jasmine": "2.6.0", - "jasmine-core": "2.5.2", + "@types/jasmine": "2.6.0", + "@types/node": "8.0.28", + "jasmine": "2.8.0", + "jasmine-core": "2.8.0", "jasmine-node": "1.14.5", - "karma": "1.3.0", - "karma-chrome-launcher": "2.0.0", - "karma-jasmine": "1.0.2", + "karma": "1.7.1", + "karma-chrome-launcher": "2.2.0", + "karma-jasmine": "1.1.0", "karma-jasmine-html-reporter": "0.2.2", "karma-requirejs": "1.1.0", - "karma-typescript-preprocessor": "0.3.0", - "requirejs": "2.3.2", - "tslint": "3.15.1", - "typescript": "2.0.3" + "karma-typescript-preprocessor": "0.3.1", + "requirejs": "2.3.5", + "tslint": "5.7.0", + "typescript": "2.5.2" }, "scripts": { "build": "./node_modules/typescript/bin/tsc --p src/tsconfig.app.json", "buildspec": "./node_modules/typescript/bin/tsc --p spec/tsconfig.spec.json", - "jasmine": "./node_modules/.bin/jasmine", + "jasmine": "npm run buildspec && ./node_modules/.bin/jasmine", "karma": "./node_modules/typescript/bin/tsc --p spec/tsconfig.spec.json && ./node_modules/karma/bin/karma start", "lint": "./node_modules/tslint/bin/tslint", "viz": "tsviz -recursive src/ jalhyd_class_diagram.png", diff --git a/spec/tsconfig.spec.json b/spec/tsconfig.spec.json index e4dd293248da9879ea2970dd62d2ace4a9c75a51..5ce23c667a28850cbef329d45012843197183b51 100644 --- a/spec/tsconfig.spec.json +++ b/spec/tsconfig.spec.json @@ -1,15 +1,5 @@ { "extends": "../tsconfig.json", - "compilerOptions": { - "outDir": "../build" -// "types": [ -// // "jasmine", -// "node" // les paquets listés dans types LIMITENT les includes à ces paquets -// ] - }, - // "files": [ - // "test.ts" - // ], "include": [ "../src/**/*.ts", "../spec/**/*.ts"