Skip to content

Commit 4b2c724

Browse files
committed
Merge remote-tracking branch 'origin/develop'
# Conflicts: # yarn.lock
2 parents 7fa0f52 + f812ed2 commit 4b2c724

21 files changed

+4965
-2641
lines changed

CHANGELOG.md

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
## [0.0.8](https://github.com/MicroAppJS/plugin-deploy/compare/v0.0.7...v0.0.8) (2021-03-18)
2+
3+
## [0.0.7](https://github.com/MicroAppJS/plugin-deploy/compare/v0.0.6...v0.0.7) (2020-03-26)
4+
5+
6+
### Bug Fixes
7+
8+
* 修复引用问题 ([f6f55c0](https://github.com/MicroAppJS/plugin-deploy/commit/f6f55c028cd38b50f48d0a74d19c7e6eca0b6c51))
9+
10+
## [0.0.6](https://github.com/MicroAppJS/plugin-deploy/compare/v0.0.5...v0.0.6) (2020-03-16)
11+
12+
13+
### Features
14+
15+
* update default config ([2f99f45](https://github.com/MicroAppJS/plugin-deploy/commit/2f99f4548cd5a6da08b41716cd613696cbe09498))
16+
17+
## 0.0.5 (2020-03-11)
18+
19+
20+
### Bug Fixes
21+
22+
* add script ([81a0867](https://github.com/MicroAppJS/plugin-deploy/commit/81a0867ef67e9efa9b1a6c586b6a8b1b5c4ec57a))
23+
* change config ([19a627f](https://github.com/MicroAppJS/plugin-deploy/commit/19a627f5c1a86e128dc61ec20f47f7abce74a086))
24+
* change test file ([1f49b82](https://github.com/MicroAppJS/plugin-deploy/commit/1f49b8221ddd45627915beeda58b66c93402e6a3))
25+
26+
27+
### Features
28+
29+
* add release config ([452b510](https://github.com/MicroAppJS/plugin-deploy/commit/452b5108de7454d10d2af9240a10a0f891891014))
30+
* add template config ([3fdc029](https://github.com/MicroAppJS/plugin-deploy/commit/3fdc029506301c38afbd391485710a209f47949b))
31+
* art, add release. ([ea93f23](https://github.com/MicroAppJS/plugin-deploy/commit/ea93f23defd4928f67a759c03eaa7928577da6c4))
32+
* fix args.increment ([b3de979](https://github.com/MicroAppJS/plugin-deploy/commit/b3de979d8dc9258817e30c7b99245026a64c7088))
33+
34+
## 0.0.4 (2020-02-09)
35+
36+
### Bug Fixes
37+
38+
* add script ([81a0867](https://github.com/MicroAppJS/plugin-deploy/commit/81a0867ef67e9efa9b1a6c586b6a8b1b5c4ec57a))
39+
* change config ([19a627f](https://github.com/MicroAppJS/plugin-deploy/commit/19a627f5c1a86e128dc61ec20f47f7abce74a086))
40+
* change test file ([1f49b82](https://github.com/MicroAppJS/plugin-deploy/commit/1f49b8221ddd45627915beeda58b66c93402e6a3))
41+
42+
### Features
43+
44+
* add release config ([452b510](https://github.com/MicroAppJS/plugin-deploy/commit/452b5108de7454d10d2af9240a10a0f891891014))
45+
* art, add release. ([ea93f23](https://github.com/MicroAppJS/plugin-deploy/commit/ea93f23defd4928f67a759c03eaa7928577da6c4))
46+
* fix args.increment ([b3de979](https://github.com/MicroAppJS/plugin-deploy/commit/b3de979d8dc9258817e30c7b99245026a64c7088))

micro-app.config.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
'use strict';
2+
3+
const config = {};
4+
5+
config.plugins = [
6+
__dirname,
7+
];
8+
9+
module.exports = config;

micro-app.deploy.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
module.exports = {
44
disabled: false,
5-
git: 'git@github.com:MicroAppJS/MicroApp-Plugin-Deploy-Command.git', // repository,repo
5+
git: 'git@github.com:MicroAppJS/plugin-deploy.git', // repository,repo
66
branch: {
77
name: 'gh-pages',
88
// extends: true,
99
},
1010
message: 'AUTO TEST',
1111
user: {
12-
name: '',
13-
email: '',
12+
name: 'Zyao89',
13+
email: 'zyao89@gmail.com',
1414
},
1515
dest: 'test/gitinfo',
1616
// cname: 'www.2o3t.cn',

package.json

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
{
22
"name": "@micro-app/plugin-deploy",
3-
"version": "0.0.1",
3+
"version": "0.0.8",
44
"description": "[Plugin] auto deploy plugin.",
55
"main": "src/index.js",
6+
"publishConfig": {
7+
"access": "public"
8+
},
69
"scripts": {
710
"prepublishOnly": "npm run test",
8-
"test": "jest"
11+
"test": "jest",
12+
"deploy": "micro-app deploy",
13+
"release": "micro-app release",
14+
"release:alpha": "npm run release -- --preRelease=alpha",
15+
"release:next": "npm run release -- --preRelease=next",
16+
"release:minor": "npm run release -- minor",
17+
"release:patch": "npm run release -- patch"
918
},
1019
"files": [
1120
"src"
@@ -31,17 +40,17 @@
3140
},
3241
"license": "MIT",
3342
"peerDependencies": {
34-
"@micro-app/cli": ">=0.3.0"
43+
"@micro-app/cli": ">=0.4.0"
3544
},
3645
"devDependencies": {
37-
"@micro-app/cli": "^0.3.0-alpha.3",
38-
"@types/jest": "^24.0.25",
39-
"babel-eslint": "^10.0.3",
40-
"eslint": "^5.16.0",
41-
"eslint-config-2o3t": "^1.1.17",
42-
"jest": "^24.9.0"
46+
"@micro-app/cli": "^0.4.2",
47+
"@micro-app/shared-utils": "^0.1.25",
48+
"@types/jest": "^26.0.24",
49+
"eslint-config-2o3t": "^2.0.2",
50+
"jest": "^26.6.3"
4351
},
4452
"dependencies": {
45-
"@micro-app/shared-utils": "^0.1.11"
53+
"@release-it/conventional-changelog": "^2.0.1",
54+
"release-it": "^14.11.5"
4655
}
4756
}

src/commands/deploy/index.js

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

src/commands/index.js

Lines changed: 0 additions & 11 deletions
This file was deleted.
File renamed without changes.

src/commands/deploy/deploy.test.js renamed to src/deploy/deploy.test.js

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,12 @@
44

55
process.env.MICRO_APP_TEST = 'true';
66

7-
const path = require('path');
8-
97
describe('Command deploy', () => {
108

119
it('deploy', async () => {
1210

1311
const { service } = require('@micro-app/cli');
1412

15-
service.registerPlugin({
16-
id: 'test:DeployCommand',
17-
link: path.join(__dirname, './index.js'),
18-
});
19-
2013
const result = await service.run('deploy');
2114
console.log(result);
2215
});

0 commit comments

Comments
 (0)