Rebuild with bug fix

InsanityRadio · Dec 24, 2017 · 9db1e84 · 9db1e84
1 parent ce0adf6
commit 9db1e84
Show file tree

Hide file tree

Showing 30 changed files with 334 additions and 1,164 deletions.
diff --git a/build.sh b/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 set -e 
-npm-run webpack --config webpack.prod.config.js --env production -p
+npm-run webpack --config webpack.prod.config.js --env production
 cordova build
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -46,12 +46,12 @@
     "progress-bar-webpack-plugin": "1.8.0",
     "raw-loader": "^0.5.1",
     "react-hot-loader": "3.0.0-beta.1",
-    "rxjs": "5.0.3",
+    "rxjs": "5.4.2",
     "style-loader": "0.13.1",
     "stylus": "0.54.5",
     "stylus-loader": "2.1.1",
     "ts-loader": "1.3.0",
-    "typescript": "2.0.10",
+    "typescript": "2.4.0",
     "webpack": "1.13.1",
     "webpack-dev-server": "1.14.1",
     "zone.js": "0.7.6"
@@ -69,6 +69,7 @@
     }
   },
   "devDependencies": {
+    "@types/node": "^8.5.2",
     "copy-webpack-plugin": "^3.0.1"
   }
-}
+}
diff --git a/platforms/android/assets/www/app.bundle.js b/platforms/android/assets/www/app.bundle.js
diff --git a/platforms/android/assets/www/app.js b/platforms/android/assets/www/app.js
diff --git a/platforms/android/assets/www/polyfills.bundle.js b/platforms/android/assets/www/polyfills.bundle.js
diff --git a/platforms/android/assets/www/polyfills.js b/platforms/android/assets/www/polyfills.js
diff --git a/platforms/android/assets/www/vendor.bundle.js b/platforms/android/assets/www/vendor.bundle.js
diff --git a/platforms/android/assets/www/vendor.js b/platforms/android/assets/www/vendor.js
diff --git a/platforms/browser/www/app.bundle.js b/platforms/browser/www/app.bundle.js
diff --git a/platforms/browser/www/app.js b/platforms/browser/www/app.js
diff --git a/platforms/browser/www/polyfills.bundle.js b/platforms/browser/www/polyfills.bundle.js
diff --git a/platforms/browser/www/polyfills.js b/platforms/browser/www/polyfills.js
diff --git a/platforms/browser/www/vendor.bundle.js b/platforms/browser/www/vendor.bundle.js
diff --git a/platforms/browser/www/vendor.js b/platforms/browser/www/vendor.js
diff --git a/platforms/ios/ios.json b/platforms/ios/ios.json
@@ -64,7 +64,7 @@
           "CFBundleLocalizations": [
             {
               "xml": "<array><string>en</string></array>",
-              "count": 2
+              "count": 15
             }
           ]
         }

diff --git a/platforms/ios/www/app.bundle.js b/platforms/ios/www/app.bundle.js
diff --git a/platforms/ios/www/app.js b/platforms/ios/www/app.js
diff --git a/platforms/ios/www/polyfills.bundle.js b/platforms/ios/www/polyfills.bundle.js
diff --git a/platforms/ios/www/polyfills.js b/platforms/ios/www/polyfills.js
diff --git a/platforms/ios/www/vendor.bundle.js b/platforms/ios/www/vendor.bundle.js
diff --git a/platforms/ios/www/vendor.js b/platforms/ios/www/vendor.js
diff --git a/src/app/radio.ts b/src/app/radio.ts
@@ -321,7 +321,7 @@ export module Radio {
 			this.audio.addEventListener("playing", (e) => this.handleStateChange(e));
 			this.audio.addEventListener("pause", (e) => this.handleStateChange(e));
 			this.audio.addEventListener("stalled", (e) => this.handleStateChange(e));
-			console.log(this.audio.play());
+			console.log(this.audio.play(), '!');
 
 		}
 

