Merge pull request #21 from Fyerl/feat/vue2-upgrade-0

fix gh-pages demo bundle and sw cache version sync

Author: Fyerl

README.md

@@ -149,6 +149,7 @@ git clone git@github.com:Fyerl/vue-awesome-picker.git
 cd vue-awesome-picker
 npm install
 npm run dev
+npm run build
 ```
 
 [npm-image]: https://img.shields.io/npm/v/vue-awesome-picker.svg?style=flat

dist/demo.js

@@ -32,6 +32,6 @@
         })
       }
     </script>
-    <script src="./dist/vue-awesome-picker.js"></script>
+    <script src="./dist/demo.js"></script>
   </body>
 </html>

dist/demo.js.map

@@ -15,8 +15,13 @@
     "better-scroll"
   ],
   "scripts": {
+    "sync:sw-version": "node scripts/sync-sw-version.js",
+    "predev": "npm run sync:sw-version",
+    "prebuild": "npm run sync:sw-version",
     "dev": "cross-env NODE_ENV=development webpack serve --config webpack.config.js --env target=demo --mode development --open --host 0.0.0.0",
-    "build": "cross-env NODE_ENV=production webpack --config webpack.config.js --env target=lib --mode production",
+    "build": "npm run build:lib && npm run build:demo",
+    "build:lib": "cross-env NODE_ENV=production webpack --config webpack.config.js --env target=lib --mode production",
+    "build:demo": "cross-env NODE_ENV=production webpack --config webpack.config.js --env target=demo --mode production",
     "lint": "eslint --ext .js,.vue src"
   },
   "repository": {

index.html

@@ -0,0 +1,26 @@
+const fs = require('fs')
+const path = require('path')
+
+const projectRoot = path.resolve(__dirname, '..')
+const packagePath = path.join(projectRoot, 'package.json')
+const swPath = path.join(projectRoot, 'sw.js')
+
+const pkg = JSON.parse(fs.readFileSync(packagePath, 'utf8'))
+const version = pkg.version
+
+if (!version) {
+  throw new Error('package.json is missing version')
+}
+
+const swContent = fs.readFileSync(swPath, 'utf8')
+const versionLinePattern = /const CACHE_VERSION = '([^']+)'/
+if (!versionLinePattern.test(swContent)) {
+  throw new Error('CACHE_VERSION line not found in sw.js')
+}
+const nextContent = swContent.replace(versionLinePattern, `const CACHE_VERSION = '${version}'`)
+
+if (nextContent !== swContent) {
+  fs.writeFileSync(swPath, nextContent, 'utf8')
+}
+
+console.log(`Synced sw.js cache version to ${version}`)

package.json

@@ -1,13 +1,16 @@
-const CACHE_NAME = 'vap-cache-7'
+const CACHE_VERSION = '2.0.0'
+const CACHE_NAME = `vap-cache-${CACHE_VERSION}`
 const cacheUrls = [
   './',
-  './dist/vue-awesome-picker.js',
+  './dist/demo.js',
   './static/img/vue-logo.png'
 ]
 
 self.addEventListener('install', (event) => {
   event.waitUntil(
-    caches.open(CACHE_NAME).then(cache => cache.addAll(cacheUrls))
+    caches.open(CACHE_NAME)
+      .then(cache => cache.addAll(cacheUrls))
+      .then(() => self.skipWaiting())
   )
 })
 
@@ -29,6 +32,6 @@ self.addEventListener('activate', (event) => {
           }
         })
       )
-    })
+    }).then(() => self.clients.claim())
   )
 })

scripts/sync-sw-version.js

@@ -12,8 +12,8 @@ module.exports = (env = {}, argv = {}) => {
     entry: isLibBuild ? './src/lib/index.js' : './src/main.js',
     output: {
       path: path.resolve(__dirname, './dist'),
-      publicPath: '/dist/',
-      filename: 'vue-awesome-picker.js',
+      publicPath: './dist/',
+      filename: isLibBuild ? 'vue-awesome-picker.js' : 'demo.js',
       clean: isLibBuild,
       library: isLibBuild ? 'VueAwesomePicker' : undefined,
       libraryTarget: isLibBuild ? 'umd' : undefined,