Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
zyao89 committed Sep 15, 2021
2 parents 7fa0f52 + f812ed2 commit 4b2c724
Show file tree
Hide file tree
Showing 21 changed files with 4,965 additions and 2,641 deletions.
46 changes: 46 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
## [0.0.8](https://github.com/MicroAppJS/plugin-deploy/compare/v0.0.7...v0.0.8) (2021-03-18)

## [0.0.7](https://github.com/MicroAppJS/plugin-deploy/compare/v0.0.6...v0.0.7) (2020-03-26)


### Bug Fixes

* 修复引用问题 ([f6f55c0](https://github.com/MicroAppJS/plugin-deploy/commit/f6f55c028cd38b50f48d0a74d19c7e6eca0b6c51))

## [0.0.6](https://github.com/MicroAppJS/plugin-deploy/compare/v0.0.5...v0.0.6) (2020-03-16)


### Features

* update default config ([2f99f45](https://github.com/MicroAppJS/plugin-deploy/commit/2f99f4548cd5a6da08b41716cd613696cbe09498))

## 0.0.5 (2020-03-11)


### Bug Fixes

* add script ([81a0867](https://github.com/MicroAppJS/plugin-deploy/commit/81a0867ef67e9efa9b1a6c586b6a8b1b5c4ec57a))
* change config ([19a627f](https://github.com/MicroAppJS/plugin-deploy/commit/19a627f5c1a86e128dc61ec20f47f7abce74a086))
* change test file ([1f49b82](https://github.com/MicroAppJS/plugin-deploy/commit/1f49b8221ddd45627915beeda58b66c93402e6a3))


### Features

* add release config ([452b510](https://github.com/MicroAppJS/plugin-deploy/commit/452b5108de7454d10d2af9240a10a0f891891014))
* add template config ([3fdc029](https://github.com/MicroAppJS/plugin-deploy/commit/3fdc029506301c38afbd391485710a209f47949b))
* art, add release. ([ea93f23](https://github.com/MicroAppJS/plugin-deploy/commit/ea93f23defd4928f67a759c03eaa7928577da6c4))
* fix args.increment ([b3de979](https://github.com/MicroAppJS/plugin-deploy/commit/b3de979d8dc9258817e30c7b99245026a64c7088))

## 0.0.4 (2020-02-09)

### Bug Fixes

* add script ([81a0867](https://github.com/MicroAppJS/plugin-deploy/commit/81a0867ef67e9efa9b1a6c586b6a8b1b5c4ec57a))
* change config ([19a627f](https://github.com/MicroAppJS/plugin-deploy/commit/19a627f5c1a86e128dc61ec20f47f7abce74a086))
* change test file ([1f49b82](https://github.com/MicroAppJS/plugin-deploy/commit/1f49b8221ddd45627915beeda58b66c93402e6a3))

### Features

* add release config ([452b510](https://github.com/MicroAppJS/plugin-deploy/commit/452b5108de7454d10d2af9240a10a0f891891014))
* art, add release. ([ea93f23](https://github.com/MicroAppJS/plugin-deploy/commit/ea93f23defd4928f67a759c03eaa7928577da6c4))
* fix args.increment ([b3de979](https://github.com/MicroAppJS/plugin-deploy/commit/b3de979d8dc9258817e30c7b99245026a64c7088))
9 changes: 9 additions & 0 deletions micro-app.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
'use strict';

const config = {};

config.plugins = [
__dirname,
];

module.exports = config;
6 changes: 3 additions & 3 deletions micro-app.deploy.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

module.exports = {
disabled: false,
git: 'git@github.com:MicroAppJS/MicroApp-Plugin-Deploy-Command.git', // repository,repo
git: 'git@github.com:MicroAppJS/plugin-deploy.git', // repository,repo
branch: {
name: 'gh-pages',
// extends: true,
},
message: 'AUTO TEST',
user: {
name: '',
email: '',
name: 'Zyao89',
email: 'zyao89@gmail.com',
},
dest: 'test/gitinfo',
// cname: 'www.2o3t.cn',
Expand Down
29 changes: 19 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
{
"name": "@micro-app/plugin-deploy",
"version": "0.0.1",
"version": "0.0.8",
"description": "[Plugin] auto deploy plugin.",
"main": "src/index.js",
"publishConfig": {
"access": "public"
},
"scripts": {
"prepublishOnly": "npm run test",
"test": "jest"
"test": "jest",
"deploy": "micro-app deploy",
"release": "micro-app release",
"release:alpha": "npm run release -- --preRelease=alpha",
"release:next": "npm run release -- --preRelease=next",
"release:minor": "npm run release -- minor",
"release:patch": "npm run release -- patch"
},
"files": [
"src"
Expand All @@ -31,17 +40,17 @@
},
"license": "MIT",
"peerDependencies": {
"@micro-app/cli": ">=0.3.0"
"@micro-app/cli": ">=0.4.0"
},
"devDependencies": {
"@micro-app/cli": "^0.3.0-alpha.3",
"@types/jest": "^24.0.25",
"babel-eslint": "^10.0.3",
"eslint": "^5.16.0",
"eslint-config-2o3t": "^1.1.17",
"jest": "^24.9.0"
"@micro-app/cli": "^0.4.2",
"@micro-app/shared-utils": "^0.1.25",
"@types/jest": "^26.0.24",
"eslint-config-2o3t": "^2.0.2",
"jest": "^26.6.3"
},
"dependencies": {
"@micro-app/shared-utils": "^0.1.11"
"@release-it/conventional-changelog": "^2.0.1",
"release-it": "^14.11.5"
}
}
92 changes: 0 additions & 92 deletions src/commands/deploy/index.js

This file was deleted.

11 changes: 0 additions & 11 deletions src/commands/index.js

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@

process.env.MICRO_APP_TEST = 'true';

const path = require('path');

describe('Command deploy', () => {

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

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

service.registerPlugin({
id: 'test:DeployCommand',
link: path.join(__dirname, './index.js'),
});

const result = await service.run('deploy');
console.log(result);
});
Expand Down
Loading

0 comments on commit 4b2c724

Please sign in to comment.