chore(playground): use base64-js from npm

closes angular#12471
ferhatb · Nov 10, 2016 · 44a142f · 44a142f
1 parent 3d9d839
commit 44a142f
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 225 deletions.
diff --git a/build.sh b/build.sh
@@ -63,7 +63,7 @@ if [[ ${BUILD_ALL} == true ]]; then
   ln -s ../../../../node_modules/zone.js/dist/zone.js .
   ln -s ../../../../node_modules/zone.js/dist/long-stack-trace-zone.js .
   ln -s ../../../../node_modules/systemjs/dist/system.src.js .
-  ln -s ../../../../node_modules/base64-js/lib/b64.js .
+  ln -s ../../../../node_modules/base64-js .
   ln -s ../../../../node_modules/reflect-metadata/Reflect.js .
   ln -s ../../../../node_modules/rxjs .
   ln -s ../../../../node_modules/angular/angular.js .
@@ -79,7 +79,6 @@ if [[ ${BUILD_ALL} == true ]]; then
   ln -s ../../../../node_modules/zone.js/dist/zone.js .
   ln -s ../../../../node_modules/zone.js/dist/long-stack-trace-zone.js .
   ln -s ../../../../node_modules/systemjs/dist/system.src.js .
-  ln -s ../../../../node_modules/base64-js/lib/b64.js .
   ln -s ../../../../node_modules/reflect-metadata/Reflect.js .
   ln -s ../../../../node_modules/rxjs .
   ln -s ../../../../node_modules/angular/angular.js .

