Polyfill Promise as needed (#911)

compulim · web-flow · commit 639f367e5028 · 2018-03-21T16:41:12.000-07:00
* Polyfill Promise as needed

* Add bluebird on Webpack only

* Separate polyfill build

* Use ES5 version for mock_dl
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,8 @@ webpacked
 built
 botchat.js
 botchat.js.map
+botchat-es5.js
+botchat-es5.js.map
 CognitiveServices.js
 CognitiveServices.js.map
 *.css
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
   - `nl-nl`, by [Mick Vleeshouwer](https://github.com/iMicknl) in [PR #821](https://github.com/Microsoft/BotFramework-WebChat/pull/821)
   - `pl-pl`, by [Peter Blazejewicz](https://github.com/peterblazejewicz) in [PR #813](https://github.com/Microsoft/BotFramework-WebChat/pull/813)
   - `zh-hans`, by [@Antimoney](https://github.com/Antimoney) in [PR #822](https://github.com/Microsoft/BotFramework-WebChat/pull/822) and [PR #823](https://github.com/Microsoft/BotFramework-WebChat/pull/823)
+- Promise polyfill with [bluebird](https://www.npmjs.com/package/bluebird) if needed in [#XXX](https://github.com/Microsoft/BotFramework-WebChat/pull/XXX)
 
 ### Changed
 - Update dependencies
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
   "license": "MIT",
   "dependencies": {
     "adaptivecards": "1.0.0",
+    "bluebird": "^3.5.1",
     "botframework-directlinejs": "0.9.13",
     "core-js": "2.4.1",
     "markdown-it": "8.3.1",
@@ -65,6 +66,8 @@
     "botchat.css",
     "botchat.js",
     "botchat.js.map",
+    "botchat-es5.js",
+    "botchat-es5.js.map",
     "CognitiveServices.js",
     "CognitiveServices.js.map"
   ]
diff --git a/src/BotChat.ts b/src/BotChat.ts
@@ -4,7 +4,3 @@ export * from 'botframework-directlinejs';
 export { queryParams } from './Attachment';
 export { SpeechOptions } from './SpeechOptions'
 export { Speech } from './SpeechModule'
-// below are shims for compatibility with old browsers (IE 10 being the main culprit)
-import 'core-js/modules/es6.string.starts-with';
-import 'core-js/modules/es6.array.find';
-import 'core-js/modules/es6.array.find-index';
diff --git a/src/BotChatWithPolyfill.ts b/src/BotChatWithPolyfill.ts
@@ -0,0 +1,11 @@
+export * from './BotChat';
+
+// below are shims for compatibility with old browsers (IE 10 being the main culprit)
+import 'core-js/modules/es6.string.starts-with';
+import 'core-js/modules/es6.array.find';
+import 'core-js/modules/es6.array.find-index';
+
+// Polyfill Promise if needed
+if (typeof (window as any).Promise === 'undefined') {
+  (window as any).Promise = require('bluebird');
+}
diff --git a/test/mock_dl/index.ts b/test/mock_dl/index.ts
@@ -361,6 +361,12 @@ app.get('/botchat.js', function (req, res) {
 app.get('/botchat.js.map', function (req, res) {
     res.sendFile(path.join(__dirname + "/../../botchat.js.map"));
 });
+app.get('/botchat-es5.js', function (req, res) {
+    res.sendFile(path.join(__dirname + "/../../botchat-es5.js"));
+});
+app.get('/botchat-es5.js.map', function (req, res) {
+    res.sendFile(path.join(__dirname + "/../../botchat-es5.js.map"));
+});
 app.get('/CognitiveServices.js', function (req, res) {
     res.sendFile(path.join(__dirname + "/../../CognitiveServices.js"));
 });
diff --git a/test/test.html b/test/test.html
@@ -50,7 +50,7 @@
   <body>
     <div id="BotChatGoesHere"></div>
 
-    <script src="botchat.js"></script>
+    <script src="botchat-es5.js"></script>
     <script src="mock_speech.js"></script>
     <script src="CognitiveServices.js"></script>
 
diff --git a/webpack.config.js b/webpack.config.js
@@ -1,7 +1,8 @@
-var webpack = require('webpack');
+const webpack = require('webpack');
+
 require("expose-loader");
 
-var coreConfig = {
+const coreConfig = {
     devtool: "source-map",
 
     resolve: {
@@ -12,7 +13,10 @@ var coreConfig = {
     module: {
         rules: [
             // All files with a '.ts' or '.tsx' extension will be handled by 'awesome-typescript-loader'.
-            { test: /\.tsx?$/, loader: "awesome-typescript-loader" },
+            {
+                test: /\.tsx?$/,
+                loader: "awesome-typescript-loader"
+            },
             // All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
             {
                 enforce: "pre",
@@ -28,7 +32,7 @@ var coreConfig = {
     }
 };
 
-var chatConfig = {
+const chatConfig = {
     entry: "./src/BotChat.ts",
     output: {
         libraryTarget: "umd",
@@ -37,8 +41,17 @@ var chatConfig = {
     }
 }
 
+const chatWithPolyfillConfig = {
+    entry: "./src/BotChatWithPolyfill.ts",
+    output: {
+        libraryTarget: "umd",
+        library: "BotChat",
+        filename: "./botchat-es5.js"
+    }
+}
+
 // Config for addon features
-var featureConfig = {
+const featureConfig = {
     entry: {
         CognitiveServices: "./src/CognitiveServices/lib.ts"
     },
@@ -49,4 +62,8 @@ var featureConfig = {
     }
 }
 
-module.exports = [Object.assign(chatConfig, coreConfig), Object.assign(featureConfig, coreConfig)];
+module.exports = [
+    Object.assign(chatConfig, coreConfig),
+    Object.assign(chatWithPolyfillConfig, coreConfig),
+    Object.assign(featureConfig, coreConfig)
+];
diff --git a/webpack.production.config.js b/webpack.production.config.js
@@ -1,14 +1,8 @@
-var webpack = require('webpack');
-require("expose-loader");
-
-var coreConfig = {
-    devtool: "source-map",
-
-    resolve: {
-        // Add '.ts' and '.tsx' as resolvable extensions.
-        extensions: [".ts", ".tsx", ".js", ".json"]
-    },
+const webpack = require('webpack');
+const webpackDevConfig = require('./webpack.config');
 
+module.exports = webpackDevConfig.map(config => ({
+    ...config,
     plugins: [
         new webpack.DefinePlugin({
             'process.env': {
@@ -22,49 +16,5 @@ var coreConfig = {
             sourceMap: true
         }),
         new webpack.optimize.OccurrenceOrderPlugin(),
-    ],
-
-    module: {
-        rules: [
-            // All files with a '.ts' or '.tsx' extension will be handled by 'awesome-typescript-loader'.
-            {
-                test: /\.tsx?$/,
-                loader: "awesome-typescript-loader"
-            },
-            // All output '.js' files will have any sourcemaps re-processed by 'source-map-loader'.
-            {
-                enforce: "pre",
-                test: /\.js$/,
-                loader: "source-map-loader",
-                exclude: [/node_modules/]
-            },
-            {
-                test: require.resolve('adaptivecards'),
-                use: [{ loader: 'expose-loader', options: 'AdaptiveCards' }]
-            }
-        ]
-    }
-};
-
-var chatConfig = {
-    entry: "./src/BotChat.ts",
-    output: {
-        libraryTarget: "umd",
-        library: "BotChat",
-        filename: "./botchat.js"
-    }
-}
-
-// Config for addon features
-var featureConfig = {
-    entry: {
-        CognitiveServices: "./src/CognitiveServices/lib.ts"
-    },
-    output: {
-        libraryTarget: "umd",
-        library: "[name]",
-        filename: "./[name].js",
-    }
-}
-
-module.exports = [Object.assign(chatConfig, coreConfig), Object.assign(featureConfig, coreConfig)];
+    ]
+}));
