Skip to content

Commit e502dde

Browse files
qinshenxueqinshenxue
committed
修复了 babel 配置为"presets": [["env", { "modules": false }]]后，无法使用 import 动态导入功能的问题，在「异步组件（懒加载）」章节已更新解决方法。
1 parent a4a91de commit e502dde

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+618
-1396
lines changed

Diff for: ‎.babelrc

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
{
22
"presets": [
3-
["env", { "modules": false }]
3+
[
4+
"env",
5+
{
6+
"modules": false
7+
}
8+
]
49
],
5-
"comments": true
10+
"plugins": [
11+
"syntax-dynamic-import"
12+
]
613
}

Diff for: ‎admin.html

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="UTF-8">
6+
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
7+
<title>vue2 vue-router2 webpack3</title>
8+
<link href="static/css/admin.css?f3e3678a" rel="stylesheet">
9+
</head>
10+
11+
<body>
12+
<div id="app"></div>
13+
<script type="text/javascript" src="static/js/manifest.js?3ba78d65c58a9a925d73"></script>
14+
<script type="text/javascript" src="static/js/vendor.js?4090172a0562424a2714"></script>
15+
<script type="text/javascript" src="static/js/admin.js?087cc2e6b449c9173cc5"></script>
16+
</body>
17+
18+
</html>

Diff for: ‎build/webpack.base.config.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ function resolve(relPath) {
88

99
module.exports = {
1010
entry: {
11-
index: resolve('../src/home/main.js'),
12-
module2: resolve('../src/module2/main.js'),
13-
module3: resolve('../src/module3/main.js')
11+
index: resolve('../src/web/main.js'),
12+
admin: resolve('../src/admin/main.js')
1413
},
1514
output: {
1615
filename: 'js/[name].js',

Diff for: ‎index.html

+6-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,14 @@
55
<meta charset="UTF-8">
66
<meta name="viewport" content="width=device-width,minimum-scale=1.0,maximum-scale=1.0,user-scalable=no">
77
<title>vue2 vue-router2 webpack3</title>
8-
<link href="static/css/index.css?0adfd1fe" rel="stylesheet"></head>
8+
<link href="static/css/index.css?641e872b" rel="stylesheet">
9+
</head>
910

1011
<body>
1112
<div id="app"></div>
12-
<script type="text/javascript" src="static/js/manifest.js?4ec1aefd04bdeb25c71f"></script><script type="text/javascript" src="static/js/vendor.js?6f1dac038695db1c330c"></script><script type="text/javascript" src="static/js/index.js?1a9ac7194b9eea92f5ee"></script></body>
13+
<script type="text/javascript" src="static/js/manifest.js?3ba78d65c58a9a925d73"></script>
14+
<script type="text/javascript" src="static/js/vendor.js?4090172a0562424a2714"></script>
15+
<script type="text/javascript" src="static/js/index.js?caafbf8f2ff3666aacd1"></script>
16+
</body>
1317

1418
</html>

Diff for: ‎module2.html

-14
This file was deleted.

Diff for: ‎module3.html

-14
This file was deleted.

Diff for: ‎package.json

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "vue2-vue-router2-webpack2",
2+
"name": "vue2-vue-router2-webpack3",
33
"version": "1.0.0",
44
"description": "",
55
"main": "index.js",
@@ -22,6 +22,7 @@
2222
"autoprefixer": "^6.7.5",
2323
"babel-core": "^6.26.0",
2424
"babel-loader": "^7.1.2",
25+
"babel-plugin-syntax-dynamic-import": "^6.18.0",
2526
"babel-preset-env": "^1.6.0",
2627
"css-loader": "^0.28.4",
2728
"cssnano": "^3.10.0",
@@ -38,15 +39,12 @@
3839
"stylus": "^0.54.5",
3940
"stylus-loader": "^2.5.0",
4041
"url-loader": "^0.5.9",
41-
"vue": "^2.4.4",
42-
"vue-loader": "^13.0.5",
43-
"vue-router": "^2.7.0",
44-
"vue-template-compiler": "^2.4.4",
42+
"vue": "^2.5.2",
43+
"vue-loader": "^13.3.0",
44+
"vue-router": "^3.0.1",
45+
"vue-template-compiler": "^2.5.2",
4546
"webpack": "^3.6.0",
4647
"webpack-dev-server": "^2.9.1",
4748
"webpack-merge": "^4.1.0"
48-
},
49-
"dependencies": {
50-
"hammerjs": "^2.0.8"
5149
}
5250
}

Diff for: ‎src/module2/app.vue renamed to ‎src/admin/app.vue

File renamed without changes.

Diff for: ‎src/module2/main.js renamed to ‎src/admin/main.js

File renamed without changes.

Diff for: ‎src/module2/router.js renamed to ‎src/admin/router.js

File renamed without changes.

Diff for: ‎src/module2/views/index.vue renamed to ‎src/admin/views/index.vue

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<template>
22
<div>
3-
这是app2的页面
3+
{{message}}，后台管理页面
44
</div>
55
</template>
66
<script>
77
export default {
88
data: function () {
99
return {
10-
page: 'index'
10+
message: 'hello'
1111
}
1212
}
1313
}

0 commit comments

Comments
 (0)