Browse Source

Bugfixes

Remove gh-pages
Reset hash prefix to empty
master
Igor Zhukov 5 years ago
parent
commit
37ab09c876
  1. 8
      Makefile
  2. 1
      app/js/app.js
  3. 5
      gulpfile.js
  4. 1
      package.json

8
Makefile

@ -13,9 +13,11 @@ ghdist:
cd dist && git checkout gh-pages
publish:
./node_modules/gulp/bin/gulp.js publish
echo -n "Please open http://localhost:8000/dist/index.html and check if everything works fine." && read -e
./node_modules/gulp/bin/gulp.js deploy
./node_modules/gulp/bin/gulp.js clean
cd dist && git pull origin gh-pages
./node_modules/gulp/bin/gulp.js publish
echo -n "Please open http://localhost:8000/dist/index.html and check if everything works fine." && read -e
cd dist && git add --all . && git commit -am "merged with master" && git push origin gh-pages
bump:
./node_modules/gulp/bin/gulp.js bump

1
app/js/app.js

@ -32,6 +32,7 @@ angular.module('myApp', [
'myApp.directives',
'myApp.controllers'
].concat(extraModules)).config(['$locationProvider', '$routeProvider', '$compileProvider', 'StorageProvider', function ($locationProvider, $routeProvider, $compileProvider, StorageProvider) {
$locationProvider.hashPrefix('');
$compileProvider.imgSrcSanitizationWhitelist(/^\s*(https?|ftp|file|blob|filesystem|chrome-extension|app):|data:image\//)
$compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|ftp|file|tg|mailto|blob|filesystem|chrome-extension|app):|data:/)

5
gulpfile.js

@ -349,9 +349,4 @@ gulp.task('package', gulp.series('cleanup-dist'))
gulp.task('publish', gulp.series('add-appcache-manifest', 'generate-service-worker'))
gulp.task('deploy', function () {
return gulp.src('./dist/**/*')
.pipe($.ghPages())
})
gulp.task('default', gulp.series('build'))

1
package.json

@ -48,7 +48,6 @@
"gulp": "^4.0.2",
"gulp-angular-templatecache": "^3.0.0",
"gulp-concat": "^2.1.7",
"gulp-gh-pages": "^0.5.4",
"gulp-grep-stream": "0.0.2",
"gulp-imagemin": "^5.0.3",
"gulp-less": "^4.0.1",

Loading…
Cancel
Save