From b98005afc42e939cdc7475328a738a806f5dea98 Mon Sep 17 00:00:00 2001 From: thuhole Date: Tue, 21 Jul 2020 15:39:58 +0800 Subject: [PATCH] dev branch bug fixes --- .travis.yml | 8 ++++---- package.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index cea3965..57e6af8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,10 +10,10 @@ after_success: - git config --global user.email "thuhole@users.noreply.github.com" - git remote rm origin - git remote add origin https://thuhole:${GH_TOKEN}@github.com/thuhole/webhole.git - - CI=false REACT_APP_BUILD_INFO=$(printf "Stable%s" "$(TZ=Asia/Shanghai date +"%y%m%d%H%M%S")") npm run build + - CI=false REACT_APP_BUILD_INFO=$(printf "Dev%s" "$(TZ=Asia/Shanghai date +"%y%m%d%H%M%S")") npm run build #额,这里用了个骚操作来修复Service Worker在Precache CDN内容的时候index.html返回content-type text/plain的问题 - - sed -i 's/\/\/cdn.jsdelivr.net\/gh\/thuhole\/webhole@gh-pages-master\/index.html/.\/index.html/g' build/*-* - - sed -i 's/\/\/cdn.jsdelivr.net\/gh\/thuhole\/webhole@gh-pages-master\/service-worker.js/.\/service-worker.js/g' build/*-* - - sed -i 's/"\/\/cdn.jsdelivr.net\/gh\/thuhole\/webhole@gh-pages-master","\/service-worker.js"/".","\/service-worker.js"/' build/static/js/*.js + - sed -i 's/\/\/cdn.jsdelivr.net\/gh\/thuhole\/webhole@gh-pages\/index.html/.\/index.html/g' build/*-* + - sed -i 's/\/\/cdn.jsdelivr.net\/gh\/thuhole\/webhole@gh-pages\/service-worker.js/.\/service-worker.js/g' build/*-* + - sed -i 's/"\/\/cdn.jsdelivr.net\/gh\/thuhole\/webhole@gh-pages","\/service-worker.js"/".","\/service-worker.js"/' build/static/js/*.js - sed -i 's/storage.googleapis.com\/workbox-cdn\/releases\/4.3.1/cdn.jsdelivr.net\/npm\/workbox-cdn@4.3.1\/workbox/g' build/service-worker.js - npm run deploy diff --git a/package.json b/package.json index 66e827d..fcd2059 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,10 @@ "build": "react-scripts build", "test": "echo 'skipped react-scripts test --env=jsdom'", "predeploy": "", - "deploy": "gh-pages -b gh-pages-master -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")", + "deploy": "gh-pages -d build -m $(TZ=Asia/Shanghai date +\"%y%m%d%H%M%S\")", "eject": "react-scripts eject" }, - "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole@gh-pages-master", + "homepage": "https://://cdn.jsdelivr.net/gh/thuhole/webhole@gh-pages", "browserslist": { "production": [ ">0.2%",