Skip to content

Commit 37f87fb

Browse files
iclantoniclanton
committed
Updating build rigs.
1 parent 236d803 commit 37f87fb

File tree

4 files changed

+11
-88
lines changed

4 files changed

+11
-88
lines changed

‎common/reviews/api/node-library-build.api.ts‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,6 @@ interface IExecutable {
166166
onRegister?: () => void;
167167
}
168168

169-
// @public (undocumented)
170-
interface IFixupSettingsOptions {
171-
// (undocumented)
172-
mustBeCommonJsOrEsnext: boolean;
173-
}
174-
175169
// @alpha
176170
interface IJestConfig {
177171
cache?: boolean;
@@ -195,12 +189,6 @@ interface ITscCmdTaskConfig extends IBaseCmdTaskConfig {
195189
staticMatch?: string[];
196190
}
197191

198-
// @public (undocumented)
199-
interface ITsConfigFile<T> {
200-
// (undocumented)
201-
compilerOptions: T;
202-
}
203-
204192
// @public (undocumented)
205193
interface ITslintCmdTaskConfig extends IBaseCmdTaskConfig {
206194
customArgs?: string[];
@@ -285,28 +273,6 @@ class TslintCmdTask extends BaseCmdTask<ITslintCmdTaskConfig> {
285273
loadSchema(): Object;
286274
}
287275

288-
// @public
289-
class TypeScriptConfiguration {
290-
static fixupSettings(compilerOptions: ts.Settings, logWarning: (msg: string) => void, options?: Partial<IFixupSettingsOptions>): void;
291-
static getGulpTypescriptOptions(buildConfig: IBuildConfig): ITsConfigFile<ts.Settings>;
292-
static getTsConfigFile(config: IBuildConfig): ITsConfigFile<ts.Settings>;
293-
static getTypescriptCompiler(): any;
294-
static setBaseConfig(config: ITsConfigFile<ts.Settings>): void;
295-
static setTypescriptCompiler(typescriptOverride: any): void;
296-
}
297-
298-
// @public (undocumented)
299-
class TypeScriptTask extends GulpTask<ITypeScriptTaskConfig> {
300-
constructor();
301-
// (undocumented)
302-
executeTask(gulp: gulpType.Gulp, completeCallback: (error?: string) => void): void;
303-
// (undocumented)
304-
getCleanMatch(buildConfig: IBuildConfig, taskConfig?: ITypeScriptTaskConfig): string[];
305-
// (undocumented)
306-
loadSchema(): Object;
307-
mergeConfig(config: ITypeScriptTaskConfig): void;
308-
}
309-
310276
// @public
311277
class ValidateShrinkwrapTask extends GulpTask<void> {
312278
constructor();
@@ -331,13 +297,9 @@ export function watch(watchMatch: string | string[], taskExecutable: IExecutable
331297
// WARNING: Unsupported export: clean
332298
// WARNING: Unsupported export: copyStaticAssets
333299
// WARNING: Unsupported export: jest
334-
// WARNING: Unsupported export: typescript
335-
// WARNING: Unsupported export: tslint
336-
// WARNING: Unsupported export: text
337-
// WARNING: Unsupported export: removeTripleSlash
338300
// WARNING: Unsupported export: tscCmd
339301
// WARNING: Unsupported export: tslintCmd
340-
// WARNING: Unsupported export: apiExtractorStandalone
302+
// WARNING: Unsupported export: apiExtractor
341303
// WARNING: Unsupported export: instrument
342304
// WARNING: Unsupported export: mocha
343305
// (No @packagedocumentation comment for this package)

‎common/reviews/api/web-library-build.api.ts‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -166,12 +166,6 @@ interface IExecutable {
166166
onRegister?: () => void;
167167
}
168168

169-
// @public (undocumented)
170-
interface IFixupSettingsOptions {
171-
// (undocumented)
172-
mustBeCommonJsOrEsnext: boolean;
173-
}
174-
175169
// @alpha
176170
interface IJestConfig {
177171
cache?: boolean;
@@ -195,12 +189,6 @@ interface ITscCmdTaskConfig extends IBaseCmdTaskConfig {
195189
staticMatch?: string[];
196190
}
197191

198-
// @public (undocumented)
199-
interface ITsConfigFile<T> {
200-
// (undocumented)
201-
compilerOptions: T;
202-
}
203-
204192
// @public (undocumented)
205193
interface ITslintCmdTaskConfig extends IBaseCmdTaskConfig {
206194
customArgs?: string[];
@@ -300,28 +288,6 @@ class TslintCmdTask extends BaseCmdTask<ITslintCmdTaskConfig> {
300288
loadSchema(): Object;
301289
}
302290

303-
// @public
304-
class TypeScriptConfiguration {
305-
static fixupSettings(compilerOptions: ts.Settings, logWarning: (msg: string) => void, options?: Partial<IFixupSettingsOptions>): void;
306-
static getGulpTypescriptOptions(buildConfig: IBuildConfig): ITsConfigFile<ts.Settings>;
307-
static getTsConfigFile(config: IBuildConfig): ITsConfigFile<ts.Settings>;
308-
static getTypescriptCompiler(): any;
309-
static setBaseConfig(config: ITsConfigFile<ts.Settings>): void;
310-
static setTypescriptCompiler(typescriptOverride: any): void;
311-
}
312-
313-
// @public (undocumented)
314-
class TypeScriptTask extends GulpTask<ITypeScriptTaskConfig> {
315-
constructor();
316-
// (undocumented)
317-
executeTask(gulp: gulpType.Gulp, completeCallback: (error?: string) => void): void;
318-
// (undocumented)
319-
getCleanMatch(buildConfig: IBuildConfig, taskConfig?: ITypeScriptTaskConfig): string[];
320-
// (undocumented)
321-
loadSchema(): Object;
322-
mergeConfig(config: ITypeScriptTaskConfig): void;
323-
}
324-
325291
// @public
326292
class ValidateShrinkwrapTask extends GulpTask<void> {
327293
constructor();
@@ -352,7 +318,6 @@ class WebpackTask<TExtendedConfig = {}> extends GulpTask<IWebpackTaskConfig & TE
352318

353319
// WARNING: Unsupported export: preCopy
354320
// WARNING: Unsupported export: postCopy
355-
// WARNING: Unsupported export: compileTsTasks
356321
// WARNING: Unsupported export: buildTasks
357322
// WARNING: Unsupported export: bundleTasks
358323
// WARNING: Unsupported export: testTasks
@@ -364,10 +329,6 @@ class WebpackTask<TExtendedConfig = {}> extends GulpTask<IWebpackTaskConfig & TE
364329
// WARNING: Unsupported export: clean
365330
// WARNING: Unsupported export: copyStaticAssets
366331
// WARNING: Unsupported export: jest
367-
// WARNING: Unsupported export: typescript
368-
// WARNING: Unsupported export: tslint
369-
// WARNING: Unsupported export: text
370-
// WARNING: Unsupported export: removeTripleSlash
371332
// WARNING: Unsupported export: tscCmd
372333
// WARNING: Unsupported export: tslintCmd
373334
// WARNING: Unsupported export: apiExtractor

‎core-build/node-library-build/gulpfile.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
'use strict';
22

33
let build = require('@microsoft/gulp-core-build');
4-
let apiExtractorStandalone = require('@microsoft/gulp-core-build-typescript').apiExtractorStandalone;
4+
let apiExtractor = require('@microsoft/gulp-core-build-typescript').apiExtractor;
55
let tsc = require('@microsoft/gulp-core-build-typescript').tscCmd;
66
let mocha = require('@microsoft/gulp-core-build-mocha');
77

88
build.setConfig({
99
shouldWarningsFailBuild: build.getConfig().production
1010
});
1111

12-
build.task('default', build.serial(tsc, apiExtractorStandalone));
12+
build.task('default', build.serial(tsc, apiExtractor, mocha));
1313

1414
build.initialize(require('gulp'));
1515

‎core-build/web-library-build/src/index.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
setConfig,
1515
getConfig
1616
} from '@microsoft/gulp-core-build';
17-
import { apiExtractor, tscCmd, tslintCmd, text } from '@microsoft/gulp-core-build-typescript';
17+
import { apiExtractor, tscCmd, tslintCmd } from '@microsoft/gulp-core-build-typescript';
1818
import { sass } from '@microsoft/gulp-core-build-sass';
1919
import { karma } from '@microsoft/gulp-core-build-karma';
2020
import { webpack } from '@microsoft/gulp-core-build-webpack';
@@ -48,10 +48,9 @@ setConfig({
4848
});
4949

5050
// Define default task groups.
51-
export const compileTsTasks: IExecutable = parallel(tscCmd, text);
5251
export const buildTasks: IExecutable = task(
5352
'build',
54-
serial(preCopy, sass, parallel(tslintCmd, compileTsTasks), apiExtractor, postCopy)
53+
serial(preCopy, sass, parallel(tslintCmd, tscCmd), apiExtractor, postCopy)
5554
);
5655
export const bundleTasks: IExecutable = task('bundle', serial(buildTasks, webpack));
5756
export const testTasks: IExecutable = task('test', serial(buildTasks, karma, jest));
@@ -67,11 +66,12 @@ task('test-watch', watch(sourceMatch, testTasks));
6766
// For watch scenarios like serve, make sure to exclude generated files from src (like *.scss.ts.)
6867
task('serve',
6968
serial(
70-
serve,
71-
watch(
72-
sourceMatch, serial(preCopy, sass, compileTsTasks,
73-
postCopy, webpack, postProcessSourceMapsTask, reload)
74-
))
69+
serve,
70+
watch(
71+
sourceMatch,
72+
serial(preCopy, sass, tscCmd, postCopy, webpack, postProcessSourceMapsTask, reload)
73+
)
74+
)
7575
);
7676

7777
task('default', defaultTasks);

0 commit comments

Comments
 (0)