Skip to content

Commit

Permalink
fix - errors due to typescript default changes
Browse files Browse the repository at this point in the history
- `default` export became a requirement recently.  Most typescript library definitions have not been updated with a `default`.  So a flag `allowSyntheticDefaultImports` was added to typescript to ignore errors related to this issue.
- See microsoft/TypeScript#5285
  • Loading branch information
micnigh committed Feb 4, 2016
1 parent 1a72188 commit f8e0f2f
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 31 deletions.
2 changes: 1 addition & 1 deletion gulpfile.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import * as gulp from "gulp";
import gulp from "gulp";
import * as tasks from "./tasks/";
import config from "./gulpfile.config";

Expand Down
2 changes: 2 additions & 0 deletions npm-scripts/gulp-tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ let tsClientProject = typescript.createProject({
target: "es6",
jsx: "preserve",
isolatedModules: true,
moduleResolution: "node",
allowSyntheticDefaultImports: true,
});

gulp.task("build", [], function () {
Expand Down
10 changes: 5 additions & 5 deletions tasks/build/css/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ import { Gulp } from "gulp";
import { GulpTask, GulpBuildTask } from "../../../gulpfile.types";
import { GulpConfig } from "../../../gulpfile.config.types";

import * as sass from "gulp-sass";
import * as sourcemaps from "gulp-sourcemaps";
import * as autoprefixer from "gulp-autoprefixer";
import * as size from "gulp-size";
import * as chalk from "chalk";
import sass from "gulp-sass";
import sourcemaps from "gulp-sourcemaps";
import autoprefixer from "gulp-autoprefixer";
import size from "gulp-size";
import chalk from "chalk";

export let generateTask = (gulp: Gulp, config: GulpConfig): GulpBuildTask => {
let gulpTask = new GulpBuildTask();
Expand Down
4 changes: 2 additions & 2 deletions tasks/build/html/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Gulp } from "gulp";
import { GulpTask, GulpBuildTask } from "../../../gulpfile.types";
import { GulpConfig } from "../../../gulpfile.config.types";
import * as size from "gulp-size";
import * as chalk from "chalk";
import size from "gulp-size";
import chalk from "chalk";

export let generateTask = (gulp: Gulp, config: GulpConfig): GulpBuildTask => {
let gulpTask = new GulpBuildTask();
Expand Down
17 changes: 9 additions & 8 deletions tasks/build/js/client/build/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
"use strict";
import { Gulp } from "gulp";
import * as size from "gulp-size";
import * as sourcemap from "gulp-sourcemaps";
import source = require("vinyl-source-stream");
import size from "gulp-size";
import sourcemap from "gulp-sourcemaps";
import source from "vinyl-source-stream";
import glob from "glob";
import chalk from "chalk";
import browserify from "browserify";
import path from "path";
import _ from "lodash";

import { GulpTask, GulpBuildTask } from "../../../../../gulpfile.types";
import { GulpConfig } from "../../../../../gulpfile.config.types";
import * as glob from "glob";
import * as chalk from "chalk";
import * as browserify from "browserify";
import * as path from "path";
import * as _ from "lodash";

let watchify: {(instance: Browserify.BrowserifyObject): Browserify.BrowserifyObject} = require("watchify");
let buffer = require("gulp-buffer");
Expand Down
16 changes: 8 additions & 8 deletions tasks/build/js/client/lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
"use strict";
import { Gulp } from "gulp";
import * as size from "gulp-size";
import source = require("vinyl-source-stream");
import size from "gulp-size";
import source from "vinyl-source-stream";
import glob from "glob";
import chalk from "chalk";
import browserify from "browserify";
import path from "path";
import ts from "typescript";
import _ from "lodash";
import { GulpTask, GulpBuildTask } from "../../../../../gulpfile.types";
import { GulpConfig } from "../../../../../gulpfile.config.types";
import * as glob from "glob";
import * as chalk from "chalk";
import * as browserify from "browserify";
import * as path from "path";
import * as ts from "typescript";
import * as _ from "lodash";

import { browserifyBuild, BrowserifyBuildOptions } from "../build/";

Expand Down
10 changes: 5 additions & 5 deletions tasks/build/js/client/transpile/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Gulp } from "gulp";
import { GulpTask, GulpBuildTask } from "../../../../../gulpfile.types";
import { GulpConfig } from "../../../../../gulpfile.config.types";
import * as changed from "gulp-changed";
import * as typescript from "gulp-typescript";
import * as babel from "gulp-babel";
import * as size from "gulp-size";
import * as _ from "lodash";
import changed from "gulp-changed";
import typescript from "gulp-typescript";
import babel from "gulp-babel";
import size from "gulp-size";
import _ from "lodash";
let rename = require("gulp-rename");

export let generateTask = (gulp: Gulp, config: GulpConfig): GulpBuildTask => {
Expand Down
2 changes: 1 addition & 1 deletion tasks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ export let generateTask = (gulp: Gulp, config: GulpConfig): GulpTask => {
gulpTask.addChildTask(buildTask.generateTask(gulp, config));
gulpTask.addChildTask(serveTask.generateTask(gulp, config));
return gulpTask;
}
};
4 changes: 3 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
"rewriteTsconfig": true
},
"compilerOptions": {
"target": "es6"
"target": "es6",
"module": "es6",
"allowSyntheticDefaultImports": true
}
}

0 comments on commit f8e0f2f

Please sign in to comment.