Merge branch 'release/2.0.1'

CHANGELOG.md

@@ -1,9 +1,31 @@
+<a name="2.0.1"></a>
+### 2.0.1 (2016-12-28)
+
+* [BUG] Rollback appRate version to avoid regressions until v3 <https://github.com/shprink/wordpress-hybrid-client/issues/317>
+* [ENHANCEMENT] invalidate service worker cache at every build based on the config.xml app version
+
+To upgrade:
+
+```
+$ git fetch --all
+$ git checkout v2.0.1
+$ yarn
+$ npm run restore
+```
+
 <a name="2.0.0"></a>
 ### 2.0.0 (2016-12-17)
 
-2.0.0 REQUIRES WORDPRESS 4.7 of higher!
+2.0.0 REQUIRES WORDPRESS 4.7 or higher!
+
+To upgrade:
 
-To upgrade checkout `git fetch --all && git checkout v2.0.0` and run `npm i`
+```
+$ git fetch --all
+$ git checkout v2.0.0
+$ yarn
+$ npm run restore
+```
 
 * [ENHANCEMENT] WordPress 4.7 ready! <https://github.com/shprink/wordpress-hybrid-client/issues/308>
 * [ENHANCEMENT] Upgrade Cordova plugins <https://github.com/shprink/wordpress-hybrid-client/pull/310>

lib/index.coffee

@@ -10,7 +10,7 @@ require './font/font.coffee'
 require 'expose?_!lodash'
 require 'wp-api-angularjs'
 require './config.js'
-require '!file?name=[name].[ext]!./service-worker.js';
+require "./service-worker.js";
 overwriteModule = require '../config/index.js'
 customPostsModule = require './customPosts/index.js'
 pagesModule = require './pages/index.js'

lib/scss/_post.scss

@@ -1,16 +1,26 @@
 .post {
-    .wp-caption.aligncenter {
+    .wp-caption {
         position: relative;
         margin-bottom: 1.0em;
         max-width: 100%;
         overflow: hidden;
     }
+
+   .aligncenter {
+        clear: both;
+        display: block;
+        margin: 1.5em auto;
+   }
 
-    .wp-caption .wp-caption-text {
+   .wp-caption-text {
         margin: 10px 0;
         text-align: center;
         font-style: italic;
     }
+
+    a {
+      text-decoration: none;
+    }
 
     // Lists
     // -------------------------

lib/service-worker.js

@@ -1,5 +1,5 @@
 // tick this to make the cache invalidate and update
-const CACHE_VERSION = 1;
+const CACHE_VERSION = SERVICE_WORKER_VERSION;
 const CURRENT_CACHES = {
   'read-through': 'read-through-cache-v' + CACHE_VERSION
 };

package.json

@@ -49,10 +49,9 @@
     "babel-core": "^5.0.0",
     "babel-loader": "^5.3.2",
     "coffee-loader": "^0.7.2",
-    "coffee-script": "^1.10.0",
+    "coffee-script": "^1.12.2",
     "commander": "^2.9.0",
-    "ionic": "~1.7.12",
-    "cordova": "~5.4.1",
+    "cordova": "~6.4.0",
     "cson": "^3.0.2",
     "cson-loader": "^0.1.0",
     "css-loader": "^0.18.0",
@@ -64,12 +63,14 @@
     "html-loader": "^0.3.0",
     "html-webpack-plugin": "^1.6.1",
     "imports-loader": "^0.6.4",
+    "ionic": "~2.1.17",
     "json-loader": "^0.5.3",
     "ng-annotate-loader": "~0.0.10",
     "node-sass": "^3.3.3",
     "path": "^0.12.7",
     "sass-loader": "^2.0.1",
     "semver": "^5.0.3",
+    "string-replace-loader": "^1.0.5",
     "style-loader": "^0.12.4",
     "util": "^0.10.3",
     "webpack": "^1.12.0",
@@ -95,28 +96,35 @@
   },
   "cordovaPlugins": [
     "cordova-plugin-whitelist@1.3.0",
-    "cordova-plugin-inappbrowser@1.5.0",
-    "cordova-plugin-splashscreen@4.0.0",
-    "cordova-plugin-file@4.3.0",
-    "cordova-plugin-file-transfer@1.6.0",
-    "cordova-plugin-device@1.1.3",
-    "cordova-plugin-globalization@1.0.4",
-    "cordova-plugin-console@1.0.4",
-    "cordova-plugin-network-information@1.3.0",
-    "cordova-plugin-dialogs@1.3.0",
+    "cordova-plugin-inappbrowser@1.3.0",
+    "cordova-plugin-splashscreen@2.1.0",
+    "cordova-plugin-file@2.1.0",
+    "cordova-plugin-file-transfer@1.2.1",
+    "cordova-plugin-device@1.0.1",
+    "cordova-plugin-globalization@1.0.1",
+    "cordova-plugin-console@1.0.1",
+    "cordova-plugin-network-information@1.0.1",
+    "cordova-plugin-dialogs@1.1.1",
     {
-      "locator": "https://github.com/pushandplay/cordova-plugin-apprate#v1.2.0",
+      "locator": "https://github.com/pushandplay/cordova-plugin-apprate#v1.1.7",
       "id": "org.pushandplay.cordova.apprate"
     },
-    "cordova-plugin-x-toast@2.5.2",
-    "cordova-plugin-statusbar@2.2.0",
+    "cordova-plugin-x-toast@2.1.1",
+    "cordova-plugin-statusbar@1.0.1",
     "cordova-plugin-google-analytics@0.8.1",
     "phonegap-plugin-push@1.5.3",
     "cordova-plugin-crosswalk-webview@2.2.0",
     "cordova-plugin-spinner-dialog@1.3.1",
     "cordova-plugin-admobpro@2.14.0",
-    "cordova-plugin-x-socialsharing@5.1.3",
-    "ionic-plugin-keyboard@2.2.1"
+    "cordova-plugin-x-socialsharing@5.1.1",
+    "ionic-plugin-keyboard@2.2.0"
+  ],
+  "engines": {
+    "node": ">= 4",
+    "npm": ">= 3"
+  },
+  "os": [
+    "!win32"
   ],
   "cordovaPlatforms": [
     {

webpack.config.js

@@ -19,7 +19,7 @@ module.exports = {
     },
     module: {
 
-    noParse: [/autoit.js/],
+        noParse: [/autoit.js/],
 
         loaders: [{
             test: /[\/]highlight\.js$/,
@@ -30,6 +30,13 @@ module.exports = {
         }, {
             test: /[\/]ionic\.js$/,
             loader: 'exports?ionic' // For non commonJs
+        }, {
+            test: /service-worker\.js$/,
+            loaders: [
+                'file-loader?name=[name].[ext]',
+                `string-replace-loader?search=SERVICE_WORKER_VERSION&replace="${getAppVersion()}"`
+            ],
+            include: libPath
         }, {
             test: /\.js$/,
             exclude: /(node_modules|bower_components)/,
@@ -58,7 +65,7 @@ module.exports = {
         }, {
             test: [/Roboto\.ttf/, /Roboto\.woff/, /Roboto\.woff2/],
             loader: 'file?name=fonts/[name].[ext]'
-       }, {
+        }, {
             test: [/ionicons\.svg/, /ionicons\.eot/, /ionicons\.ttf/, /ionicons\.woff/],
             loader: 'file?name=fonts/[name].[ext]'
         }]