Skip to content

Commit 94034c0

Browse files
authored
Merge branch 'master' into dpetev/identifier-migrations
2 parents a1668ba + d8f6829 commit 94034c0

File tree

288 files changed

+5374
-1263
lines changed

Some content is hidden

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

288 files changed

+5374
-1263
lines changed

gulpfile.js

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ const argv = require('yargs').argv;
1313
const sassdoc = require('sassdoc');
1414
const path = require('path');
1515
const EventEmitter = require('events').EventEmitter;
16-
const typedocGulp = require('igniteui-typedoc-theme/gulpfile');
17-
const sassdocGulp = require('igniteui-sassdoc-theme/gulpfile');
1816
const { series } = require('gulp');
1917
const {spawnSync} = require('child_process');
2018
const slash = require('slash');
@@ -136,10 +134,10 @@ module.exports.copySchematics = (cb) => {
136134
cb();
137135
};
138136

139-
const typedocBuildTheme = series(typedocGulp.typedocBuild, (cb) => {
137+
const typedocBuildTheme = (cb) => {
140138
spawnSync(`typedoc`, [TYPEDOC.PROJECT_PATH], { stdio: 'inherit', shell: true });
141139
cb();
142-
});
140+
};
143141
typedocBuildTheme.displayName = 'typedoc-build:theme';
144142

145143
const browserReload = (cb) => {
@@ -167,7 +165,7 @@ function typedocWatchFunc(cb) {
167165
slash(path.join(TYPEDOC_THEME.SRC, 'assets', 'css', '/**/*.{scss,sass}')),
168166
slash(path.join(TYPEDOC_THEME.SRC, '/**/*.hbs')),
169167
slash(path.join(TYPEDOC_THEME.SRC, 'assets', 'images', '/**/*.{png,jpg,gif}')),
170-
], series(typedocGulp.typedocBuild, typedocBuildTheme, browserReload));
168+
], series(typedocBuildTheme, browserReload));
171169

172170
cb();
173171
}
@@ -234,8 +232,6 @@ const sassdocCleanOutputDir = (cb) => {
234232
cb();
235233
}
236234

237-
module.exports.sassdocDevMode = sassdocGulp.develop;
238-
239235
function sassdocBuildJson(cb) {
240236
const options = JSON.parse(fs.readFileSync(SASSDOC.OPTIONS, 'utf8'));
241237

@@ -301,20 +297,18 @@ module.exports.createDocsOutputDir = createDocsOutputDirFn;
301297
module.exports.exportTypedocJson = typedocBuildExportFn;
302298
module.exports.cleanTypedocOutputDir = cleanTypedocOutputDirFn;
303299
module.exports.typedocBuildTheme = typedocBuildTheme;
304-
module.exports.importTypedocJson = series(typedocGulp.typedocBuild, typedocImportJsonFn);
300+
module.exports.importTypedocJson = typedocImportJsonFn;
305301
module.exports.typedocServe = series(
306302
typedocBuildTheme,
307303
typedocWatchFunc,
308304
typedocServe
309305
);
310306
module.exports.typedocBuildDocsJA = series(
311-
typedocGulp.typedocBuild,
312307
this.createDocsOutputDir,
313308
this.cleanTypedocOutputDir,
314309
typedocBuildDocsJA
315310
);
316311
module.exports.typedocBuildDocsEN = series(
317-
typedocGulp.typedocBuild,
318312
this.createDocsOutputDir,
319313
this.cleanTypedocOutputDir,
320314
typedocBuildDocsEN
@@ -326,5 +320,5 @@ module.exports.typedocBuildDocsEN = series(
326320
module.exports.sassdocCleanOutputDir = sassdocCleanOutputDir;
327321
module.exports.sassdocImportJson = sassdocImportJson;
328322
module.exports.sassdocBuildJson = sassdocBuildJson;
329-
module.exports.sassdocBuildJA = series(sassdocCleanOutputDir, sassdocGulp.sassdocBuild, sassdocBuildJA);
330-
module.exports.sassdocBuildEN = series(sassdocCleanOutputDir, sassdocGulp.sassdocBuild, sassdocBuildEN);
323+
module.exports.sassdocBuildJA = series(sassdocCleanOutputDir, sassdocBuildJA);
324+
module.exports.sassdocBuildEN = series(sassdocCleanOutputDir, sassdocBuildEN);

0 commit comments

Comments
 (0)