Merge pull request #131 from w0o/master

dpopp07 · web-flow · commit 6f82b701aece · 2019-06-12T14:47:29.000-05:00
chore: Removed dependency and bundling with bower
diff --git a/.eslintignore b/.eslintignore
@@ -2,6 +2,6 @@ node_modules/
 dist/
 doc/
 examples/static/watson-speech.js
-examples/static/bower_components/
+examples/static/scripts/
 examples/node_modules/
 examples/static/webpack-bundle.js
diff --git a/.gitignore b/.gitignore
@@ -9,9 +9,9 @@ doc/
 *-auth.json
 .env
 examples/static/webpack-bundle.js
+examples/static/scripts/
 examples/node_modules/
 dist/*.js
 dist/*.map
-examples/static/bower_components/
 gh-pages/
 .idea
diff --git a/examples/.bowerrc b/examples/.bowerrc
diff --git a/examples/.cfignore b/examples/.cfignore
@@ -1,3 +1,2 @@
 node_modules/
 keys/
-static/bower_components/
diff --git a/examples/bower.json b/examples/bower.json
diff --git a/examples/package-lock.json b/examples/package-lock.json
diff --git a/examples/package.json b/examples/package.json
@@ -4,28 +4,27 @@
   "description": "Examples showing the IBM Watson Speech Javascript SDK in action.",
   "scripts": {
     "start": "node server.js",
-    "postinstall": "bower install",
+    "postinstall": "./scripts/postinstall.sh",
     "dev": "../scripts/run-dev.sh && node server.js"
   },
   "cacheDirectories": [
-    "node_modules",
-    "static/bower_components"
+    "node_modules"
   ],
   "dependencies": {
-    "bower": "^1.8.8",
     "defaults": "^1.0.3",
     "dotenv": "^6.2.0",
     "express": "^4.13.3",
     "express-browserify": "^1.0.3",
     "express-rate-limit": "^2.6.0",
     "express-secure-only": "^0.2.1",
+    "jquery": "^3.4.1",
     "object.assign": "^4.0.4",
     "vcap_services": "^0.4.0",
     "watson-developer-cloud": "3.18.1",
     "watson-speech": "*",
     "webpack": "^3.5.5",
     "webpack-dev-middleware": "^1.10.0",
-    "whatwg-fetch": "^2.0.2"
+    "whatwg-fetch": "^3.0.0"
   },
   "engines": {
     "node": ">=4"
diff --git a/examples/readme.md b/examples/readme.md
@@ -12,13 +12,12 @@ Prerequisite
 
 * IBM Watson Speech to Text service credentials - see [Service credentials for Watson services](https://www.ibm.com/watson/developercloud/doc/common/getting-started-credentials.html)
 * Node.js OR Python
-* [Bower](https://bower.io/) for installing client-side dependencies
 
 
 Setup - Node.js
 ---------------
 
-1. `cd` into the `examples/` directory and run `npm install` to grab dependencies (this automatically runs `bower install`)
+1. `cd` into the `examples/` directory and run `npm install` to grab dependencies (this automatically runs `postinstall` that also puts the dependencies into place)
 2. edit `tts-token.js` and `stt-token.js` to include your service credentials (or create a `.env` file)
 3. run `npm start`
 4. Open your browser to http://localhost:3000/ to see the examples.
@@ -28,7 +27,7 @@ Setup - Python
 --------------
 
 1. `cd` into the `examples/` directory and run `pip install watson_developer_cloud flask python-dotenv pyopenssl` (or `easy_install...`) to install python dependencies.
-2. run `bower install` to install client-side dependencies
+2. run `./scripts/postinstall.sh` to install client-side dependencies
 3. edit `server.py` to include your service credentials (or create a `.env` file)
 4. run `python server.py`
 5. Open your browser to http://localhost:5000/ to see the examples.
@@ -39,7 +38,7 @@ Notes
 
 * The examples all use [fetch](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API) (a modern promise-based replacement for XMLHttpRequest) to retrieve auth tokens. Most supported browsers include a native fetch implementation, but a pollyfill is included in the top-level module for older browsers.
 * The examples use a Node.js server to generate tokens. It doesn't have to be written in Node.js, but *some server-side token generator is required*. The SDK will not accept your service credentials directly, and you can not use them to generate a token client-side. SDKs are available for [Node.js](https://github.com/watson-developer-cloud/node-sdk#authorization), [Java](https://github.com/watson-developer-cloud/java-sdk), [Python](https://github.com/watson-developer-cloud/python-sdk/blob/master/examples/authorization_v1.py), and there is a [REST API](https://www.ibm.com/watson/developercloud/doc/common/getting-started-tokens.html) for use with other languages (or `curl`).
-* The Speech SDK may be used in browserify, Webpack, or as a standalone library. Most of the examples use the standalone version either installed via bower or symlinked to the root directory when developing locally.
+* The Speech SDK may be used in browserify, Webpack, or as a standalone library. Most of the examples use the standalone version either installed via NPM or symlinked to the root directory when developing locally.
 
 
 More Examples
diff --git a/examples/scripts/postinstall.sh b/examples/scripts/postinstall.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+mkdir -p static/scripts/fetch/dist && cp -r node_modules/whatwg-fetch/dist/* "$_"
+mkdir -p static/scripts/jquery/dist && cp -r node_modules/jquery/dist/* "$_"
+mkdir -p static/scripts/watson-speech && cp -r node_modules/watson-speech/dist "$_"
diff --git a/examples/static/browserify-app.js b/examples/static/browserify-app.js
@@ -4,6 +4,7 @@
 
 // global window.fetch pollyfill for IE/Edge & Older Chrome/FireFox
 require('whatwg-fetch');
+require('jquery');
 
 // keep the bundle slim by only requiring the necessary modules
 var recognizeMicrophone = require('watson-speech/speech-to-text/recognize-microphone');
diff --git a/examples/static/file-ajax.html b/examples/static/file-ajax.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
   <div id="output">--</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 <pre><code><script style="display: block;">
diff --git a/examples/static/file-upload.html b/examples/static/file-upload.html
@@ -23,9 +23,9 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 <pre><code><script style="display: block;">
diff --git a/examples/static/file-url.html b/examples/static/file-url.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
   <div id="output">--</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 <pre><code><script style="display: block;">
diff --git a/examples/static/microphone-alternatives.html b/examples/static/microphone-alternatives.html
@@ -19,10 +19,10 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
-<script src="bower_components/jquery/dist/jquery.min.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
+<script src="scripts/jquery/dist/jquery.min.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/microphone-streaming-auto-stop.html b/examples/static/microphone-streaming-auto-stop.html
@@ -18,9 +18,9 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/microphone-streaming-model.html b/examples/static/microphone-streaming-model.html
@@ -20,9 +20,9 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/microphone-streaming-object-extracted-to-console.html b/examples/static/microphone-streaming-object-extracted-to-console.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
     <div id="output">Open your browser's console to view the output. The results are simplified by removing the outer JSON (this was the default behavior before v0.22).</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/microphone-streaming-object-to-console.html b/examples/static/microphone-streaming-object-to-console.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
     <div id="output">Open your browser's console to view the output.</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/microphone-streaming-preload-token.html b/examples/static/microphone-streaming-preload-token.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/microphone-streaming-text-to-console.html b/examples/static/microphone-streaming-text-to-console.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
     <div id="output">Open your browser's console to view the output.</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/microphone-streaming.html b/examples/static/microphone-streaming.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/microphone-word-confidence.html b/examples/static/microphone-word-confidence.html
@@ -26,10 +26,10 @@ <h2>Output:</h2>
   <div id="output">--</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
-<script src="bower_components/jquery/dist/jquery.min.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
+<script src="scripts/jquery/dist/jquery.min.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/realtime-vs-no-realtime.html b/examples/static/realtime-vs-no-realtime.html
@@ -64,9 +64,9 @@ <h2><code>{realtime: true, emitAt: END}</code></h2>
 
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 <pre><code><script style="display: block;">
diff --git a/examples/static/speaker-labels-file-console.html b/examples/static/speaker-labels-file-console.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
   <div id="output">Open your browser's console to view the output.</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/speaker-stream-file-console.html b/examples/static/speaker-stream-file-console.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
   <div id="output">Open your browser's console to view the output. Note: it will take some time before results begin to appear.</div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/speaker-stream-file-html.html b/examples/static/speaker-stream-file-html.html
@@ -19,9 +19,9 @@ <h2>Output:</h2>
   <div id="output"></div>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 
diff --git a/examples/static/text-to-speech-custom-voice.html b/examples/static/text-to-speech-custom-voice.html
@@ -17,9 +17,9 @@ <h2>Text to Speech with Custom Voice Example</h2>
     <p><button id="button">Synthesize Text</button></p>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 <pre><code><script style="display: block;">
diff --git a/examples/static/text-to-speech-preload.html b/examples/static/text-to-speech-preload.html
@@ -15,9 +15,9 @@ <h2>Pre-loaded Example</h2>
     <p><button id="button">Play Synthesized Text</button></p>
 </section>
 
-<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
+<script src="scripts/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
-<script src="bower_components/fetch/fetch.js"></script>
+<script src="scripts/fetch/dist/fetch.umd.js"></script>
 
 <h2>Code for this demo:</h2>
 <pre><code><script style="display: block;">
diff --git a/examples/static/text-to-speech.html b/examples/static/text-to-speech.html
diff --git a/examples/static/url-promise.html b/examples/static/url-promise.html
diff --git a/examples/static/webpack-app.js b/examples/static/webpack-app.js
diff --git a/scripts/run-dev.sh b/scripts/run-dev.sh

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`node_modules/`
`2`	`2`	`keys/`
`3`		`-static/bower_components/`