Merge master into branch

nickpape-msft · nickpape-msft · commit e361b0116113 · 2017-02-07T17:20:15.000-08:00
diff --git a/common/changes/nickpape-export-log_2017-02-08-00-36.json b/common/changes/nickpape-export-log_2017-02-08-00-36.json
diff --git a/common/changes/nickpape-warnings-should-be-errors-in-production_2017-02-08-00-46.json b/common/changes/nickpape-warnings-should-be-errors-in-production_2017-02-08-00-46.json
@@ -0,0 +1,15 @@
+{
+  "changes": [
+    {
+      "packageName": "@microsoft/web-library-build",
+      "comment": "Treat warnings as errors in production. Treat tslint errors as warnings.",
+      "type": "minor"
+    },
+    {
+      "packageName": "@microsoft/node-library-build",
+      "comment": "Treat warnings as errors in production. Treat tsli nt errors as warnings.",
+      "type": "minor"
+    }
+  ],
+  "email": "nickpape@users.noreply.github.com"
+}
diff --git a/common/reviews/api/api-extractor.api.ts b/common/reviews/api/api-extractor.api.ts
@@ -49,6 +49,7 @@ class ApiJsonGenerator extends ApiItemVisitor {
 }
 
 class ExternalApiHelper {
+  // (undocumented)
   public static generateApiJson(rootDir: string, libFolder: string, externalPackageFilePath: string): void;
 }
 
