Merge pull request #42 from RobotlegsJS/tsconfig

Update TypeScript Compiler Options

Author: tiagoschenkel

.gitignore

@@ -1,15 +1,16 @@
 .idea
-build
-dev
+.nyc_output
+coverage
+dist
+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

@@ -1,10 +1,12 @@
 /.idea
+/.nyc_output
 /.vscode
 /coverage
-/dev
 /dist
+/dist-test
 /docs
-/lib/test
+/example
+/lib-test
 /not-ported-extensions
 /src
 /test
@@ -14,23 +16,18 @@ 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
 tslint.test.json
-typings.json
 webpack.config.js
+webpack.example.config.js
 yarn.lock
-.codeclimate.yml
 .editorconfig
-.eslintignore
-.eslintrc
 .gitignore
 .istanbul.yml
 .npmignore
 .prettierrc
 .publishrc
-.travis.yml
+.travis.yml

CHANGELOG.md

@@ -22,7 +22,9 @@
 
 - Use `rimraf` instead of `rm -rf` (see #36).
 
-- Update TypeScript Compiler Options (see #38).
+- Update TypeScript Compiler Options (see #38, #42).
+
+- Use [tslib](https://github.com/Microsoft/tslib) library to avoid duplicated declarations (see #42).
 
 - Enforce TSLint rules (see #39).
 

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 = (config) => {
+module.exports = config => {
 
   var configuration = {
     basePath: "",
@@ -18,6 +16,8 @@ module.exports = (config) => {
       "es6-shim"
     ],
     files: [
+      { pattern: "node_modules/reflect-metadata/Reflect.js", include: true },
+      { pattern: "node_modules/bluebird/js/browser/bluebird.js", include: true },
       { pattern: "node_modules/phaser-ce/build/phaser.js", include: true },
       { pattern: "./test/**/**/**.test.ts", include: true },
       { pattern: '**/*.map', served: true, included: false, watched: true }
@@ -34,12 +34,12 @@ module.exports = (config) => {
       "karma-webpack",
       "karma-sourcemap-writer",
       "karma-sourcemap-loader",
+      "karma-remap-istanbul",
       "karma-mocha-reporter",
       "karma-mocha",
       "karma-chai",
       "karma-sinon",
       "karma-es6-shim",
-      "karma-remap-istanbul",
       "karma-coverage-istanbul-reporter"
     ],
     reporters: (
@@ -66,10 +66,10 @@ module.exports = (config) => {
   };
 
   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,9 +13,11 @@
     "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 && rimraf dev",
-    "compile:src": "tsc -d",
-    "compile:test": "tsc -p tsconfig.test.json -d",
+    "clean-up": "rimraf .nyc_output && rimraf coverage && rimraf lib && rimraf lib-test && rimraf dist && 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:src",
     "prepublishOnly": "publish-please guard",
     "publish-please": "npm run tslint && npm run autoformat && npm run clean-up && npm run test && publish-please"
@@ -44,7 +46,8 @@
   "homepage": "https://github.com/RobotlegsJS/RobotlegsJS-Phaser-SignalCommandMap#readme",
   "dependencies": {
     "@robotlegsjs/core": "^0.1.3",
-    "phaser-ce": "^2.11.0"
+    "phaser-ce": "^2.11.0",
+    "tslib": "^1.9.3"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.23",
@@ -88,6 +91,7 @@
     "tslint-config-prettier": "^1.14.0",
     "typescript": "^2.9.2",
     "webpack": "^4.16.3",
+    "webpack-cli": "^3.1.0",
     "webpack-dev-server": "^3.1.5"
   },
   "peerDependencies": {

test/entry.ts

@@ -5,6 +5,8 @@
 //  in accordance with the terms of the license agreement accompanying it.
 // ------------------------------------------------------------------------------
 
+/// <reference types="mocha" />
+
 import "reflect-metadata";
 import "bluebird/js/browser/bluebird";
 import "es6-symbol/implement";

tsconfig.json

@@ -2,17 +2,24 @@
   "compilerOptions": {
     "outDir": "lib",
     "target": "es5",
-    "lib": ["es6", "dom"],
+    "lib": ["es7", "dom"],
+    "types": ["reflect-metadata"],
+    "sourceMap": true,
+    "inlineSources": true,
     "module": "commonjs",
     "moduleResolution": "node",
-    "declaration": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
+    "removeComments": false,
+    "strict": false,
     "noImplicitAny": true,
-    "noUnusedParameters": false,
+    "strictNullChecks": false,
+    "noImplicitThis": false,
+    "alwaysStrict": true,
     "noUnusedLocals": true,
-    "removeComments": true,
-    "sourceMap": false
+    "noUnusedParameters": false,
+    "noImplicitReturns": true,
+    "noFallthroughCasesInSwitch": true
   },
   "include": [
     "./src/**/*.ts"

tsconfig.test.json

@@ -1,24 +1,10 @@
 {
+  "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "lib",
-    "target": "es5",
-    "lib": ["es6", "dom"],
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "declaration": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "noImplicitAny": true,
-    "noUnusedParameters": false,
-    "noUnusedLocals": true,
-    "removeComments": true,
-    "sourceMap": true
+    "outDir": "lib-test"
   },
   "include": [
     "./src/**/*.ts",
     "./test/**/*.ts"
-  ],
-  "files": [
-    "./node_modules/phaser-ce/typescript/phaser.d.ts"
   ]
 }

webpack.config.js

@@ -1,18 +1,19 @@
-const webpack = require('webpack');
-const path = require('path');
-const UglifyJSPlugin = require('uglifyjs-webpack-plugin');
+const webpack = require("webpack");
+const path = require("path");
+const UglifyJsPlugin = require("uglifyjs-webpack-plugin");
 
-module.exports = (env) => {
+module.exports = env => {
 
   if (!env) env = { production: false, karma: false };
 
   let mode = env.production ? "production" : "development";
   let tsconfig = !env.karma ? "tsconfig.json" : "tsconfig.test.json";
-  let output = env.production ? "dist" : "dev";
+  let output = env.production ? "dist" : "dist-test";
   let filename = env.production ? "robotlegs-phaser-signalcommandmap.min.js" : "robotlegs-phaser-signalcommandmap.js";
 
   return {
     mode: mode,
+
     entry: {
       main: path.join(__dirname, "src/index.ts")
     },
@@ -48,12 +49,32 @@ module.exports = (env) => {
 
     plugins: (
       (env.production)
-        ? [ new UglifyJSPlugin() ]
+        ? []
         : [ new webpack.SourceMapDevToolPlugin({ test: /\.ts$/i }) ]
     ),
 
+    optimization:
+      (env.production)
+        ? {
+            concatenateModules: true,
+            minimize: true,
+            minimizer: [
+              new UglifyJsPlugin({
+                cache: true,
+                parallel: 4,
+                uglifyOptions: {
+                  output: {
+                    comments: false
+                  }
+                }
+              })
+            ]
+          }
+        : {}
+    ,
+
     resolve: {
-      extensions: ['.ts', '.js', '.json']
+      extensions: [".ts", ".js", ".json"]
     }
   }
 };