Adding tslib dependency to remove redundant code. (#1942)

* Updating all packages to use tslib. * Updating dependencies.
microsoft · Jun 6, 2017 · 1820479 · 1820479
1 parent 1a785e3
commit 1820479
Show file tree

Hide file tree

Showing 30 changed files with 174 additions and 59 deletions.
diff --git a/apps/component-demo/package.json b/apps/component-demo/package.json
@@ -28,6 +28,7 @@
     "office-ui-fabric-react": ">=1.5.5 <2.0.0",
     "react": ">=15.3.2 <16.0.0",
     "react-dom": ">=15.3.2 <16.0.0",
+    "tslib": "^1.6.0",
     "typescript": "2.2.2"
   }
 }
diff --git a/apps/component-demo/tsconfig.json b/apps/component-demo/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "experimentalDecorators": true,
     "noEmitOnError": true,
+    "importHelpers": true,
     "moduleResolution": "node",
     "types": [
       "chai",

diff --git a/apps/fabric-website/gulpfile.js b/apps/fabric-website/gulpfile.js
@@ -24,8 +24,9 @@ let rules = Object.assign(
 );
 build.tslint.setConfig({
   lintConfig: { rules },
-  sourceMatch: ['src/**/*.ts', 'src/**/*.tsx', '!src/**/*.scss.tsx']
+  displayAsWarning: false
 });
+
 // TODO: remove this! There are a number of lint errors to fix.
 build.tslint.isEnabled = () => false;
 

diff --git a/apps/fabric-website/package.json b/apps/fabric-website/package.json
@@ -48,11 +48,12 @@
   },
   "dependencies": {
     "@uifabric/example-app-base": "2.1.0",
+    "@uifabric/utilities": ">=4.1.0 <5.0.0",
     "color-functions": "1.1.0",
     "json-loader": "^0.5.4",
     "load-themed-styles": "^1.1.0",
     "office-ui-fabric-core": ">=7.0.0 <8.0.0",
     "office-ui-fabric-react": ">=4.3.1 <5.0.0",
-    "@uifabric/utilities": ">=4.1.0 <5.0.0"
+    "tslib": "^1.6.0"
   }
 }
diff --git a/apps/fabric-website/tsconfig.json b/apps/fabric-website/tsconfig.json
@@ -7,6 +7,7 @@
     "declaration": true,
     "sourceMap": true,
     "experimentalDecorators": true,
+    "importHelpers": true,
     "moduleResolution": "node",
     "types": [
       "chai",

diff --git a/apps/ssr-tests/package.json b/apps/ssr-tests/package.json
@@ -34,6 +34,7 @@
     "webpack-node-externals": "^1.5.4"
   },
   "dependencies": {
-    "es6-promise": "^4.1.0"
+    "es6-promise": "^4.1.0",
+    "tslib": "^1.6.0"
   }
 }
diff --git a/apps/test-bundle-button/package.json b/apps/test-bundle-button/package.json
@@ -33,6 +33,7 @@
   "dependencies": {
     "react": "^0.14 || ^15.0.1-0 || ^16.0.0-0",
     "react-dom": "^0.14 || ^15.0.1-0 || ^16.0.0-0",
-    "office-ui-fabric-react": ">=4.3.0 <5.0.0"
+    "office-ui-fabric-react": ">=4.3.0 <5.0.0",
+    "tslib": "^1.6.0"
   }
 }
diff --git a/apps/test-bundle-button/tsconfig.json b/apps/test-bundle-button/tsconfig.json
@@ -7,6 +7,7 @@
     "declaration": true,
     "sourceMap": true,
     "experimentalDecorators": true,
+    "importHelpers": true,
     "moduleResolution": "node",
     "types": [
       "webpack-env"

diff --git a/apps/todo-app/package.json b/apps/todo-app/package.json
@@ -29,6 +29,7 @@
     "office-ui-fabric-react": ">=4.3.0 <5.0.0",
     "react": "^15.4.2",
     "react-dom": "^15.4.2",
-    "typescript": "2.2.2"
+    "typescript": "2.2.2",
+    "tslib": "^1.6.0"
   }
 }
