Skip to content

Commit

Permalink
change tab legnth to 2
Browse files Browse the repository at this point in the history
  • Loading branch information
DomonJi committed Sep 25, 2016
1 parent 2069610 commit 06c257a
Show file tree
Hide file tree
Showing 19 changed files with 432 additions and 538 deletions.
12 changes: 6 additions & 6 deletions build/build.js
Expand Up @@ -8,8 +8,8 @@ var webpack = require('webpack')
var webpackConfig = require('./webpack.prod.conf')

console.log(' Tip:\n' +
' Built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n')
' Built files are meant to be served over an HTTP server.\n' +
' Opening index.html over file:// won\'t work.\n')

var spinner = ora('building for production...')
spinner.start()
Expand All @@ -20,8 +20,8 @@ mkdir('-p', assetsPath)
cp('-R', 'static/', assetsPath)

webpack(webpackConfig, function(err, stats) {
spinner.stop()
if (err)
throw err
process.stdout.write(stats.toString({colors: true, modules: false, children: false, chunks: false, chunkModules: false}) + '\n')
spinner.stop()
if (err)
throw err
process.stdout.write(stats.toString({colors: true, modules: false, children: false, chunks: false, chunkModules: false}) + '\n')
})
2 changes: 1 addition & 1 deletion build/dev-client.js
Expand Up @@ -2,7 +2,7 @@
require('eventsource-polyfill')
var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')

