Skip to content

Commit e4abcdd

Browse files
committed
Merge branch 'VDyulgerov/feature-startWeek-locale' of https://github.com/IgniteUI/igniteui-angular into VDyulgerov/feature-startWeek-locale
2 parents 6e14eb3 + 8b2eb1c commit e4abcdd

File tree

86 files changed

+1266
-1198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1266
-1198
lines changed

gulpfile.js

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const sassdoc = require('sassdoc');
1414
const path = require('path');
1515
const EventEmitter = require('events').EventEmitter;
1616
const { series } = require('gulp');
17-
const {spawnSync} = require('child_process');
17+
const { spawnSync } = require('child_process');
1818
const slash = require('slash');
1919

2020
const STYLES = {
@@ -136,9 +136,11 @@ module.exports.copySchematics = (cb) => {
136136
};
137137

138138
const typedocBuildTheme = (cb) => {
139-
spawnSync(`typedoc`, [TYPEDOC.PROJECT_PATH,
140-
"--tsconfig",
141-
path.join(__dirname,"tsconfig.typedoc.json")], { stdio: 'inherit', shell: true });
139+
spawnSync(`typedoc`, [
140+
TYPEDOC.PROJECT_PATH,
141+
"--tsconfig",
142+
path.join(__dirname, "tsconfig.typedoc.json")],
143+
{ stdio: 'inherit', shell: true });
142144
cb();
143145
};
144146
typedocBuildTheme.displayName = 'typedoc-build:theme';
@@ -168,9 +170,9 @@ function typedocWatchFunc(cb) {
168170
slash(path.join(TYPEDOC_THEME.SRC, 'assets', 'css', '/**/*.{scss,sass}')),
169171
slash(path.join(TYPEDOC_THEME.SRC, '/**/*.hbs')),
170172
slash(path.join(TYPEDOC_THEME.SRC, 'assets', 'images', '/**/*.{png,jpg,gif}')),
171-
], series(typedocBuildTheme, browserReload));
173+
], series(typedocBuildTheme, browserReload));
172174

173-
cb();
175+
cb();
174176
}
175177

176178

@@ -181,27 +183,29 @@ const TYPEDOC = {
181183
};
182184

183185
function typedocBuildExportFn(cb) {
184-
spawnSync('typedoc', [
186+
const childProcess = spawnSync('typedoc', [
185187
TYPEDOC.PROJECT_PATH,
186188
"--generate-json",
187189
TYPEDOC.EXPORT_JSON_PATH,
188190
"--tags",
189191
"--params",
190192
"--tsconfig",
191-
path.join(__dirname,"tsconfig.typedoc.json")],
193+
path.join(__dirname, "tsconfig.typedoc.json")],
192194
{ stdio: 'inherit', shell: true });
195+
process.exitCode = childProcess.status || 0;
193196
cb();
194197
}
195198

196199
function typedocImportJsonFn(cb) {
197-
spawnSync('typedoc', [
200+
const childProcess = spawnSync('typedoc', [
198201
TYPEDOC.PROJECT_PATH,
199202
"--generate-from-json",
200203
TYPEDOC.EXPORT_JSON_PATH,
201204
"--warns",
202205
"--tsconfig",
203-
path.join(__dirname,"tsconfig.typedoc.json")],
204-
{ stdio: 'inherit', shell: true});
206+
path.join(__dirname, "tsconfig.typedoc.json")],
207+
{ stdio: 'inherit', shell: true });
208+
process.exitCode = childProcess.status || 0;
205209
cb();
206210
}
207211

@@ -215,31 +219,31 @@ function cleanTypedocOutputDirFn(cb) {
215219
cb();
216220
}
217221

218-
function typedocBuildDocsJA (cb) {
219-
spawnSync('typedoc',[
220-
TYPEDOC.PROJECT_PATH,
221-
'--generate-from-json',
222-
slash(path.join(__dirname, 'i18nRepo', 'typedoc', 'ja')),
223-
'--templateStrings',
224-
TYPEDOC.TEMPLATE_STRINGS_PATH,
225-
'--warns',
226-
'--localize',
227-
'jp',
228-
"--tsconfig",
229-
path.join(__dirname,"tsconfig.typedoc.json")], { stdio: 'inherit', shell: true });
230-
231-
cb();
222+
function typedocBuildDocsJA(cb) {
223+
const childProcess = spawnSync('typedoc', [
224+
TYPEDOC.PROJECT_PATH,
225+
'--generate-from-json',
226+
slash(path.join(__dirname, 'i18nRepo', 'typedoc', 'ja')),
227+
'--templateStrings',
228+
TYPEDOC.TEMPLATE_STRINGS_PATH,
229+
'--warns',
230+
'--localize',
231+
'jp',
232+
"--tsconfig",
233+
path.join(__dirname, "tsconfig.typedoc.json")], { stdio: 'inherit', shell: true });
234+
process.exitCode = childProcess.status || 0;
235+
cb();
232236
}
233237

234-
function typedocBuildDocsEN (cb) {
235-
spawnSync('typedoc', [
236-
TYPEDOC.PROJECT_PATH,
237-
'--localize',
238-
'en',
239-
"--tsconfig",
240-
path.join(__dirname,"tsconfig.typedoc.json")], { stdio: 'inherit', shell: true});
241-
242-
cb();
238+
function typedocBuildDocsEN(cb) {
239+
const childProcess = spawnSync('typedoc', [
240+
TYPEDOC.PROJECT_PATH,
241+
'--localize',
242+
'en',
243+
"--tsconfig",
244+
path.join(__dirname, "tsconfig.typedoc.json")], { stdio: 'inherit', shell: true });
245+
process.exitCode = childProcess.status || 0;
246+
cb();
243247
}
244248

245249
const SASSDOC = {
@@ -271,7 +275,7 @@ function sassdocBuildJson(cb) {
271275
function sassdocImportJson(cb) {
272276
const options = JSON.parse(fs.readFileSync(SASSDOC.OPTIONS, 'utf8'));
273277

274-
const {render, importDir} = argv;
278+
const { render, importDir } = argv;
275279

276280
options.render = render;
277281
options.json_dir = importDir;
@@ -283,7 +287,7 @@ function sassdocImportJson(cb) {
283287
cb();
284288
}
285289

286-
function sassdocBuildJA (cb) {
290+
function sassdocBuildJA(cb) {
287291
const pathTranslations = path.join(__dirname, 'i18nRepo', 'sassdoc', 'ja');
288292
const options = JSON.parse(fs.readFileSync(SASSDOC.OPTIONS, 'utf8'));
289293

@@ -298,7 +302,7 @@ function sassdocBuildJA (cb) {
298302
cb();
299303
}
300304

301-
function sassdocBuildEN (cb) {
305+
function sassdocBuildEN(cb) {
302306
const options = JSON.parse(fs.readFileSync(SASSDOC.OPTIONS, 'utf8'));
303307

304308
options.lang = 'en';

0 commit comments

Comments
 (0)