From b4ad2efaecac6214d728fd6186777b73c6a3cc1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Fri, 31 Mar 2017 10:13:23 +0800 Subject: [PATCH 01/12] update readme --- README.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b4136ba..cfc694f 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,10 @@ # iView-project -### 推荐直接使用 iView-cli -[iView-cli](https://github.com/iview/iview-cli) -> 源自[https://github.com/icarusion/vue-vueRouter-webpack](https://github.com/icarusion/vue-vueRouter-webpack) -本工程适用于基于 Vue.js1.0 + vue-router + webpack + iView 的项目，已经将 iView 配置完成，只需要按步骤初始化即可。 +本工程适用于基于 Vue.js 2 + vue-router + webpack2 + iView 2 的项目，已经将 iView 配置完成，只需要按步骤初始化即可。 ## 安装 ```bush -// 安装前请先确保已安装node和npm -// 需要提前在全局安装webpack和webpack-dev-server,如果已安装请忽略 -npm install webpack -g -npm install webpack-dev-server -g - -// 安装成功后,再安装依赖 +// 安装依赖 npm install ``` ## 运行 From ee2684b207d2af02f826d5460195f888eee36dc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Fri, 31 Mar 2017 10:22:52 +0800 Subject: [PATCH 02/12] update package & readme --- README.md | 18 ++++++++---------- package.json | 43 +++++++++++++++++++++---------------------- 2 files changed, 29 insertions(+), 32 deletions(-) diff --git a/README.md b/README.md index cfc694f..c71c00d 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,20 @@ # iView-project -本工程适用于基于 Vue.js 2 + vue-router + webpack2 + iView 2 的项目，已经将 iView 配置完成，只需要按步骤初始化即可。 +This project is build for Vue.js 2 + vue-router + webpack2 + iView 2, just install and run. -## 安装 +## Install ```bush -// 安装依赖 +// install dependencies npm install ``` -## 运行 -### 开发环境 +## Run +### Development ```bush -// 注意首次使用需要执行下面的init命令来生成入口html文件,以后不用再执行 -npm run init npm run dev ``` -### 生产环境(打包) +### Production(Build) ```bush npm run build ``` -### 访问 -在浏览器地址栏输入[http://127.0.0.1:8080](http://127.0.0.1:8080) +### View +[http://127.0.0.1:8080](http://127.0.0.1:8080) diff --git a/package.json b/package.json index b5e923d..2181e1d 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,10 @@ { "name": "iview-project", - "version": "1.0.2", - "description": "A base project using Vue.js1.0、Vue-Router、webpack and with iView.", + "version": "2.0.0", + "description": "A base project with Vue.js2、Vue-Router、webpack2 and with iView2.", "main": "index.js", "scripts": { - "init": "webpack --progress --config webpack.dev.config.js", - "dev": "webpack-dev-server --inline --hot --compress --history-api-fallback --config webpack.dev.config.js", + "dev": "webpack-dev-server --content-base ./ --inline --hot --compress --history-api-fallback --config webpack.dev.config.js", "build": "webpack --progress --hide-modules --config webpack.prod.config.js" }, "repository": { @@ -15,35 +14,35 @@ "author": "Aresn", "license": "MIT", "dependencies": { - "vue": "^1.0.26", - "vue-router": "^0.7.13", - "iview": "^1.0.0" + "vue": "^2.2.6", + "vue-router": "^2.2.1", + "iview": "^2.0.0-rc.8" }, "devDependencies": { "autoprefixer-loader": "^2.0.0", - "babel": "^6.3.13", - "babel-core": "^6.3.21", - "babel-loader": "^6.2.0", - "babel-plugin-transform-runtime": "^6.3.13", - "babel-preset-es2015": "^6.3.13", - "babel-runtime": "^5.8.34", + "babel": "^6.23.0", + "babel-core": "^6.23.1", + "babel-loader": "^6.2.4", + "babel-plugin-transform-runtime": "^6.12.0", + "babel-preset-es2015": "^6.9.0", + "babel-runtime": "^6.11.6", "css-loader": "^0.23.1", - "extract-text-webpack-plugin": "^1.0.1", + "extract-text-webpack-plugin": "^2.0.0", "file-loader": "^0.8.5", "html-loader": "^0.3.0", - "html-webpack-plugin": "^2.22.0", + "html-webpack-plugin": "^2.28.0", "less": "^2.7.1", "less-loader": "^2.2.3", - "node-sass": "^3.10.1", - "sass-loader": "^4.0.2", "style-loader": "^0.13.1", "url-loader": "^0.5.7", - "vue-hot-reload-api": "^1.2.0", - "vue-html-loader": "^1.2.0", - "vue-loader": "^7.2.0", + "vue-hot-reload-api": "^1.3.3", + "vue-html-loader": "^1.2.3", + "vue-loader": "^11.0.0", "vue-style-loader": "^1.0.0", - "webpack": "^1.13.1", - "webpack-dev-server": "^1.16.1" + "vue-template-compiler": "^2.2.1", + "webpack": "^2.2.1", + "webpack-dev-server": "^2.4.1", + "webpack-merge": "^3.0.0" }, "bugs": { "url": "https://github.com/iview/iview-project/issues" From 53b74b99949147b05525bc07fbfa9af6df68095d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= Date: Fri, 31 Mar 2017 11:32:16 +0800 Subject: [PATCH 03/12] publish iview project2 --- .babelrc | 5 ++ package.json | 3 +- src/{components => }/app.vue | 2 +- src/config/config.js | 3 - src/directives/time.js | 17 ------ src/filters/number-separator.js | 9 --- src/images/logo.png | Bin 3893 -> 1558 bytes src/libs/util.js | 8 +-- src/main.js | 41 ++++++------- src/router.js | 17 +++--- src/template/index.ejs | 2 +- src/vendors.js | 3 + src/views/index.vue | 24 ++++++-- webpack.base.config.js | 86 +++++++++++++++++---------- webpack.dev.config.js | 79 ++++++++++--------------- webpack.prod.config.js | 99 +++++++++++++------------------- 16 files changed, 187 insertions(+), 211 deletions(-) create mode 100644 .babelrc rename src/{components => }/app.vue (89%) delete mode 100644 src/directives/time.js delete mode 100644 src/filters/number-separator.js create mode 100644 src/vendors.js diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..9897749 --- /dev/null +++ b/.babelrc @@ -0,0 +1,5 @@ +{ + "presets": [ + ["es2015", { "modules": false }] + ] +} diff --git a/package.json b/package.json index 2181e1d..38f5431 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,8 @@ "description": "A base project with Vue.js2、Vue-Router、webpack2 and with iView2.", "main": "index.js", "scripts": { - "dev": "webpack-dev-server --content-base ./ --inline --hot --compress --history-api-fallback --config webpack.dev.config.js", + "init": "webpack --progress --config webpack.dev.config.js", + "dev": "webpack-dev-server --content-base ./ --open --inline --hot --compress --history-api-fallback --config webpack.dev.config.js", "build": "webpack --progress --hide-modules --config webpack.prod.config.js" }, "repository": { diff --git a/src/components/app.vue b/src/app.vue similarity index 89% rename from src/components/app.vue rename to src/app.vue index fe9a381..7aebacc 100644 --- a/src/components/app.vue +++ b/src/app.vue @@ -1,5 +1,5 @@