switching example to use bower-installed library (still symlinked to root when developing)

nfriedly · nfriedly · commit 83de40821695 · 2017-02-10T10:50:11.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -24,10 +24,6 @@ env:
   - secure: NDOdoAt1bjGspsU9CZl494GW9OEC9J56OCJloyfd0KGkDmKLNpYGw5eHXmJfLVqKAvldhOpjp0aNSrrwVcT2qvE2dhtYkL+a5hVMZFr7DdfOtZze/MIdCpoQhZQz8+wQa82crGgf+cTL2Y+BndkQoDk5mMo/3sAf512euHTHJXb+9DZ36ZJYIK/hVTfzZMdUUH7059rYeUADhXXcbu1Va+cJHXr2xRFI8ZEdZfZ0V1jDEqPyi/hwDYODgsTpk/4jRFlkZu2Agxq2kOETeuJYiTJ7O9Q1qhY3rSAgu/rvQK8+Y7ngTxWS8rStOOr8CNXJtmZdM0zpz6RbmQEhR5Xk4s8aX1rxPDj06/Cx7BVWKZWb7wGJETjKq/+NLv/tK9tXDVZ5oBj/H9VkUm2gWqWCKaAge9xW+wuh/LluGMZIx+pTDI94AbgIZnxP2HoALmGIvyim7AquvQqaqIqVR3XTXZUccYM5yRCkxHknZbbL/hX4GOM/I1Ue24d5wt4okkGV2R/DNWYfnajB7GZOTvK5/kn7x6bJpU0Ls9ZYW+4V0zUO/3g5KalU3Cire/dSOC7WzrL823koEgpF9KCVjtCCsj1wMZI099FTGFljqfzlVKMy4Sw4tafRjpkQQT3GLoX1CV/B4n4BDOySoGBPlM0JYiEua+J5GNpeq34n38bwn4g=
 before_deploy:
 - npm run build
-# cf push ignores symlinks, so copy the file manually
-# https://github.com/cloudfoundry/cli/issues/108
-- rm examples/static/watson-speech.js
-- cp dist/watson-speech.js examples/static/watson-speech.js
 - npm install -g cf-blue-green
 deploy:
 - provider: releases
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "watson-speech",
   "description": "IBM Watson Speech to Text and Text to Speech SDK for web browsers.",
-  "main": "dist/watson-speech.min.js",
+  "main": "dist/watson-speech.js",
   "authors": [
     "Nathan Friedly <http://nfriedly.com>"
   ],
diff --git a/examples/.bowerrc b/examples/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "public/bower_components"
+  "directory": "static/bower_components/"
 }
diff --git a/examples/.cfignore b/examples/.cfignore
@@ -1,3 +1,3 @@
 node_modules/
 keys/
