Skip to content

Commit e0a4a70

Browse files
authored
Merge pull request #8117 from IgniteUI/update-10-1
Typescript 4 support
2 parents f7ab347 + 969aee5 commit e0a4a70

29 files changed

+3225
-3281
lines changed

e2e/tsconfig.e2e.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "../tsconfig.base.json",
2+
"extends": "../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../out-tsc/app",
55
"module": "commonjs",

gulpfile.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ module.exports.copySchematics = (cb) => {
137137
const typedocBuildTheme = (cb) => {
138138
spawnSync(`typedoc`, [TYPEDOC.PROJECT_PATH,
139139
"--tsconfig",
140-
path.join(__dirname,"tsconfig.base.json")], { stdio: 'inherit', shell: true });
140+
path.join(__dirname,"tsconfig.json")], { stdio: 'inherit', shell: true });
141141
cb();
142142
};
143143
typedocBuildTheme.displayName = 'typedoc-build:theme';
@@ -187,7 +187,7 @@ function typedocBuildExportFn(cb) {
187187
"--tags",
188188
"--params",
189189
"--tsconfig",
190-
path.join(__dirname,"tsconfig.base.json")],
190+
path.join(__dirname,"tsconfig.json")],
191191
{ stdio: 'inherit', shell: true });
192192
cb();
193193
}
@@ -199,7 +199,7 @@ function typedocImportJsonFn(cb) {
199199
TYPEDOC.EXPORT_JSON_PATH,
200200
"--warns",
201201
"--tsconfig",
202-
path.join(__dirname,"tsconfig.base.json")],
202+
path.join(__dirname,"tsconfig.json")],
203203
{ stdio: 'inherit', shell: true});
204204
cb();
205205
}
@@ -225,7 +225,7 @@ function typedocBuildDocsJA (cb) {
225225
'--localize',
226226
'jp',
227227
"--tsconfig",
228-
path.join(__dirname,"tsconfig.base.json")], { stdio: 'inherit', shell: true });
228+
path.join(__dirname,"tsconfig.json")], { stdio: 'inherit', shell: true });
229229

230230
cb();
231231
}
@@ -236,7 +236,7 @@ function typedocBuildDocsEN (cb) {
236236
'--localize',
237237
'en',
238238
"--tsconfig",
239-
path.join(__dirname,"tsconfig.base.json")], { stdio: 'inherit', shell: true});
239+
path.join(__dirname,"tsconfig.json")], { stdio: 'inherit', shell: true});
240240

241241
cb();
242242
}

0 commit comments

Comments
 (0)