merge master -> v3

This commit is contained in:
Rich Harris
2019-02-08 16:27:22 -05:00
2 changed files with 7 additions and 5 deletions

View File

@@ -1,9 +1,11 @@
#!/bin/bash
cd "$(dirname $0)"/..
DEFAULT=$1
ROLLUP=$2
WEBPACK=$3
DEFAULT=${1:-master}
ROLLUP=${2:-rollup}
WEBPACK=${3:-webpack}
echo "Creating $ROLLUP and $WEBPACK branches from $DEFAULT"
# make sure we're on master, and delete the $ROLLUP and $WEBPACK branches
git symbolic-ref HEAD "refs/heads/$DEFAULT"

View File

@@ -48,12 +48,12 @@ self.addEventListener('fetch', event => {
return;
}
// for pages, you might want to serve a shell `index.html` file,
// for pages, you might want to serve a shell `service-worker-index.html` file,
// which Sapper has generated for you. It's not right for every
// app, but if it's right for yours then uncomment this section
/*
if (url.origin === self.origin && routes.find(route => route.pattern.test(url.pathname))) {
event.respondWith(caches.match('/index.html'));
event.respondWith(caches.match('/service-worker-index.html'));
return;
}
*/