-static/bower_components/jquery/src/
+static/bower_components/
diff --git a/examples/bower.json b/examples/bower.json
@@ -0,0 +1,18 @@
+{
+  "name": "watson-speech-examples",
+  "main": "dist/watson-speech.js",
+  "authors": [
+    "Nathan Friedly <http://nfriedly.com>"
+  ],
+  "license": "Apache-2.0",
+  "homepage": "https://watson-speech.mybluemix.net/",
+  "ignore": [
+    "**/*"
+  ],
+  "private": true,
+  "dependencies": {
+    "watson-speech": "*",
+    "fetch": "^2.0.2",
+    "jquery": "^3.1.1"
+  }
+}
diff --git a/examples/readme.md b/examples/readme.md
@@ -44,7 +44,8 @@ Notes
   [Python](https://github.com/watson-developer-cloud/python-sdk/blob/master/examples/authorization_v1.py), 
   and there is a [REST API](http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/getting_started/gs-tokens.shtml) 
   for use with other languages (or `curl`).
-* The Speech SDK may be used in browserify or as a standalone library; all of the current examples use it as a standalone library for simplicity.
+* 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.
 
 
 More Examples
diff --git a/examples/static/bower_components/watson-speech/dist b/examples/static/bower_components/watson-speech/dist
@@ -0,0 +1 @@
+../../../../dist/
diff --git a/examples/static/file-ajax.html b/examples/static/file-ajax.html
@@ -19,7 +19,7 @@ <h2>Output:</h2>
   <div id="output">--</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/file-upload.html b/examples/static/file-upload.html
@@ -19,7 +19,7 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/file-url.html b/examples/static/file-url.html
@@ -19,7 +19,7 @@ <h2>Output:</h2>
   <div id="output">--</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/microphone-alternatives.html b/examples/static/microphone-alternatives.html
@@ -19,7 +19,7 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/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>
diff --git a/examples/static/microphone-streaming-auto-stop.html b/examples/static/microphone-streaming-auto-stop.html
@@ -18,7 +18,7 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/microphone-streaming-model.html b/examples/static/microphone-streaming-model.html
@@ -20,7 +20,7 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/microphone-streaming-object-extracted-to-console.html b/examples/static/microphone-streaming-object-extracted-to-console.html
@@ -19,7 +19,7 @@ <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="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/microphone-streaming-object-to-console.html b/examples/static/microphone-streaming-object-to-console.html
@@ -19,7 +19,7 @@ <h2>Output:</h2>
     <div id="output">Open your browser's console to view the output.</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/microphone-streaming-text-to-console.html b/examples/static/microphone-streaming-text-to-console.html
@@ -19,7 +19,7 @@ <h2>Output:</h2>
     <div id="output">Open your browser's console to view the output.</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/microphone-streaming.html b/examples/static/microphone-streaming.html
@@ -19,7 +19,7 @@ <h2>Output:</h2>
     <div id="output">--</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/microphone-word-confidence.html b/examples/static/microphone-word-confidence.html
@@ -26,7 +26,7 @@ <h2>Output:</h2>
   <div id="output">--</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/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>
diff --git a/examples/static/realtime-vs-no-realtime.html b/examples/static/realtime-vs-no-realtime.html
@@ -64,7 +64,7 @@ <h2><code>{realtime: true, emitAt: END}</code></h2>
 
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/speaker-labels-file-console.html b/examples/static/speaker-labels-file-console.html
@@ -19,7 +19,7 @@ <h2>Output:</h2>
   <div id="output">Open your browser's console to view the output.</div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/speaker-stream-file-console.html b/examples/static/speaker-stream-file-console.html
@@ -19,7 +19,7 @@ <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="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/speaker-stream-file-html.html b/examples/static/speaker-stream-file-html.html
@@ -19,7 +19,7 @@ <h2>Output:</h2>
   <div id="output"></div>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/text-to-speech-custom-voice.html b/examples/static/text-to-speech-custom-voice.html
@@ -17,7 +17,7 @@ <h2>Text to Speech with Custom Voice Example</h2>
     <p><button id="button">Synthesize Text</button></p>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/text-to-speech.html b/examples/static/text-to-speech.html
@@ -16,7 +16,7 @@ <h2>Basic Text to Speech Example</h2>
     <p><button id="button">Synthesize Text</button></p>
 </section>
 
-<script src="watson-speech.js"></script>
+<script src="bower_components/watson-speech/dist/watson-speech.js"></script>
 <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
 <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/url-promise.html b/examples/static/url-promise.html
@@ -18,7 +18,7 @@ <h2>Output:</h2>
         <div id="output">--</div>
     </section>
 
-    <script src="watson-speech.js"></script>
+    <script src="bower_components/watson-speech/dist/watson-speech.js"></script>
     <!-- window.fetch pollyfill for IE/Edge & Older Chrome/FireFox -->
     <script src="bower_components/fetch/fetch.js"></script>
 
diff --git a/examples/static/watson-speech.js b/examples/static/watson-speech.js

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "watson-speech",`
`3`	`3`	`"description": "IBM Watson Speech to Text and Text to Speech SDK for web browsers.",`
`4`		`- "main": "dist/watson-speech.min.js",`
	`4`	`+ "main": "dist/watson-speech.js",`
`5`	`5`	`"authors": [`
`6`	`6`	`"Nathan Friedly <http://nfriedly.com>"`
`7`	`7`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "directory": "public/bower_components"`
	`2`	`+ "directory": "static/bower_components/"`
`3`	`3`	`}`