diff --git a/common/changes/@uifabric/example-app-base/tslib-fix_2017-06-06-05-19.json b/common/changes/@uifabric/example-app-base/tslib-fix_2017-06-06-05-19.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/example-app-base",
+      "comment": "Adding tslib dependency to reduce re",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/example-app-base",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@uifabric/styling/tslib-fix_2017-06-06-05-19.json b/common/changes/@uifabric/styling/tslib-fix_2017-06-06-05-19.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/styling",
+      "comment": "Adding tslib dependency to reduce re",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/styling",
+  "email": "[email protected]"
+}
diff --git a/common/changes/@uifabric/utilities/tslib-fix_2017-06-06-05-19.json b/common/changes/@uifabric/utilities/tslib-fix_2017-06-06-05-19.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/utilities",
+      "comment": "Adding tslib dependency to reduce re",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/utilities",
+  "email": "[email protected]"
+}
diff --git a/common/changes/office-ui-fabric-react/tslib-fix_2017-06-06-05-19.json b/common/changes/office-ui-fabric-react/tslib-fix_2017-06-06-05-19.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "office-ui-fabric-react",
+      "comment": "Adding tslib dependency to reduce redundant code.",
+      "type": "patch"
+    }
+  ],
+  "packageName": "office-ui-fabric-react",
+  "email": "[email protected]"
+}
diff --git a/common/config/rush/npm-shrinkwrap.json b/common/config/rush/npm-shrinkwrap.json
diff --git a/packages/example-app-base/gulpfile.js b/packages/example-app-base/gulpfile.js
@@ -14,7 +14,10 @@ let rules = Object.assign(
   require('./node_modules/office-ui-fabric-react-tslint/tslint.json').rules,
   require('./tslint.json').rules
 );
-build.tslint.setConfig({ lintConfig: { rules } });
+build.tslint.setConfig({
+  lintConfig: { rules },
+  displayAsWarning: false
+});
 
 // Configure TypeScript.
 build.TypeScriptConfiguration.setTypescriptCompiler(require('typescript'));

diff --git a/packages/example-app-base/package.json b/packages/example-app-base/package.json
@@ -44,6 +44,7 @@
     "@uifabric/utilities": ">=4.1.0 <5.0.0",
     "highlight.js": "^9.9.0",
     "office-ui-fabric-core": ">=7.0.0 <8.0.0",
-    "office-ui-fabric-react": ">=2.0.0 <3.0.0"
+    "office-ui-fabric-react": ">=2.0.0 <3.0.0",
+    "tslib": "^1.6.0"
   }
 }
diff --git a/packages/example-app-base/tsconfig.json b/packages/example-app-base/tsconfig.json
@@ -6,6 +6,7 @@
     "declaration": true,
     "sourceMap": true,
     "experimentalDecorators": true,
