Skip to content

Commit f8e0f2f

Browse files
committed
fix - errors due to typescript default changes
- `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
1 parent 1a72188 commit f8e0f2f

File tree

9 files changed

+36
-31
lines changed

9 files changed

+36
-31
lines changed

gulpfile.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import * as gulp from "gulp";
1+
import gulp from "gulp";
22
import * as tasks from "./tasks/";
33
import config from "./gulpfile.config";
44

npm-scripts/gulp-tasks.js

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ let tsClientProject = typescript.createProject({
1717
target: "es6",
1818
jsx: "preserve",
1919
isolatedModules: true,
20+
moduleResolution: "node",
21+
allowSyntheticDefaultImports: true,
2022
});
2123

2224
gulp.task("build", [], function () {

tasks/build/css/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import { Gulp } from "gulp";
22
import { GulpTask, GulpBuildTask } from "../../../gulpfile.types";
33
import { GulpConfig } from "../../../gulpfile.config.types";
44

5-
import * as sass from "gulp-sass";
6-
import * as sourcemaps from "gulp-sourcemaps";
7-
import * as autoprefixer from "gulp-autoprefixer";
8-
import * as size from "gulp-size";
9-
import * as chalk from "chalk";
5+
import sass from "gulp-sass";
6+
import sourcemaps from "gulp-sourcemaps";
7+
import autoprefixer from "gulp-autoprefixer";
8+
import size from "gulp-size";
9+
import chalk from "chalk";
1010

1111
export let generateTask = (gulp: Gulp, config: GulpConfig): GulpBuildTask => {
1212
let gulpTask = new GulpBuildTask();

tasks/build/html/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Gulp } from "gulp";
22
import { GulpTask, GulpBuildTask } from "../../../gulpfile.types";
33
import { GulpConfig } from "../../../gulpfile.config.types";
4-
import * as size from "gulp-size";
5-
import * as chalk from "chalk";
4+
import size from "gulp-size";
5+
import chalk from "chalk";
66

77
export let generateTask = (gulp: Gulp, config: GulpConfig): GulpBuildTask => {
88
let gulpTask = new GulpBuildTask();

tasks/build/js/client/build/index.ts

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
"use strict";
22
import { Gulp } from "gulp";
3-
import * as size from "gulp-size";
4-
import * as sourcemap from "gulp-sourcemaps";
5-
import source = require("vinyl-source-stream");
3+
import size from "gulp-size";
4+
import sourcemap from "gulp-sourcemaps";
5+
import source from "vinyl-source-stream";
6+
import glob from "glob";
7+
import chalk from "chalk";
8+
import browserify from "browserify";
9+
import path from "path";
10+
import _ from "lodash";
11+
612
import { GulpTask, GulpBuildTask } from "../../../../../gulpfile.types";
713
import { GulpConfig } from "../../../../../gulpfile.config.types";
8-
import * as glob from "glob";
9-
import * as chalk from "chalk";
10-
import * as browserify from "browserify";
11-
import * as path from "path";
12-
import * as _ from "lodash";
1314

1415
let watchify: {(instance: Browserify.BrowserifyObject): Browserify.BrowserifyObject} = require("watchify");
1516
let buffer = require("gulp-buffer");

tasks/build/js/client/lib/index.ts

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
"use strict";
22
import { Gulp } from "gulp";
3-
import * as size from "gulp-size";
4-
import source = require("vinyl-source-stream");
3+
import size from "gulp-size";
4+
import source from "vinyl-source-stream";
5+
import glob from "glob";
6+
import chalk from "chalk";
7+
import browserify from "browserify";
8+
import path from "path";
9+
import ts from "typescript";
10+
import _ from "lodash";
511
import { GulpTask, GulpBuildTask } from "../../../../../gulpfile.types";
612
import { GulpConfig } from "../../../../../gulpfile.config.types";
7-
import * as glob from "glob";
8-
import * as chalk from "chalk";
9-
import * as browserify from "browserify";
10-
import * as path from "path";
11-
import * as ts from "typescript";
12-
import * as _ from "lodash";
1313

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

tasks/build/js/client/transpile/index.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { Gulp } from "gulp";
22
import { GulpTask, GulpBuildTask } from "../../../../../gulpfile.types";
33
import { GulpConfig } from "../../../../../gulpfile.config.types";
4-
import * as changed from "gulp-changed";
5-
import * as typescript from "gulp-typescript";
6-
import * as babel from "gulp-babel";
7-
import * as size from "gulp-size";
8-
import * as _ from "lodash";
4+
import changed from "gulp-changed";
5+
import typescript from "gulp-typescript";
6+
import babel from "gulp-babel";
7+
import size from "gulp-size";
8+
import _ from "lodash";
99
let rename = require("gulp-rename");
1010

1111
export let generateTask = (gulp: Gulp, config: GulpConfig): GulpBuildTask => {

tasks/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ export let generateTask = (gulp: Gulp, config: GulpConfig): GulpTask => {
1010
gulpTask.addChildTask(buildTask.generateTask(gulp, config));
1111
gulpTask.addChildTask(serveTask.generateTask(gulp, config));
1212
return gulpTask;
13-
}
13+
};

tsconfig.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
"rewriteTsconfig": true
3636
},
3737
"compilerOptions": {
38-
"target": "es6"
38+
"target": "es6",
39+
"module": "es6",
40+
"allowSyntheticDefaultImports": true
3941
}
4042
}

0 commit comments

Comments
 (0)