From 080b72082fba3441e40cdac16a0fd336d188d205 Mon Sep 17 00:00:00 2001 From: why520crazy Date: Thu, 26 Sep 2019 16:39:15 +0800 Subject: [PATCH 1/3] test: add report-coverage ro coveralls --- .circleci/config.yml | 1 + package-lock.json | 40 ++++++++++++++++++++++++++++++++++++++++ package.json | 11 ++++++----- 3 files changed, 47 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e90177d..83130ce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,3 +14,4 @@ jobs: paths: - 'node_modules' - run: npm run test -- --no-watch --no-progress --browsers=ChromeHeadlessCI + - run: npm run report-coverage diff --git a/package-lock.json b/package-lock.json index 29d2bf5..13a85d6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4978,6 +4978,28 @@ } } }, + "coveralls": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.6.tgz", + "integrity": "sha512-Pgh4v3gCI4T/9VijVrm8Ym5v0OgjvGLKj3zTUwkvsCiwqae/p6VLzpsFNjQS2i6ewV7ef+DjFJ5TSKxYt/mCrA==", + "dev": true, + "requires": { + "growl": "~> 1.10.0", + "js-yaml": "^3.13.1", + "lcov-parse": "^0.0.10", + "log-driver": "^1.2.7", + "minimist": "^1.2.0", + "request": "^2.86.0" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } + } + }, "create-ecdh": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", @@ -7660,6 +7682,12 @@ "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==", "dev": true }, + "growl": { + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", + "dev": true + }, "handle-thing": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz", @@ -9496,6 +9524,12 @@ "invert-kv": "^1.0.0" } }, + "lcov-parse": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz", + "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=", + "dev": true + }, "less": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/less/-/less-3.8.1.tgz", @@ -9706,6 +9740,12 @@ "lodash._reinterpolate": "^3.0.0" } }, + "log-driver": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", + "dev": true + }, "log4js": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/log4js/-/log4js-3.0.6.tgz", diff --git a/package.json b/package.json index a6524b1..3e22518 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,10 @@ "@types/node": "~8.9.4", "codelyzer": "~4.5.0", "concurrently": "^4.1.0", + "conventional-changelog-cli": "^2.0.12", + "coveralls": "^3.0.6", "css-loader": "^2.1.0", + "husky": "^2.4.1", "jasmine-core": "~2.99.1", "jasmine-spec-reporter": "~4.2.1", "karma": "~3.1.1", @@ -65,6 +68,8 @@ "mini-css-extract-plugin": "^0.5.0", "ng-packagr": "^4.2.0", "postcss-loader": "^3.0.0", + "prettier": "^1.16.4", + "pretty-quick": "^1.10.0", "protractor": "~5.4.0", "sass-loader": "^7.1.0", "style-loader": "^0.23.1", @@ -73,11 +78,7 @@ "tslib": "^1.10.0", "tslint": "~5.11.0", "typescript": "3.1.6", - "webpack-assets-manifest": "^3.1.1", - "husky": "^2.4.1", - "conventional-changelog-cli": "^2.0.12", - "prettier": "^1.16.4", - "pretty-quick": "^1.10.0" + "webpack-assets-manifest": "^3.1.1" }, "husky": { "hooks": { From f2e7aae2b4b5e34350235c86a2993ad248f1c75f Mon Sep 17 00:00:00 2001 From: why520crazy Date: Thu, 26 Sep 2019 16:42:33 +0800 Subject: [PATCH 2/3] test: add coverage status to readme --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6243162..449512d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -# ngx-planet [![CircleCI](https://circleci.com/gh/worktile/ngx-planet.svg?style=shield)](https://circleci.com/gh/worktile/ngx-planet) [![npm (scoped)](https://img.shields.io/npm/v/@worktile/planet?style=flat)](https://www.npmjs.com/package/@worktile/planet) [![npm](https://img.shields.io/npm/dm/@worktile/planet)](https://www.npmjs.com/package/@worktile/planet) ![npm bundle size (scoped)](https://img.shields.io/bundlephobia/min/@worktile/planet) +# ngx-planet [![CircleCI](https://circleci.com/gh/worktile/ngx-planet.svg?style=shield)](https://circleci.com/gh/worktile/ngx-planet) [![Coverage Status][coveralls-image]][coveralls-url] [![npm (scoped)](https://img.shields.io/npm/v/@worktile/planet?style=flat)](https://www.npmjs.com/package/@worktile/planet) [![npm](https://img.shields.io/npm/dm/@worktile/planet)](https://www.npmjs.com/package/@worktile/planet) ![npm bundle size (scoped)](https://img.shields.io/bundlephobia/min/@worktile/planet) + +[coveralls-image]: https://coveralls.io/repos/github/worktile/ngx-planet/badge.svg +[coveralls-url]: https://coveralls.io/github/worktile/ngx-planet An Angular 7+ Micro Frontend library. From bab2fb9f8c1cc1ebb2929adaa67d983a1b09a749 Mon Sep 17 00:00:00 2001 From: why520crazy Date: Thu, 26 Sep 2019 16:52:39 +0800 Subject: [PATCH 3/3] docs: move status badge to new line --- README.md | 22 ++++++++++++++++------ examples/portal/src/app/app.component.ts | 2 +- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 449512d..89ee17f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,10 @@ -# ngx-planet [![CircleCI](https://circleci.com/gh/worktile/ngx-planet.svg?style=shield)](https://circleci.com/gh/worktile/ngx-planet) [![Coverage Status][coveralls-image]][coveralls-url] [![npm (scoped)](https://img.shields.io/npm/v/@worktile/planet?style=flat)](https://www.npmjs.com/package/@worktile/planet) [![npm](https://img.shields.io/npm/dm/@worktile/planet)](https://www.npmjs.com/package/@worktile/planet) ![npm bundle size (scoped)](https://img.shields.io/bundlephobia/min/@worktile/planet) +# ngx-planet + +[![CircleCI](https://circleci.com/gh/worktile/ngx-planet.svg?style=shield)](https://circleci.com/gh/worktile/ngx-planet) +[![Coverage Status][coveralls-image]][coveralls-url] +[![npm (scoped)](https://img.shields.io/npm/v/@worktile/planet?style=flat)](https://www.npmjs.com/package/@worktile/planet) +[![npm](https://img.shields.io/npm/dm/@worktile/planet)](https://www.npmjs.com/package/@worktile/planet) +![npm bundle size (scoped)](https://img.shields.io/bundlephobia/min/@worktile/planet) [coveralls-image]: https://coveralls.io/repos/github/worktile/ngx-planet/badge.svg [coveralls-url]: https://coveralls.io/github/worktile/ngx-planet @@ -77,11 +83,13 @@ export class AppComponent implements OnInit { hostClass: appHostContainerClass, routerPathPrefix: '/app1', selector: 'app1-root-container', - scriptPathPrefix: 'app1/assets/', + resourcePathPrefix: '/static/app1', preload: true, - // prettier-ignore scripts: [ 'main.js' + ], + styles: [ + 'styles.css' ] }, { @@ -90,10 +98,12 @@ export class AppComponent implements OnInit { hostClass: appHostContainerClass, routerPathPrefix: '/app2', selector: 'app2-root-container', - // preload: true, - // prettier-ignore + preload: true, scripts: [ - 'app2/assets/main.js' + '/static/app2/main.js' + ], + styles: [ + '/static/app2/styles.css' ] } ]); diff --git a/examples/portal/src/app/app.component.ts b/examples/portal/src/app/app.component.ts index bf7dd40..3a5b7ae 100644 --- a/examples/portal/src/app/app.component.ts +++ b/examples/portal/src/app/app.component.ts @@ -51,7 +51,7 @@ export class AppComponent implements OnInit { hostClass: appHostContainerClass, routerPathPrefix: /\/app1|app4/, // '/app1', selector: 'app1-root-container', - resourcePathPrefix: 'app1/static/', + resourcePathPrefix: '/app1/static/', preload: true, loadSerial: true, // prettier-ignore