diff --git a/modules/playground/src/web_workers/images/b64.d.ts b/modules/playground/src/web_workers/images/b64.d.ts
diff --git a/modules/playground/src/web_workers/images/b64.js b/modules/playground/src/web_workers/images/b64.js
diff --git a/modules/playground/src/web_workers/images/loader.js b/modules/playground/src/web_workers/images/loader.js
@@ -9,13 +9,16 @@
 importScripts(
     '../../../vendor/core.js', '../../../vendor/zone.js',
     '../../../vendor/long-stack-trace-zone.js', '../../../vendor/system.src.js',
-    '../../../vendor/Reflect.js', 'b64.js');
+    '../../../vendor/Reflect.js');
 
 
 System.config({
   baseURL: '/all',
 
-  map: {'rxjs': '/all/playground/vendor/rxjs'},
+  map: {
+    'rxjs': '/all/playground/vendor/rxjs',
+    'base64-js': '/all/playground/vendor/base64-js',
+  },
 
   packages: {
     '@angular/core': {main: 'index.js', defaultExtension: 'js'},
@@ -27,6 +30,7 @@ System.config({
     '@angular/platform-webworker-dynamic': {main: 'index.js', defaultExtension: 'js'},
     '@angular/router': {main: 'index.js', defaultExtension: 'js'},
     'rxjs': {defaultExtension: 'js'},
+    'base64-js': {main: 'index.js', defaultExtension: 'js'},
   },
 
   defaultJSExtensions: true

diff --git a/modules/playground/src/web_workers/images/services/bitmap.ts b/modules/playground/src/web_workers/images/services/bitmap.ts
@@ -7,7 +7,7 @@
  */
 
 import {Injectable} from '@angular/core';
-import * as base64js from '../b64';
+import {fromByteArray} from 'base64-js';
 
 // This class is based on the Bitmap examples at:
 // http://www.i-programmer.info/projects/36-web/6234-reading-a-bmp-file-in-javascript.html
@@ -35,12 +35,12 @@ export class BitmapService {
   toDataUri(imageData: ImageData): string {
     const header = this._createBMPHeader(imageData);
     imageData = this._imageDataToBMP(imageData);
-    return 'data:image/bmp;base64,' + btoa(header) + base64js.fromByteArray(imageData.data);
+    return 'data:image/bmp;base64,' + btoa(header) + fromByteArray(imageData.data);
   }
 
   // converts a .bmp file ArrayBuffer to a dataURI
   arrayBufferToDataUri(data: Uint8Array): string {
-    return 'data:image/bmp;base64,' + base64js.fromByteArray(data);
+    return 'data:image/bmp;base64,' + fromByteArray(data);
   }
 
   // returns a UInt8Array in BMP order (starting from the bottom)

diff --git a/modules/playground/src/web_workers/images/single_thread.html b/modules/playground/src/web_workers/images/single_thread.html
@@ -2,13 +2,12 @@
   <head>
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link rel="stylesheet" href="image_demo.css" />
-    <script type="text/javascript" src="b64.js"></script>
   </head>
   <body>
     <image-demo>
     </image-demo>
 
-    <script src="../bootstrap.js"></script>
+    <script src="../../bootstrap.js"></script>
     <!-- Compiled and minified CSS -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.97.0/css/materialize.min.css">
 

diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
@@ -6,6 +6,10 @@
       "version": "1.5.13-alpha",
       "dev": true
     },
+    "@types/base64-js": {
+      "version": "1.2.5",
+      "dev": true
+    },
     "@types/fs-extra": {
       "version": "0.0.22-alpha",
       "dev": true
@@ -205,7 +209,7 @@
       "dev": true
     },
     "assert": {
-      "version": "1.3.0",
+      "version": "1.4.1",
       "dev": true
     },
     "assert-plus": {
@@ -249,7 +253,7 @@
       "dev": true
     },
     "base64-js": {
-      "version": "0.0.8",
+      "version": "1.2.0",
       "dev": true
     },
     "base64-url": {
@@ -1801,7 +1805,7 @@
       "dev": true
     },
     "buffer": {
-      "version": "3.6.0",
+      "version": "4.9.1",
       "dev": true,
       "dependencies": {
         "isarray": {
@@ -2153,6 +2157,10 @@
       "version": "2.0.5",
       "dev": true
     },
+    "crypto-browserify": {
+      "version": "3.2.8",
+      "dev": true
+    },
     "csrf": {
       "version": "3.0.0",
       "dev": true
@@ -2405,7 +2413,7 @@
       "dev": true
     },
     "events": {
-      "version": "1.0.2",
+      "version": "1.1.1",
       "dev": true
     },
     "exit": {
@@ -3556,6 +3564,10 @@
         }
       }
     },
+    "https-browserify": {
+      "version": "0.0.0",
+      "dev": true
+    },
     "https-proxy-agent": {
       "version": "1.0.0",
       "dev": true
@@ -3565,7 +3577,7 @@
       "dev": true
     },
     "ieee754": {
-      "version": "1.1.6",
+      "version": "1.1.8",
       "dev": true
     },
     "incremental-dom": {
@@ -4423,26 +4435,8 @@
       "dev": true
     },
     "node-libs-browser": {
-      "version": "0.5.3",
-      "dev": true,
-      "dependencies": {
-        "crypto-browserify": {
-          "version": "3.2.8",
-          "dev": true
-        },
-        "https-browserify": {
-          "version": "0.0.0",
-          "dev": true
-        },
-        "ripemd160": {
-          "version": "0.2.0",
-          "dev": true
-        },
-        "sha.js": {
-          "version": "2.2.6",
-          "dev": true
-        }
-      }
+      "version": "0.6.0",
+      "dev": true
     },
     "node-source-walk": {
       "version": "1.4.2",
@@ -4651,7 +4645,7 @@
       "dev": true
     },
     "process": {
-      "version": "0.11.2",
+      "version": "0.11.9",
       "dev": true
     },
     "process-nextick-args": {
@@ -4761,7 +4755,7 @@
       }
     },
     "punycode": {
-      "version": "1.4.0",
+      "version": "1.4.1",
       "dev": true
     },
     "q": {
@@ -4981,6 +4975,10 @@
         }
       }
     },
+    "ripemd160": {
+      "version": "0.2.0",
+      "dev": true
+    },
     "rndm": {
       "version": "1.1.1",
       "dev": true
@@ -5134,6 +5132,10 @@
       "version": "1.0.4",
       "dev": true
     },
+    "sha.js": {
+      "version": "2.2.6",
+      "dev": true
+    },
     "sigmund": {
       "version": "1.0.1",
       "dev": true