diff --git a/common/reviews/api/gulp-core-build.api.ts b/common/reviews/api/gulp-core-build.api.ts
@@ -68,7 +68,6 @@ class GulpTask<TASK_CONFIG> implements IExecutable {
 // (undocumented)
 interface IBuildConfig {
   args?: {
-    // (undocumented)
     [ name: string ]: string | boolean
   }
   buildErrorIconPath?: string;
@@ -83,7 +82,6 @@ interface IBuildConfig {
   packageFolder?: string;
   production?: boolean;
   properties?: {
-    // (undocumented)
     [ key: string ]: any
   }
   relogIssues?: boolean;
@@ -98,7 +96,6 @@ interface IBuildConfig {
 
 interface ICopyConfig {
   copyTo: {
-    // (undocumented)
     [ destPath: string ]: string[];
   }
   shouldFlatten?: boolean;
diff --git a/gulp-core-build-karma/package.json b/gulp-core-build-karma/package.json
@@ -15,7 +15,7 @@
     "test": "gulp"
   },
   "dependencies": {
-    "@microsoft/gulp-core-build": ">=2.2.2 <3.0.0",
+    "@microsoft/gulp-core-build": ">=2.2.3 <3.0.0",
     "chai": "~3.5.0",
     "gulp": "~3.9.1",
     "gulp-karma": "~0.0.5",
diff --git a/gulp-core-build-mocha/package.json b/gulp-core-build-mocha/package.json
@@ -15,7 +15,7 @@
     "test": "gulp"
   },
   "dependencies": {
-    "@microsoft/gulp-core-build": ">=2.2.2 <3.0.0",
+    "@microsoft/gulp-core-build": ">=2.2.3 <3.0.0",
     "@types/es6-promise": "0.0.32",
     "@types/node": "^6.0.46",
     "gulp": "~3.9.1",
diff --git a/gulp-core-build-sass/package.json b/gulp-core-build-sass/package.json
@@ -15,7 +15,7 @@
     "test": "gulp"
   },
   "dependencies": {
-    "@microsoft/gulp-core-build": ">=2.2.2 <3.0.0",
+    "@microsoft/gulp-core-build": ">=2.2.3 <3.0.0",
     "@microsoft/load-themed-styles": "^1.2.2",
     "@types/es6-promise": "0.0.32",
     "@types/node": "^6.0.46",
diff --git a/gulp-core-build-serve/package.json b/gulp-core-build-serve/package.json
@@ -15,7 +15,7 @@
     "test": "gulp"
   },
   "dependencies": {
-    "@microsoft/gulp-core-build": ">=2.2.2 <3.0.0",
+    "@microsoft/gulp-core-build": ">=2.2.3 <3.0.0",
     "@types/es6-promise": "0.0.32",
     "@types/node": "^6.0.46",
     "deasync": "~0.1.7",
diff --git a/gulp-core-build-typescript/package.json b/gulp-core-build-typescript/package.json
@@ -15,7 +15,7 @@
     "test": "gulp"
   },
   "dependencies": {
-    "@microsoft/gulp-core-build": ">=2.2.2 <3.0.0",
+    "@microsoft/gulp-core-build": ">=2.2.3 <3.0.0",
     "@microsoft/api-extractor": ">=1.1.9 <2.0.0",
     "@types/es6-promise": "0.0.32",
     "@types/gulp": "^3.8.32",
diff --git a/gulp-core-build-webpack/package.json b/gulp-core-build-webpack/package.json
@@ -15,7 +15,7 @@
     "test": "gulp"
   },
   "dependencies": {
-    "@microsoft/gulp-core-build": ">=2.2.2 <3.0.0",
+    "@microsoft/gulp-core-build": ">=2.2.3 <3.0.0",
     "@types/es6-promise": "0.0.32",
     "@types/gulp": "^3.8.32",
     "@types/node": "^6.0.46",
diff --git a/gulp-core-build/CHANGELOG.json b/gulp-core-build/CHANGELOG.json
@@ -1,6 +1,18 @@
 {
   "name": "@microsoft/gulp-core-build",
   "entries": [
+    {
+      "version": "2.2.3",
+      "tag": "@microsoft/gulp-core-build_v2.2.3",
+      "date": "Wed, 08 Feb 2017 01:05:47 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Ensure the log function is exported"
+          }
+        ]
+      }
+    },
     {
       "version": "2.2.2",
       "tag": "@microsoft/gulp-core-build_v2.2.2",
diff --git a/gulp-core-build/CHANGELOG.md b/gulp-core-build/CHANGELOG.md
@@ -1,6 +1,13 @@
 # Change Log - @microsoft/gulp-core-build
 
-This log was last generated on Wed, 08 Feb 2017 00:23:01 GMT and should not be manually modified.
+This log was last generated on Wed, 08 Feb 2017 01:05:47 GMT and should not be manually modified.
+
+## 2.2.3
+Wed, 08 Feb 2017 01:05:47 GMT
+
+### Patches
+
+- Ensure the log function is exported
 
 ## 2.2.2
 Wed, 08 Feb 2017 00:23:01 GMT
diff --git a/gulp-core-build/package.json b/gulp-core-build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/gulp-core-build",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Core gulp build tasks for building typescript, html, less, etc.",
   "repository": {
     "type": "git",
diff --git a/node-library-build/package.json b/node-library-build/package.json
@@ -15,7 +15,7 @@
     "test": "gulp"
   },
   "dependencies": {
-    "@microsoft/gulp-core-build": ">=2.2.2 <3.0.0",
+    "@microsoft/gulp-core-build": ">=2.2.3 <3.0.0",
     "@microsoft/gulp-core-build-mocha": ">=2.0.0 <3.0.0",
     "@microsoft/gulp-core-build-typescript": ">=2.2.5 <3.0.0",
     "@types/es6-promise": "0.0.32",
diff --git a/node-library-build/src/index.ts b/node-library-build/src/index.ts
@@ -1,4 +1,4 @@
-import { task, watch, serial, parallel, IExecutable } from '@microsoft/gulp-core-build';
+import { task, watch, serial, parallel, IExecutable, setConfig } from '@microsoft/gulp-core-build';
 import { typescript, tslint, apiExtractor } from '@microsoft/gulp-core-build-typescript';
 import { instrument, mocha } from '@microsoft/gulp-core-build-mocha';
 
@@ -7,8 +7,18 @@ export * from '@microsoft/gulp-core-build-typescript';
 export * from '@microsoft/gulp-core-build-mocha';
 
 // Define default task groups.
-const buildSubtask: IExecutable = serial(parallel(tslint, typescript), apiExtractor);
 
+const PRODUCTION = process.argv.indexOf('--production') !== -1 || process.argv.indexOf('--ship') !== -1;
+setConfig({
+  production: PRODUCTION,
+  shouldWarningsFailBuild: PRODUCTION
+});
+
+tslint.mergeConfig({
+  displayAsWarning: true
+});
+
+const buildSubtask: IExecutable = serial(parallel(tslint, typescript), apiExtractor);
 export const buildTasks: IExecutable = task('build', buildSubtask);
 export const testTasks: IExecutable = task('test', serial(buildSubtask, mocha));
 export const defaultTasks: IExecutable = task('default', serial(buildSubtask, instrument, mocha));
diff --git a/web-library-build/package.json b/web-library-build/package.json
@@ -17,7 +17,7 @@
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "dependencies": {
-    "@microsoft/gulp-core-build": ">=2.2.2 <3.0.0",
+    "@microsoft/gulp-core-build": ">=2.2.3 <3.0.0",
     "@microsoft/gulp-core-build-karma": ">=2.1.3 <3.0.0",
     "@microsoft/gulp-core-build-sass": ">=2.0.4 <3.0.0",
     "@microsoft/gulp-core-build-serve": ">=2.0.3 <3.0.0",
diff --git a/web-library-build/src/index.ts b/web-library-build/src/index.ts
@@ -6,7 +6,9 @@ import {
   parallel,
   serial,
   task,
-  watch
+  watch,
+  setConfig,
+
 } from '@microsoft/gulp-core-build';
 import { apiExtractor, typescript, tslint, text } from '@microsoft/gulp-core-build-typescript';
 import { sass } from '@microsoft/gulp-core-build-sass';
@@ -34,6 +36,16 @@ const sourceMatch: string[] = [
   '!src/**/*.scss.ts'
 ];
 
+const PRODUCTION = process.argv.indexOf('--production') !== -1 || process.argv.indexOf('--ship') !== -1;
+setConfig({
+  production: PRODUCTION,
+  shouldWarningsFailBuild: PRODUCTION
+});
+
+tslint.mergeConfig({
+  displayAsWarning: true
+});
+
 // Define default task groups.
 export const compileTsTasks: IExecutable = parallel(typescript, text, apiExtractor);
 export const buildTasks: IExecutable = task('build', serial(preCopy, sass, compileTsTasks, postCopy));

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,7 @@ class ApiJsonGenerator extends ApiItemVisitor {`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`class ExternalApiHelper {`
	`52`	`+ // (undocumented)`
`52`	`53`	`public static generateApiJson(rootDir: string, libFolder: string, externalPackageFilePath: string): void;`
`53`	`54`	`}`
`54`	`55`