+    "importHelpers": true,
     "moduleResolution": "node",
     "lib": [
       "es2017",

diff --git a/packages/example-component/gulpfile.js b/packages/example-component/gulpfile.js
@@ -11,7 +11,10 @@ let rules = Object.assign(
   require('./node_modules/office-ui-fabric-react-tslint/tslint.json').rules,
   require('./tslint.json').rules
 );
-build.tslint.setConfig({ lintConfig: { rules } });
+build.tslint.setConfig({
+  lintConfig: { rules },
+  displayAsWarning: false
+});
 
 // Use css modules.
 build.sass.setConfig({

diff --git a/packages/example-component/package.json b/packages/example-component/package.json
@@ -49,6 +49,7 @@
     "react-dom": "^0.14 || ^15.4.2 || ^16.0.0-0"
   },
   "dependencies": {
-    "office-ui-fabric-react": ">=4.3.1 <5.0.0"
+    "office-ui-fabric-react": ">=4.3.1 <5.0.0",
+    "tslib": "^1.6.0"
   }
 }
diff --git a/packages/example-component/tsconfig.json b/packages/example-component/tsconfig.json
@@ -6,6 +6,7 @@
     "noImplicitAny": false,
     "strictNullChecks": true,
     "experimentalDecorators": true,
+    "importHelpers": true,
     "moduleResolution": "node",
     "sourceMap": true,
     "jsx": "react",

diff --git a/packages/office-ui-fabric-react/gulpfile.js b/packages/office-ui-fabric-react/gulpfile.js
@@ -49,7 +49,10 @@ let rules = Object.assign(
   require('./node_modules/office-ui-fabric-react-tslint/tslint.json').rules,
   require('./tslint.json').rules
 );
-build.tslint.setConfig({ lintConfig: { rules } });
+build.tslint.setConfig({
+  lintConfig: { rules },
+  displayAsWarning: false
+});
 
 // Configure TypeScript.
 // build.typescript.setConfig({ typescript: require('typescript') });

diff --git a/packages/office-ui-fabric-react/package.json b/packages/office-ui-fabric-react/package.json
@@ -73,7 +73,8 @@
     "@microsoft/load-themed-styles": "^1.2.2",
     "@uifabric/utilities": ">=4.1.0 <5.0.0",
     "@uifabric/styling": ">=0.5.0 <1.0.0",
-    "prop-types": "^15.5.10"
+    "prop-types": "^15.5.10",
+    "tslib": "^1.6.0"
   },
   "peerDependencies": {
     "react": "^0.14.9 || ^15.0.1-0 || ^16.0.0-0",

diff --git a/packages/office-ui-fabric-react/tsconfig.json b/packages/office-ui-fabric-react/tsconfig.json
@@ -7,6 +7,7 @@
     "declaration": true,
     "sourceMap": true,
     "experimentalDecorators": true,
+    "importHelpers": true,
     "moduleResolution": "node",
     "lib": [
       "es2017",

diff --git a/packages/styling/gulpfile.js b/packages/styling/gulpfile.js
@@ -1,7 +1,12 @@
 'use strict';
 
 let build = require('@microsoft/sp-build-web');
+let path = require('path');
 let gulp = require('gulp');
+let buildConfig = build.getConfig();
+
+let isProduction = process.argv.indexOf('--production') >= 0;
+let isClean = process.argv.indexOf('clean') >= 0;
 
 // initialize tasks.
 build.initialize(gulp);
@@ -16,13 +21,25 @@ let rules = Object.assign(
   require('./node_modules/office-ui-fabric-react-tslint/tslint.json').rules,
   require('./tslint.json').rules
 );
-build.tslint.setConfig({ lintConfig: { rules } });
+build.tslint.setConfig({
+  lintConfig: { rules },
+  displayAsWarning: false
+});
 
 // Disable all unnecessary tasks.
 build.sass.isEnabled = () => false;
 build.karma.isEnabled = () => false;
 build.text.isEnabled = () => false;
 build.preCopy.isEnabled = () => false;
 
+let packageFolder = buildConfig.packageFolder || '';
+let distFolder = buildConfig.distFolder;
+
+if (isProduction || isClean) {
+  build.setConfig({
+    libAMDFolder: path.join(packageFolder, 'lib-amd')
+  });
+}
+
 // Until typings work.
 build.apiExtractor.isEnabled = () => false;
diff --git a/packages/styling/package.json b/packages/styling/package.json
@@ -35,7 +35,6 @@
     "react-dom": "^15.4.2",
     "source-map-loader": "^0.2.1",
     "ts-loader": "^2.1.0",
-    "tslib": "^1.6.0",
     "typescript": "2.2.2",
     "uglifyjs-webpack-plugin": "^0.4.3",
     "webpack": "^2.4.1",
@@ -47,7 +46,8 @@
   "dependencies": {
     "@microsoft/load-themed-styles": "^1.2.2",
     "@uifabric/utilities": ">=4.1.0 <5.0.0",
-    "glamor": "^2.20.24",
-    "rtl-css-js": "^1.1.0"
+    "tslib": "^1.6.0",
+    "rtl-css-js": "^1.1.0",
+    "glamor": "^2.20.24"
   }
 }