Skip to content

Commit 4194363

Browse files
owldamonowldamon
committed
test
1 parent e8a59a7 commit 4194363

File tree

5 files changed

+66
-99
lines changed

5 files changed

+66
-99
lines changed

‎.travis.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# vue-cnode
22

3-
[![Build Status](https://travis-ci.org/Himmas/vue-cnode.svg?branch=master)](https://travis-ci.org/Himmas/vue-cnode)
4-
5-
[Live demo](https://himmas.github.io/vue-cnode/)
3+
[Live demo](http://damonowl.himmas.cc/vue-cnode/)
64

75
## Build Setup
86

‎build/utils.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ var path = require('path')
22
var config = require('../config')
33
var ExtractTextPlugin = require('extract-text-webpack-plugin')
44

5-
exports.assetsPath = function (_path) {
6-
var assetsSubDirectory = process.env.NODE_ENV === 'production'
7-
? config.build.assetsSubDirectory
8-
: config.dev.assetsSubDirectory
5+
exports.assetsPath = function(_path) {
6+
var assetsSubDirectory = process.env.NODE_ENV === 'production' ?
7+
config.build.assetsSubDirectory :
8+
config.dev.assetsSubDirectory
99
return path.posix.join(assetsSubDirectory, _path)
1010
}
1111

12-
exports.cssLoaders = function (options) {
12+
exports.cssLoaders = function(options) {
1313
options = options || {}
1414

1515
var cssLoader = {
@@ -21,7 +21,7 @@ exports.cssLoaders = function (options) {
2121
}
2222

2323
// generate loader string to be used with extract text plugin
24-
function generateLoaders (loader, loaderOptions) {
24+
function generateLoaders(loader, loaderOptions) {
2525
var loaders = [cssLoader]
2626
if (loader) {
2727
loaders.push({
@@ -57,7 +57,7 @@ exports.cssLoaders = function (options) {
5757
}
5858

5959
// Generate loaders for standalone style files (outside of .vue)
60-
exports.styleLoaders = function (options) {
60+
exports.styleLoaders = function(options) {
6161
var output = []
6262
var loaders = exports.cssLoaders(options)
6363
for (var extension in loaders) {
@@ -68,4 +68,4 @@ exports.styleLoaders = function (options) {
6868
})
6969
}
7070
return output
71-
}
71+
}

‎build/webpack.base.conf.js

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -4,63 +4,62 @@ var config = require('../config')
44
var vueLoaderConfig = require('./vue-loader.conf')
55

66
function resolve(dir) {
7-
return path.join(__dirname, '..', dir)
7+
return path.join(__dirname, '..', dir)
88
}
99

1010
module.exports = {
11-
entry: {
12-
app: './src/main.js'
13-
},
14-
output: {
15-
path: config.build.assetsRoot,
16-
filename: '[name].js',
17-
publicPath: process.env.NODE_ENV === 'production' ?
18-
config.build.assetsPublicPath :
19-
config.dev.assetsPublicPath
20-
},
21-
resolve: {
22-
extensions: ['.js', '.vue', '.json'],
23-
modules: [
24-
resolve('src'),
25-
resolve('node_modules')
26-
],
27-
alias: {
28-
'vue$': 'vue/dist/vue.common.js',
29-
'src': resolve('src'),
30-
'assets': resolve('src/assets'),
31-
'components': resolve('src/components')
32-
}
33-
},
34-
module: {
35-
rules: [{
36-
test: /\.vue$/,
37-
loader: 'vue-loader',
38-
options: vueLoaderConfig
39-
},
40-
{
41-
test: /\.js$/,
42-
loader: 'babel-loader',
43-
include: [resolve('src'), resolve('test')]
44-
},
45-
{
46-
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
47-
loader: 'url-loader',
48-
query: {
49-
limit: 10000,
50-
name: utils.assetsPath('img/[name].[hash:7].[ext]')
51-
}
52-
},
53-
{
54-
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
55-
loader: 'url-loader',
56-
query: {
57-
limit: 10000,
58-
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
59-
}
60-
}, {
61-
test: /\.(css|less)$/,
62-
loader: "style-loader!css-loader!postcss-loader!less-loader"
63-
}
64-
]
65-
}
11+
entry: {
12+
app: './src/main.js'
13+
},
14+
output: {
15+
path: config.build.assetsRoot,
16+
filename: '[name].js',
17+
publicPath: process.env.NODE_ENV === 'production' ?
18+
config.build.assetsPublicPath : config.dev.assetsPublicPath
19+
},
20+
resolve: {
21+
extensions: ['.js', '.vue', '.json'],
22+
modules: [
23+
resolve('src'),
24+
resolve('node_modules')
25+
],
26+
alias: {
27+
'vue$': 'vue/dist/vue.common.js',
28+
'src': resolve('src'),
29+
'assets': resolve('src/assets'),
30+
'components': resolve('src/components')
31+
}
32+
},
33+
module: {
34+
rules: [{
35+
test: /\.vue$/,
36+
loader: 'vue-loader',
37+
options: vueLoaderConfig
38+
},
39+
{
40+
test: /\.js$/,
41+
loader: 'babel-loader',
42+
include: [resolve('src'), resolve('test')]
43+
},
44+
{
45+
test: /\.(png|jpe?g|gif|svg)(\?.*)?$/,
46+
loader: 'url-loader',
47+
query: {
48+
limit: 10000,
49+
name: utils.assetsPath('img/[name].[hash:7].[ext]')
50+
}
51+
},
52+
{
53+
test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/,
54+
loader: 'url-loader',
55+
query: {
56+
limit: 10000,
57+
name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
58+
}
59+
}, {
60+
test: /\.(css|less)$/,
61+
loader: "style-loader!css-loader!postcss-loader!less-loader"
62+
}
63+
]
64+
}
6665
}

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"scripts": {
88
"dev": "node build/dev-server.js",
99
"build": "node build/build.js",
10-
"test":"npm run build"
10+
"test": "npm run build"
1111
},
1212
"dependencies": {
1313
"axios": "^0.15.3",
@@ -57,4 +57,4 @@
5757
"node": ">= 4.0.0",
5858
"npm": ">= 3.0.0"
5959
}
60-
}
60+
}

0 commit comments

Comments
 (0)