From 2942657e47b8abce770ab7b8ce536396d9adb979 Mon Sep 17 00:00:00 2001 From: Basarat Syed Date: Mon, 5 Oct 2015 17:03:45 +1100 Subject: [PATCH 1/3] minor : missing files --- src/demo/tsconfig.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/demo/tsconfig.json b/src/demo/tsconfig.json index d200e54..2ac1880 100644 --- a/src/demo/tsconfig.json +++ b/src/demo/tsconfig.json @@ -16,8 +16,10 @@ }, "files": [ "../../typings/flux/flux.d.ts", + "../../typings/jasmine/jasmine.d.ts", "../../typings/node/node.d.ts", "../../typings/react/react.d.ts", + "../../typings/tsd.d.ts", "actions/ModuleActions.ts", "constants/action-types/ModuleActionTypes.ts", "dependencies.ts", From 67df6cbd3078ecdae1ca2fca7355ef1fe2d2e3a5 Mon Sep 17 00:00:00 2001 From: Basarat Syed Date: Mon, 5 Oct 2015 17:04:04 +1100 Subject: [PATCH 2/3] I don't trust your version :) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b4ce60..4c2ceb1 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "phantomjs": "^1.9.17", "react": "^0.13.3", "tsify": "^0.11.11", - "typescript": "^1.6.0-beta", + "typescript": "latest", "vinyl-source-stream": "^1.1.0", "watchify": "^3.3.1" } From 2c60355e749664539fb4de1767693eebffda4e37 Mon Sep 17 00:00:00 2001 From: Basarat Syed Date: Mon, 5 Oct 2015 17:08:31 +1100 Subject: [PATCH 3/3] Main code * Fix https://github.com/TypeStrong/tsify/issues/84 * Require typescript workaround for https://github.com/TypeStrong/tsify/issues/85 * Ask browserify to transform the output file --- gulp/browserify.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gulp/browserify.js b/gulp/browserify.js index 8cbbfd3..3405d1a 100644 --- a/gulp/browserify.js +++ b/gulp/browserify.js @@ -10,6 +10,7 @@ var uglify = require('gulp-uglify'); var streamify = require('gulp-streamify'); var notify = require('gulp-notify'); var gutil = require('gulp-util'); +var ts = require('typescript'); var src = ['./src/demo/main.ts', './typings/react/react.d.ts', './typings/flux/flux.d.ts', './typings/node/node.d.ts']; var dest = './dist/scripts'; @@ -20,15 +21,18 @@ var dependencies = [ 'babel/polyfill' ]; +var tsOptions = require(__dirname + '/../src/demo/tsconfig.json').compilerOptions; +tsOptions.typescript = ts; + function bundle(options) { var appBundler = browserify({ entries: src, - transform: [babelify.configure({ sourceMaps: false, stage: 3 })], debug: options.isDevelopment, cache: {}, packageCache: {}, fullPaths: options.isDevelopment }) .external(dependencies) - .plugin(tsify); + .plugin(tsify,tsOptions) + .transform(babelify.configure({ sourceMaps: false, stage: 3, extensions:['.js','.jsx','.ts','.tsx'] })); var vendorsBundler = browserify({ debug: options.isDevelopment,