hotClient.subscribe(function (event) {
hotClient.subscribe(function(event) {
if (event.action === 'reload') {
window.location.reload()
}
Expand Down
14 changes: 8 additions & 6 deletions build/dev-server.js
Expand Up @@ -26,18 +26,20 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {

var hotMiddleware = require('webpack-hot-middleware')(compiler)
// force page reload when html-webpack-plugin template changes
compiler.plugin('compilation', function (compilation) {
compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
hotMiddleware.publish({ action: 'reload' })
compiler.plugin('compilation', function(compilation) {
compilation.plugin('html-webpack-plugin-after-emit', function(data, cb) {
hotMiddleware.publish({action: 'reload'})
cb()
})
})

// proxy api requests
Object.keys(proxyTable).forEach(function (context) {
Object.keys(proxyTable).forEach(function(context) {
var options = proxyTable[context]
if (typeof options === 'string') {
options = { target: options }
options = {
target: options
}
}
app.use(proxyMiddleware(context, options))
})
Expand All @@ -56,7 +58,7 @@ app.use(hotMiddleware)
var staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory)
app.use(staticPath, express.static('./static'))

module.exports = app.listen(port, function (err) {
module.exports = app.listen(port, function(err) {
if (err) {
console.log(err)
return
Expand Down
14 changes: 8 additions & 6 deletions build/utils.js
Expand Up @@ -2,18 +2,18 @@ var path = require('path')
var config = require('../config')
var ExtractTextPlugin = require('extract-text-webpack-plugin')

exports.assetsPath = function (_path) {
exports.assetsPath = function(_path) {
var assetsSubDirectory = process.env.NODE_ENV === 'production'
? config.build.assetsSubDirectory
: config.dev.assetsSubDirectory
return path.posix.join(assetsSubDirectory, _path)
}

exports.cssLoaders = function (options) {
exports.cssLoaders = function(options) {
options = options || {}
// generate loader string to be used with extract text plugin
function generateLoaders (loaders) {
var sourceLoader = loaders.map(function (loader) {
function generateLoaders(loaders) {
var sourceLoader = loaders.map(function(loader) {
var extraParamChar
if (/\?/.test(loader)) {
loader = loader.replace(/\?/, '-loader?')
Expand All @@ -22,7 +22,9 @@ exports.cssLoaders = function (options) {
loader = loader + '-loader'
extraParamChar = '?'
}
return loader + (options.sourceMap ? extraParamChar + 'sourceMap' : '')
return loader + (options.sourceMap
? extraParamChar + 'sourceMap'
: '')
}).join('!')

if (options.extract) {
Expand All @@ -45,7 +47,7 @@ exports.cssLoaders = function (options) {
}

// Generate loaders for standalone style files (outside of .vue)
exports.styleLoaders = function (options) {
exports.styleLoaders = function(options) {
var output = []
var loaders = exports.cssLoaders(options)
for (var extension in loaders) {
Expand Down
126 changes: 63 additions & 63 deletions build/webpack.base.conf.js
Expand Up @@ -4,68 +4,68 @@ var utils = require('./utils')
var projectRoot = path.resolve(__dirname, '../')

module.exports = {
entry: {
app: './src/main.js'
},
output: {
path: config.build.assetsRoot,
publicPath: process.env.NODE_ENV === 'production'
? config.build.assetsPublicPath
: config.dev.assetsPublicPath,
filename: '[name].js'
},
resolve: {
extensions: [
'', '.js', '.vue'
],
fallback: [path.join(__dirname, '../node_modules')],
alias: {
'src': path.resolve(__dirname, '../src'),
'assets': path.resolve(__dirname, '../src/assets'),
'components': path.resolve(__dirname, '../src/components'),
vue: 'vue/dist/vue.js'
}
},
resolveLoader: {
fallback: [path.join(__dirname, '../node_modules')]
},
module: {
loaders: [
{
test: /\.vue$/,
loader: 'vue'
}, {
test: /\.js$/,
loader: 'babel',
include: projectRoot,
exclude: /node_modules/
}, {
test: /\.jsx$/,
loader: 'jsx'
}, {
test: /\.json$/,
loader: 'json'
}, {
test: /\.html$/,
loader: 'vue-html'
}, {
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
loader: 'url',
query: {
limit: 10000,
name: utils.assetsPath('img/[name].[hash:7].[ext]')
}
}, {
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
loader: 'url',
query: {
limit: 10000,
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
}
}
]
},
vue: {
loaders: utils.cssLoaders()
entry: {
app: './src/main.js'
},
output: {
path: config.build.assetsRoot,
publicPath: process.env.NODE_ENV === 'production'
? config.build.assetsPublicPath
: config.dev.assetsPublicPath,
filename: '[name].js'
},
resolve: {
extensions: [
'', '.js', '.vue'
],
fallback: [path.join(__dirname, '../node_modules')],
alias: {
'src': path.resolve(__dirname, '../src'),
'assets': path.resolve(__dirname, '../src/assets'),
'components': path.resolve(__dirname, '../src/components'),
vue: 'vue/dist/vue.js'
}
},
resolveLoader: {
fallback: [path.join(__dirname, '../node_modules')]
},
module: {
loaders: [
{
test: /\.vue$/,
loader: 'vue'
}, {
test: /\.js$/,
loader: 'babel',
include: projectRoot,
exclude: /node_modules/
}, {
test: /\.jsx$/,
loader: 'jsx'
}, {
test: /\.json$/,
loader: 'json'
}, {
test: /\.html$/,
loader: 'vue-html'
}, {
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
loader: 'url',
query: {
limit: 10000,
name: utils.assetsPath('img/[name].[hash:7].[ext]')
}
}, {
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
loader: 'url',
query: {
limit: 10000,
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
}
}
]
},
vue: {
loaders: utils.cssLoaders()
}
}
81 changes: 0 additions & 81 deletions build/webpack.conf.js

This file was deleted.

30 changes: 15 additions & 15 deletions build/webpack.dev.conf.js
Expand Up @@ -7,22 +7,22 @@ var HtmlWebpackPlugin = require('html-webpack-plugin')

// add hot-reload related code to entry chunks
Object.keys(baseWebpackConfig.entry).forEach(function(name) {
baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name])
baseWebpackConfig.entry[name] = ['./build/dev-client'].concat(baseWebpackConfig.entry[name])
})

module.exports = merge(baseWebpackConfig, {
module: {
loaders: utils.styleLoaders({sourceMap: config.dev.cssSourceMap})
},
// eval-source-map is faster for development
devtool: '#eval-source-map',
plugins: [
new webpack.DefinePlugin({'process.env': config.dev.env}),
// https://github.com/glenjamin/webpack-hot-middleware#installation--usage
// new webpack.optimize.OccurenceOrderPlugin(),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin(),
// https://github.com/ampedandwired/html-webpack-plugin
new HtmlWebpackPlugin({filename: 'index.html', template: 'index.html', inject: true})
]
module: {
loaders: utils.styleLoaders({sourceMap: config.dev.cssSourceMap})
},
// eval-source-map is faster for development
devtool: '#eval-source-map',
plugins: [
new webpack.DefinePlugin({'process.env': config.dev.env}),
// https://github.com/glenjamin/webpack-hot-middleware#installation--usage
// new webpack.optimize.OccurenceOrderPlugin(),
new webpack.HotModuleReplacementPlugin(),
new webpack.NoErrorsPlugin(),
// https://github.com/ampedandwired/html-webpack-plugin
new HtmlWebpackPlugin({filename: 'index.html', template: 'index.html', inject: true})
]
})

0 comments on commit 06c257a

Please sign in to comment.