Explorar o código

Fixing gulp tsc

gulp tsc is not defining which typescript version to use.
At the moment babylon only supports version 1.0.1 due to small changes
in the lib.d.ts in newer ts versions.
Raanan Weber %!s(int64=11) %!d(string=hai) anos
pai
achega
e7d498166e
Modificáronse 2 ficheiros con 18 adicións e 10 borrados
  1. 15 9
      Tools/Gulp/gulpfile.js
  2. 3 1
      Tools/Gulp/package.json

+ 15 - 9
Tools/Gulp/gulpfile.js

@@ -3,8 +3,10 @@ var gulp = require('gulp'),
     rename = require('gulp-rename'),
     rename = require('gulp-rename'),
     concat = require('gulp-concat'),
     concat = require('gulp-concat'),
     clean = require('gulp-clean'),
     clean = require('gulp-clean'),
-    typescript = require('gulp-tsc'),
-    shaders = require('./gulp-shaders')
+    typescript = require('gulp-typescript'),
+	sourcemaps = require('gulp-sourcemaps'),
+	merge = require('merge2'),
+    shaders = require('./gulp-shaders'),
     gulpFilter = require('gulp-filter');
     gulpFilter = require('gulp-filter');
 
 
 /**
 /**
@@ -23,7 +25,8 @@ gulp.task('shaders', function() {
 gulp.task('typescript-to-js', function() {
 gulp.task('typescript-to-js', function() {
   //Compile all ts file into their respective js file.
   //Compile all ts file into their respective js file.
   return gulp.src(['../../Babylon/**/*.ts','../../References/**/*.d.ts'])
   return gulp.src(['../../Babylon/**/*.ts','../../References/**/*.d.ts'])
-    .pipe(typescript({ target: 'ES5', sourcemap: true }))
+	.pipe(sourcemaps.init())
+    .pipe(typescript({ noExternalResolve: true, target: 'ES5'}))
     .pipe(gulp.dest('../../Babylon/'));
     .pipe(gulp.dest('../../Babylon/'));
 });
 });
 
 
@@ -31,13 +34,16 @@ gulp.task('typescript-to-js', function() {
  * Compile the declaration file babylon.d.ts
  * Compile the declaration file babylon.d.ts
  */
  */
 gulp.task('typescript-declaration', function() {
 gulp.task('typescript-declaration', function() {
-  var declarationFilter = gulpFilter('**/*.d.ts');
+	
+	var tsResult = gulp.src(['../../Babylon/**/*.ts','../../References/**/*.d.ts'])
+                       .pipe(typescript({
+                           declarationFiles: true,
+                           noExternalResolve: true,
+						   target: 'ES5'
+                       }));
 
 
-  return gulp.src(['../../Babylon/**/*.ts','../../References/**/*.d.ts'])
-    .pipe(typescript({ target: 'ES5', declaration: true, out: 'tmp.js' }))
-    .pipe(declarationFilter)
-    .pipe(rename('babylon.d.ts'))
-    .pipe(gulp.dest('build/'));
+    return tsResult.dts.pipe(concat('babylon.d.ts'))
+	.pipe(gulp.dest('build/'));
 });
 });
 
 
 /**
 /**

+ 3 - 1
Tools/Gulp/package.json

@@ -5,11 +5,13 @@
   "main": "",
   "main": "",
   "devDependencies": {
   "devDependencies": {
     "gulp": "^3.6.2",
     "gulp": "^3.6.2",
+	"typescript": "1.3.0",
     "gulp-clean": "^0.3.0",
     "gulp-clean": "^0.3.0",
     "gulp-concat": "^2.2.0",
     "gulp-concat": "^2.2.0",
     "gulp-filter": "^0.4.1",
     "gulp-filter": "^0.4.1",
     "gulp-rename": "^1.2.0",
     "gulp-rename": "^1.2.0",
-    "gulp-tsc": "^0.9.2",
+	"gulp-typescript" : "2.0.0",
+	"gulp-sourcemaps" : "",
     "gulp-uglify": "^0.3.0",
     "gulp-uglify": "^0.3.0",
     "gulp-util": "^2.2.14",
     "gulp-util": "^2.2.14",
     "through": "^2.3.4"
     "through": "^2.3.4"