Skip to content

Commit

Permalink
Merge branch 'rel-0.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
ghettovoice committed Jan 8, 2018
2 parents 4c8eb2d + 6196f7f commit 940ba9c
Show file tree
Hide file tree
Showing 101 changed files with 602 additions and 5,960 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "modules/babel-plugin-merge-imports"]
path = modules/babel-plugin-merge-imports
url = https://github.com/ghettovoice/babel-plugin-merge-imports.git
[submodule "modules/vuelayers-demo"]
path = modules/vuelayers-demo
url = https://github.com/ghettovoice/vuelayers-demo.git
57 changes: 0 additions & 57 deletions build/service-worker-registration.js

This file was deleted.

9 changes: 0 additions & 9 deletions build/utils.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const fs = require('fs-extra')
const path = require('path')
const { trimEnd } = require('lodash')
const ExtractTextPlugin = require('extract-text-webpack-plugin')
const StringReplacePlugin = require('string-replace-webpack-plugin')
const hljs = require('highlight.js')
Expand Down Expand Up @@ -238,13 +237,6 @@ function concatFiles (files, dest, banner) {
}
}

function getServiceWorkerSrc () {
let source = fs.readFileSync(resolve('build/service-worker-registration.js'), 'utf-8')
source = source.replace('__SCRIPT_URL__', `${trimEnd(config.publicPath, '/')}/service-worker.js`)

return source
}

module.exports = {
resolve,
assetsPath,
Expand All @@ -260,5 +252,4 @@ module.exports = {
compileVarsReplacement,
compileVarsReplaceLoader,
concatFiles,
getServiceWorkerSrc,
}
20 changes: 1 addition & 19 deletions build/webpack.base.conf.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const webpack = require('webpack')
const WebpackNotifierPlugin = require('webpack-notifier')
const StringReplacePlugin = require('string-replace-webpack-plugin')
const FaviconsWebpackPlugin = require('favicons-webpack-plugin')
const utils = require('./utils')
const config = require('./config')

Expand Down Expand Up @@ -113,24 +112,7 @@ module.exports = {
}),
new WebpackNotifierPlugin({
title: config.fullname,
alwaysNotify: true,
}),
new FaviconsWebpackPlugin({
logo: utils.resolve('docs/static/img/logo.svg'),
prefix: utils.assetsPath('img/'),
title: config.fullname,
icons: {
android: true,
appleIcon: true,
appleStartup: true,
coast: false,
favicons: true,
firefox: true,
opengraph: false,
twitter: false,
yandex: false,
windows: false,
},
alwaysNotify: false,
}),
],
}
61 changes: 0 additions & 61 deletions build/webpack.docs.dev.conf.js

This file was deleted.

128 changes: 0 additions & 128 deletions build/webpack.docs.prod.conf.js

This file was deleted.

70 changes: 0 additions & 70 deletions docs/api/feature/feature.js

This file was deleted.

Loading

0 comments on commit 940ba9c

Please sign in to comment.