Merge pull request #64 from RobotlegsJS/tsconfig

Update TypeScript Compiler Options

Author: tiagoschenkel

.gitignore

@@ -1,16 +1,16 @@
 .idea
 .nyc_output
-build
-dev
+coverage
+dist/lib
+dist-test
 lib
+lib-test
 node_modules
-typings
-coverage
-inversify.d.ts
 *.as
 *.iml
 src/**/*.js
 src/**/*.js.map
 test/**/*.js
 test/**/*.js.map
 npm-debug.log
+yarn-error.log

.npmignore

@@ -2,10 +2,10 @@
 /.nyc_output
 /.vscode
 /coverage
-/dev
 /dist
+/dist-test
 /docs
-/lib/test
+/lib-test
 /not-ported-extensions
 /src
 /test
@@ -15,22 +15,17 @@ CODE_OF_CONDUCT.md
 CONTRIBUTING.md
 ISSUE_TEMPLATE.md
 PULL_REQUEST_TEMPLATE.md
-bower.json
 karma.conf.js
 tsconfig.json
 tsconfig.test.json
-tsfmt.json
 tslint.json
-typings.json
+tslint.test.json
 webpack.config.js
 yarn.lock
-.codeclimate.yml
 .editorconfig
-.eslintignore
-.eslintrc
 .gitignore
 .istanbul.yml
 .npmignore
 .prettierrc
 .publishrc
-.travis.yml
+.travis.yml

CHANGELOG.md

@@ -18,7 +18,9 @@
 
 ### v0.1.1
 
-- Update TypeScript Compiler Options (see #55).
+- Update TypeScript Compiler Options (see #55, $64).
+
+- Use [tslib](https://github.com/Microsoft/tslib) library to avoid duplicated declarations (see #64).
 
 - Enforce TSLint rules (see #54).
 

karma.conf.js

@@ -1,13 +1,11 @@
 process.env.TEST = true;
-process.env.NODE_ENV = 'test';
+process.env.NODE_ENV = "test";
 
-const webpack = require("webpack");
-const path = require("path");
-const webpackConfig = require('./webpack.config.js')({ production: false, karma: true });
+const webpackConfig = require("./webpack.config.js")({ production: false, karma: true });
 
 delete webpackConfig.entry;
 
-module.exports = function(config) {
+module.exports = config => {
 
   var configuration = {
     basePath: "",
@@ -18,13 +16,10 @@ module.exports = function(config) {
       "es6-shim"
     ],
     files: [
-      "./test/**/**/**.test.ts",
-      {
-        pattern: '**/*.map',
-        served: true,
-        included: false,
-        watched: true
-      }
+      { pattern: "node_modules/reflect-metadata/Reflect.js", include: true },
+      { pattern: "node_modules/bluebird/js/browser/bluebird.js", include: true },
+      { pattern: "./test/**/**/**.test.ts", include: true },
+      { pattern: '**/*.map', served: true, included: false, watched: true }
     ],
     preprocessors: {
       "./**/**/**/**.ts": ["sourcemap"],
@@ -65,14 +60,14 @@ module.exports = function(config) {
     colors: true,
     logLevel: config.LOG_INFO,
     autoWatch: true,
-    browsers: ['Chrome']
+    browsers: []
   };
 
   if (process.env.TRAVIS) {
-    configuration.browsers = ['PhantomJS'];
+    configuration.browsers.push("PhantomJS");
     configuration.plugins.push("karma-phantomjs-launcher");
   } else {
-    configuration.browsers = ['PhantomJS'];
+    configuration.browsers.push("PhantomJS");
     configuration.plugins.push("karma-phantomjs-launcher");
   }
 

package.json

@@ -13,11 +13,12 @@
     "tslint:src": "tslint --project tsconfig.json",
     "tslint:test": "tslint --config tslint.test.json --project tsconfig.test.json",
     "tslint": "npm run tslint-check:src && npm run tslint-check:test && npm run tslint:src && npm run tslint:test",
-    "clean-up": "rimraf .nyc_output && rimraf coverage && rimraf lib",
-    "compile": "tsc -d",
+    "clean-up": "rimraf .nyc_output && rimraf coverage && rimraf lib && rimraf lib-test && rimraf dist-test",
+    "compile:src": "tsc -d --importHelpers",
+    "compile:test": "tsc -p tsconfig.test.json -d --importHelpers",
     "dev": "webpack",
     "build": "webpack --env.production",
-    "prepare": "npm run clean-up && npm run compile",
+    "prepare": "npm run clean-up && npm run compile:src",
     "prepublishOnly": "publish-please guard",
     "publish-please": "npm run tslint && npm run autoformat && npm run clean-up && npm run test && publish-please"
   },
@@ -83,7 +84,6 @@
     "istanbul-instrumenter-loader": "^3.0.1",
     "karma": "^2.0.5",
     "karma-chai": "^0.1.0",
-    "karma-chai-sinon": "^0.1.5",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage-istanbul-reporter": "^2.0.1",
     "karma-es6-shim": "^1.0.0",
@@ -92,6 +92,7 @@
     "karma-phantomjs-launcher": "^1.0.4",
     "karma-remap-istanbul": "^0.6.0",
     "karma-sinon": "^1.0.5",
+    "karma-sinon-chai": "^2.0.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-sourcemap-writer": "^0.1.2",
     "karma-webpack": "^3.0.0",

test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMap.test.ts

@@ -5,7 +5,7 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
-import "../../../../../entry.ts";
+import "../../../../../entry";
 
 import { assert } from "chai";
 

test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandMapIntegration.test.ts

@@ -5,7 +5,7 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
-import "../../../../../entry.ts";
+import "../../../../../entry";
 
 import { assert } from "chai";
 

test/robotlegs/bender/extensions/signalCommandMap/impl/signalCommandTrigger.test.ts

@@ -5,7 +5,7 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
-import "../../../../../entry.ts";
+import "../../../../../entry";
 
 import sinon = require("sinon");
 

test/robotlegs/bender/extensions/signalCommandMap/signalCommandMapExtension.test.ts

@@ -5,7 +5,7 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
-import "../../../../entry.ts";
+import "../../../../entry";
 
 import { assert } from "chai";
 

test/robotlegs/bender/extensions/signalCommandMap/support/CascadingCommand.ts

@@ -20,9 +20,11 @@ export class CascadingCommand implements ICommand {
     @named("executeCallback")
     public callback: Function;
 
-    @inject(IInjector) public injector: IInjector;
+    @inject(IInjector)
+    public injector: IInjector;
 
-    @inject(ISignalCommandMap) public signalCommandMap: ISignalCommandMap;
+    @inject(ISignalCommandMap)
+    public signalCommandMap: ISignalCommandMap;
 
     public execute(): void {
         this.callback();