Merge pull request #20 from bigmeow/master

主要是挪动了包依赖的存放位置
megalojs · Mar 25, 2019 · ac4f5e4 · ac4f5e4
2 parents 386e83d + 9d75c91
commit ac4f5e4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -7,9 +7,15 @@ Standard Tooling for Megalo Project Development
 | ------ | ------ | ------ | ------ |
 | [@megalo/cli](./packages/@megalo/cli) | 1.0.0-alpha.1 | 2019/03/05 | 生成标准的megalo项目 |
 | [@megalo/cli-service](./packages/@megalo/cli-service) | 1.0.0-alpha.10 | 2019/03/18 | megalo项目的webpack零配置插件
-| [@megalo/entry](./packages/@megalo/entry) | 0.1.2 | 2019/03/01 | 读取入口文件的webpack插件 |
+| [@megalo/entry](./packages/@megalo/entry) | 0.1.2 | 2019/03/01 | 读取入口文件的webpack插件（未来可能废弃，交由megalo-aot处理） |
 | [@megalo/babel-preset-app](./packages/@megalo/babel-preset-app) | 1.0.0-alpha.1 | 2019/03/04 | 包装脚手架babel相关的配置 |
 
+## 其他相关包
+| 包名 | 最新版本号 | 最后更新日期 | 包描述
+| ------ | ------ | ------ | ------ |
+| [@megalo/eslint-config-standard](https://github.com/megalojs/eslint-config-standard) | 1.0.0 | 2019/03/21 | eslint-config-standard for megalo project |
+
+
 > 注： alpha 为内部开发测试版本，请勿在生产环境中使用
 
 ## 推荐运行环境

diff --git a/packages/@megalo/cli-service/package.json b/packages/@megalo/cli-service/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@megalo/cli-service",
   "description": ":hammer_and_wrench: megalo的开箱即用webpack小程序脚手架配置，内置megalo生态的部分插件，并提供用户自定义配置的入口(对标vue-cli 3)",
-  "version": "1.0.0-alpha.10",
+  "version": "1.0.0-alpha.11",
   "main": "./bin/index.js",
   "bin": {
     "megalo-cli-service": "./bin/index.js"
@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "@vue/cli-shared-utils": "^3.4.1",
+    "@megalo/entry": "^0.1.2",
     "chalk": "^2.4.2",
     "commander": "^2.19.0",
     "copy-webpack-plugin": "^4.5.2",
@@ -43,9 +44,9 @@
     "webpack-merge": "^4.1.5"
   },
   "peerDependencies": {
-    "@megalo/entry": "^0.1.2",
     "@megalo/target": "^0.5.7",
-    "@megalo/template-compiler": "*"
+    "@megalo/template-compiler": "*",
+    "octoparse": "^0.3.2"
   },
   "repository": {
     "type": "git",

diff --git a/packages/@megalo/cli/package.json b/packages/@megalo/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@megalo/cli",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "description": "megalo project template",
   "keywords": [
     "vue",

diff --git a/packages/@megalo/cli/template/package b/packages/@megalo/cli/template/package
@@ -10,7 +10,8 @@
     "build:swan": "megalo-cli-service build --platform swan",
     "dev:alipay": "megalo-cli-service serve --platform alipay",
     "dev:swan": "megalo-cli-service serve --platform swan",
-    "dev:wechat": "megalo-cli-service serve"
+    "dev:wechat": "megalo-cli-service serve",<% if (needEslint === 'Yes') { %>
+    "lint": "eslint --fix --ext .js,.vue src"<% } %>
   },
   "author": "<%- author %> <<%- email %>>",
   "license": "ISC",
@@ -21,9 +22,8 @@
   },
   "devDependencies": {
     "@megalo/babel-preset-app": "^1.0.0-alpha.1",
-    "@megalo/cli-service": "^1.0.0-alpha.8",
-    "@megalo/entry": "^0.1.2",
-    "@megalo/eslint-config-standard": "^1.0.0-alpha.1",
+    "@megalo/cli-service": "^1.0.0-alpha.8",<% if (needEslint === 'Yes') { %>
+    "@megalo/eslint-config-standard": "^1.0.0",<% } %>
     "@megalo/target": "^0.5.7",
     "@megalo/template-compiler": "^0.8.0",<% if (cssPreset === 'less') { %>
     "less": "^3.8.1",

diff --git a/packages/@megalo/cli/template/src/index.js b/packages/@megalo/cli/template/src/index.js
@@ -1,4 +1,4 @@
-import App from '.'
+import App from './App'
 import Vue from 'vue'
 import VHtmlPlugin from '@megalo/vhtml-plugin'