diff --git a/webpack.prod.config.js b/webpack.prod.config.js
@@ -51,7 +51,7 @@ module.exports = {
   module: {
     loaders: [{
       test: /\.ts$/,
-      loader: 'ts',
+      loader: 'ts-loader',
       include: path.join(__dirname, 'src'),
 
       query: {
@@ -130,13 +130,21 @@ module.exports = {
         removeComments: true
       }
     }),
-    new webpack.NoErrorsPlugin(),
+    //new webpack.NoErrorsPlugin(),
     new webpack.optimize.DedupePlugin(),
-    new webpack.optimize.UglifyJsPlugin(),
-    new CopyWebpackPlugin([{
-      from: path.join(__dirname, 'src', 'public'),
-      ignore: ['index.html.ejs']
-    }]),
+    new webpack.optimize.UglifyJsPlugin({
+        beautify: false,
+        mangle: false,
+        compress: {
+            warnings: false,
+            screw_ie8: true
+        },
+        comments: false
+    }),
+    //new CopyWebpackPlugin([{
+    //  from: path.join(__dirname, 'src', 'public'),
+    //  ignore: ['index.html.ejs']
+    //}]),
     new ProgressBarPlugin()
   ],
 

diff --git a/www/app.bundle.js b/www/app.bundle.js
diff --git a/www/app.css b/www/app.css
diff --git a/www/app.js b/www/app.js
diff --git a/www/index.html b/www/index.html
@@ -1,38 +1,4 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<title>Listen | Insanity Radio 103.2FM</title>
-
-		<meta property="og:title" content="Listen to Insanity" />
-		<meta property="og:type" content="music.radio_station" />
-		<meta property="og:music:creator" content="Insanity Radio 103.2FM" />
-		<meta property="og:image" content="https://insanityradio.com/res/og_listen.png" />
-		<meta property="og:image:height" content="768" />
-
-		<meta property="og:site_name" content="Insanity Radio 103.2FM" />
-		<meta property="og:url" content="http://insanityradio.com/listen/" />
-
-		<meta charset="utf-8" />
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-		<meta name="apple-mobile-web-app-capable" content="yes">
-		<meta http-equiv="Content-Security-Policy" content="default-src * data: blob:; style-src * 'unsafe-inline'; script-src * 'unsafe-inline' 'unsafe-eval' blob:; media-src * blob: data:; connect-src ws://webapi.insanityradio.com wss://webapi.insanityradio.com http://localhost:8080 ws://localhost:8080 http://stream.cor.insanityradio.com https://stream.cor.insanityradio.com https://scdn.insanityradio.com http://scdn.insanityradio.com">
-
-		<script type="text/javascript">
-
-			// Not supported on any version of IE currently. Fall back to classic
+<!DOCTYPE html> <html> <head> <title>Listen | Insanity Radio 103.2FM</title> <meta property="og:title" content="Listen to Insanity"> <meta property="og:type" content="music.radio_station"> <meta property="og:music:creator" content="Insanity Radio 103.2FM"> <meta property="og:image" content="https://insanityradio.com/res/og_listen.png"> <meta property="og:image:height" content="768"> <meta property="og:site_name" content="Insanity Radio 103.2FM"> <meta property="og:url" content="http://insanityradio.com/listen/"> <meta charset="utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"> <meta name="apple-mobile-web-app-capable" content="yes"> <meta http-equiv="Content-Security-Policy" content="default-src * data: blob:; style-src * 'unsafe-inline'; script-src * 'unsafe-inline' 'unsafe-eval' blob:; media-src * blob: data:; connect-src ws://webapi.insanityradio.com wss://webapi.insanityradio.com http://localhost:8080 ws://localhost:8080 http://stream.cor.insanityradio.com https://stream.cor.insanityradio.com https://scdn.insanityradio.com http://scdn.insanityradio.com"> <script type="text/javascript"> // Not supported on any version of IE currently. Fall back to classic
 			if(navigator.userAgent.indexOf("Trident") > -1 || navigator.userAgent.indexOf("MSIE") > -1) {
 				location.href = '/listen/classic/';
-			}
-
-		</script>
-
-
-		<script type="text/javascript" src="components/loader.js"></script>
-
-		<link rel="stylesheet" type="text/css" href="components/loader.css">
-	<link href="app.css" rel="stylesheet"></head>
-	<body>
-		<app></app>
-	<script type="text/javascript" src="polyfills.js"></script><script type="text/javascript" src="vendor.js"></script><script type="text/javascript" src="app.js"></script></body>
-</html>
+			} </script> <script type="text/javascript" src="components/loader.js"></script> <link rel="stylesheet" type="text/css" href="components/loader.css"> <link href="app.css" rel="stylesheet"></head> <body> <app></app> <script type="text/javascript" src="polyfills.bundle.js"></script><script type="text/javascript" src="vendor.bundle.js"></script><script type="text/javascript" src="app.bundle.js"></script></body> </html> 
diff --git a/www/polyfills.bundle.js b/www/polyfills.bundle.js
diff --git a/www/vendor.bundle.js b/www/vendor.bundle.js