Skip to content

Commit 04ba35a

Browse files
committed
mod:adjust directory structure
1 parent aaf884c commit 04ba35a

File tree

13 files changed

+48
-249
lines changed

13 files changed

+48
-249
lines changed

build/webpack.base.conf.js

+24-25
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,24 @@ var glob = require('glob')
88
var CopyWebpackPlugin = require('copy-webpack-plugin')
99
var relative = require('relative')
1010

11-
function resolve (dir) {
11+
function resolve(dir) {
1212
return path.join(__dirname, '..', dir)
1313
}
1414

15-
function getEntry (rootSrc) {
15+
function getEntry(rootSrc) {
1616
var map = {};
1717
glob.sync(rootSrc + '/pages/**/main.js')
18-
.forEach(file => {
19-
var key = relative(rootSrc, file).replace('.js', '');
20-
map[key] = file;
21-
})
22-
return map;
18+
.forEach(file => {
19+
var key = relative(rootSrc, file).replace('.js', '');
20+
map[key] = file;
21+
})
22+
return map;
2323
}
2424

25-
const appEntry = { app: resolve('./src/main.js') }
26-
const pagesEntry = getEntry(resolve('./src'), 'pages/**/main.js')
25+
const appEntry = {
26+
app: resolve('./example/main.js')
27+
}
28+
const pagesEntry = getEntry(resolve('./example'), 'pages/**/main.js')
2729
const entry = Object.assign({}, appEntry, pagesEntry)
2830

2931
module.exports = {
@@ -35,27 +37,26 @@ module.exports = {
3537
output: {
3638
path: config.build.assetsRoot,
3739
filename: '[name].js',
38-
publicPath: process.env.NODE_ENV === 'production'
39-
? config.build.assetsPublicPath
40-
: config.dev.assetsPublicPath
40+
publicPath: process.env.NODE_ENV === 'production' ?
41+
config.build.assetsPublicPath :
42+
config.dev.assetsPublicPath
4143
},
4244
resolve: {
4345
extensions: ['.js', '.vue', '.json'],
4446
alias: {
4547
'vue': 'mpvue',
46-
'@': resolve('src')
48+
'@': resolve('example')
4749
},
4850
symlinks: false,
4951
aliasFields: ['mpvue', 'weapp', 'browser'],
5052
mainFields: ['browser', 'module', 'main']
5153
},
5254
module: {
53-
rules: [
54-
{
55+
rules: [{
5556
test: /\.(js|vue)$/,
5657
loader: 'eslint-loader',
5758
enforce: 'pre',
58-
include: [resolve('src'), resolve('test')],
59+
include: [resolve('src'), resolve('test'), resolve('example')],
5960
options: {
6061
formatter: require('eslint-friendly-formatter')
6162
}
@@ -67,7 +68,7 @@ module.exports = {
6768
},
6869
{
6970
test: /\.js$/,
70-
include: [resolve('src'), resolve('test')],
71+
include: [resolve('src'), resolve('test'), resolve('example')],
7172
use: [
7273
'babel-loader',
7374
{
@@ -110,14 +111,12 @@ module.exports = {
110111
from: '**/*.json',
111112
to: ''
112113
}], {
113-
context: 'src/'
114+
context: 'example/'
114115
}),
115-
new CopyWebpackPlugin([
116-
{
117-
from: path.resolve(__dirname, '../static'),
118-
to: path.resolve(__dirname, '../dist/static'),
119-
ignore: ['.*']
120-
}
121-
])
116+
new CopyWebpackPlugin([{
117+
from: path.resolve(__dirname, '../static'),
118+
to: path.resolve(__dirname, '../dist/static'),
119+
ignore: ['.*']
120+
}])
122121
]
123122
}

example/App.vue

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<script>
2+
export default {
3+
created () {
4+
}
5+
}
6+
</script>
7+
8+
<style>
9+
</style>

src/app.json renamed to example/app.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"pages": [
3-
"pages/index/main",
4-
"pages/logs/main" ],
3+
"pages/index/main"
4+
],
55
"window": {
66
"backgroundTextStyle": "light",
77
"navigationBarBackgroundColor": "#fff",
File renamed without changes.

example/pages/index/index.vue

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<template>
2+
<div class="index">hh</div>
3+
</template>
4+
5+
<script>
6+
export default {
7+
8+
}
9+
</script>
10+
11+
<style>
12+
13+
</style>
File renamed without changes.

src/App.vue

-31
This file was deleted.

src/components/card.vue

-19
This file was deleted.

src/pages/index/index.vue

-97
This file was deleted.

src/pages/logs/index.vue

-43
This file was deleted.

src/pages/logs/main.js

-5
This file was deleted.

src/pages/logs/main.json

-3
This file was deleted.

src/utils/index.js

-24
This file was deleted.

0 commit comments

Comments
 (0)