Skip to content

Commit d43f67e

Browse files
authored
Merge branch 'master' into GH-2112
2 parents 88fb2f1 + b279c87 commit d43f67e

File tree

6 files changed

+143
-115
lines changed

6 files changed

+143
-115
lines changed

catalog-info.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: backstage.io/v1alpha1
2+
kind: Component
3+
metadata:
4+
name: loopback4-microservice-catalog
5+
annotations:
6+
github.com/project-slug: sourcefuse/loopback4-microservice-catalog
7+
spec:
8+
type: other
9+
lifecycle: unknown
10+
owner: sourcefuse/loopback4-admins

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cli/CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,15 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## <small>9.0.1 (2024-06-28)</small>
7+
8+
* fix(cli): add docs folder while scaffolding (#2121) ([a67076a](https://github.com/sourcefuse/loopback4-microservice-catalog/commit/a67076a)), closes [#2121](https://github.com/sourcefuse/loopback4-microservice-catalog/issues/2121) [#0](https://github.com/sourcefuse/loopback4-microservice-catalog/issues/0)
9+
* chore(cli): update cli template dependencies (#2113) ([da660d4](https://github.com/sourcefuse/loopback4-microservice-catalog/commit/da660d4)), closes [#2113](https://github.com/sourcefuse/loopback4-microservice-catalog/issues/2113) [#2104](https://github.com/sourcefuse/loopback4-microservice-catalog/issues/2104)
10+
11+
12+
13+
14+
615
## 9.0.0 (2024-05-07)
716

817
* feat(all-services): update core package in all services (#2091) ([8b1703f](https://github.com/sourcefuse/loopback4-microservice-catalog/commit/8b1703f)), closes [#2091](https://github.com/sourcefuse/loopback4-microservice-catalog/issues/2091) [#2077](https://github.com/sourcefuse/loopback4-microservice-catalog/issues/2077) [#2077](https://github.com/sourcefuse/loopback4-microservice-catalog/issues/2077)

packages/cli/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ npm install -g @sourceloop/cli
1818
$ sl COMMAND
1919
running command...
2020
$ sl (-v|--version|version)
21-
@sourceloop/cli/9.0.0 linux-x64 node-v18.20.2
21+
@sourceloop/cli/9.0.1 linux-x64 node-v18.20.3
2222
$ sl --help [COMMAND]
2323
USAGE
2424
$ sl COMMAND
@@ -83,7 +83,7 @@ OPTIONS
8383
--help show manual pages
8484
```
8585

86-
_See code: [src/commands/cdk.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.0/src/commands/cdk.ts)_
86+
_See code: [src/commands/cdk.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.1/src/commands/cdk.ts)_
8787

8888
## `sl extension [NAME]`
8989

@@ -100,7 +100,7 @@ OPTIONS
100100
--help show manual pages
101101
```
102102

103-
_See code: [src/commands/extension.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.0/src/commands/extension.ts)_
103+
_See code: [src/commands/extension.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.1/src/commands/extension.ts)_
104104

105105
## `sl help [COMMAND]`
106106

@@ -164,7 +164,7 @@ OPTIONS
164164
Include sequelize as ORM in service
165165
```
166166

167-
_See code: [src/commands/microservice.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.0/src/commands/microservice.ts)_
167+
_See code: [src/commands/microservice.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.1/src/commands/microservice.ts)_
168168

169169
## `sl scaffold [NAME]`
170170

@@ -186,7 +186,7 @@ OPTIONS
186186
--owner=owner owner of the repo
187187
```
188188

189-
_See code: [src/commands/scaffold.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.0/src/commands/scaffold.ts)_
189+
_See code: [src/commands/scaffold.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.1/src/commands/scaffold.ts)_
190190

191191
## `sl update`
192192

@@ -200,5 +200,5 @@ OPTIONS
200200
--help show manual pages
201201
```
202202

203-
_See code: [src/commands/update.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.0/src/commands/update.ts)_
203+
_See code: [src/commands/update.ts](https://github.com/sourcefuse/loopback4-microservice-catalog/blob/v9.0.1/src/commands/update.ts)_
204204
<!-- commandsstop -->

packages/cli/package.json

Lines changed: 107 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sourceloop/cli",
3-
"version": "9.0.0",
3+
"version": "9.0.1",
44
"description": "Custom ARC CLI.",
55
"bin": {
66
"sl": "./bin/run"
@@ -119,115 +119,116 @@
119119
"prettier": "^2.8.4",
120120
"rimraf": "^3.0.2",
121121
"source-map-support": "^0.5.21",
122-
"typescript": "~4.9.5",
123-
"@loopback/apiconnect": "^0.13.0",
124-
"@loopback/authentication": "^11.0.0",
125-
"@loopback/authentication-jwt": "^0.15.0",
126-
"@loopback/authentication-passport": "^7.0.0",
127-
"@loopback/authorization": "^0.15.0",
128-
"@loopback/boot": "^7.0.0",
129-
"@loopback/booter-lb3app": "^6.0.0",
130-
"@loopback/build": "^11.0.0",
122+
"typescript": "~5.2.2",
123+
"@loopback/apiconnect": "^0.13.2",
124+
"@loopback/authentication": "^11.0.2",
125+
"@loopback/authentication-jwt": "^0.15.2",
126+
"@loopback/authentication-passport": "^7.0.2",
127+
"@loopback/authorization": "^0.15.2",
128+
"@loopback/boot": "^7.0.2",
129+
"@loopback/booter-lb3app": "^6.0.2",
130+
"@loopback/build": "^11.0.2",
131131
"@vendia/serverless-express": "^4.10.1",
132-
"@loopback/cli": "^6.0.0",
133-
"@loopback/context": "^7.0.0",
134-
"@loopback/context-explorer": "^0.11.0",
135-
"@loopback/core": "^6.0.0",
136-
"@loopback/cron": "^0.12.0",
137-
"@loopback/docs": "^7.0.0",
132+
"@loopback/cli": "^6.0.2",
133+
"@loopback/context": "^7.0.2",
134+
"@loopback/context-explorer": "^0.11.2",
135+
"@loopback/core": "^6.0.2",
136+
"@loopback/cron": "^0.12.2",
137+
"@loopback/docs": "^7.0.2",
138138
"@loopback/dist-util": "^0.4.0",
139-
"@loopback/eslint-config": "^15.0.0",
140-
"@loopback/example-access-control-migration": "^7.0.0",
141-
"@loopback/example-binding-resolution": "^0.10.0",
142-
"@loopback/example-context": "^7.0.0",
143-
"@loopback/example-express-composition": "^7.0.0",
144-
"@loopback/example-file-transfer": "^6.0.0",
145-
"@loopback/example-graphql": "^0.10.0",
146-
"@loopback/example-greeter-extension": "^7.0.0",
147-
"@loopback/example-greeting-app": "^7.0.0",
148-
"@loopback/example-hello-world": "^7.0.0",
149-
"@loopback/example-lb3-application": "^7.0.0",
150-
"@loopback/example-log-extension": "^7.0.0",
151-
"@loopback/example-metrics-prometheus": "^0.13.0",
152-
"@loopback/example-multi-tenancy": "^0.16.0",
153-
"@loopback/example-passport-login": "^6.0.0",
154-
"@loopback/example-references-many": "^8.0.0",
155-
"@loopback/example-rest-crud": "^6.0.0",
156-
"@loopback/example-rpc-server": "^7.0.0",
157-
"@loopback/example-soap-calculator": "^7.0.0",
158-
"@loopback/example-socketio": "^0.9.0",
159-
"@loopback/example-todo": "^8.0.0",
160-
"@loopback/example-todo-list": "^8.0.0",
161-
"@loopback/example-todo-jwt": "^6.0.0",
162-
"@loopback/example-validation-app": "^6.0.0",
163-
"@loopback/example-webpack": "^0.11.0",
164-
"@loopback/express": "^7.0.0",
165-
"@loopback/filter": "^5.0.0",
166-
"@loopback/graphql": "^0.11.0",
167-
"@loopback/health": "^0.14.0",
168-
"@loopback/http-caching-proxy": "^6.0.0",
169-
"@loopback/http-server": "^6.0.0",
170-
"@loopback/logging": "^0.12.0",
171-
"@loopback/metadata": "^7.0.0",
172-
"@loopback/metrics": "^0.14.0",
173-
"@loopback/mock-oauth2-provider": "^0.9.0",
174-
"@loopback/model-api-builder": "^6.0.0",
139+
"@loopback/eslint-config": "^15.0.2",
140+
"@loopback/example-access-control-migration": "^7.0.2",
141+
"@loopback/example-binding-resolution": "^0.10.2",
142+
"@loopback/example-context": "^7.0.2",
143+
"@loopback/example-express-composition": "^7.0.2",
144+
"@loopback/example-file-transfer": "^6.0.2",
145+
"@loopback/example-graphql": "^0.10.2",
146+
"@loopback/example-greeter-extension": "^7.0.2",
147+
"@loopback/example-greeting-app": "^7.0.2",
148+
"@loopback/example-hello-world": "^7.0.2",
149+
"@loopback/example-lb3-application": "^7.0.2",
150+
"@loopback/example-log-extension": "^7.0.2",
151+
"@loopback/example-metrics-prometheus": "^0.13.2",
152+
"@loopback/example-multi-tenancy": "^0.16.2",
153+
"@loopback/example-passport-login": "^6.0.2",
154+
"@loopback/example-references-many": "^8.0.2",
155+
"@loopback/example-rest-crud": "^6.0.2",
156+
"@loopback/example-rpc-server": "^7.0.2",
157+
"@loopback/example-soap-calculator": "^7.0.2",
158+
"@loopback/example-socketio": "^0.9.2",
159+
"@loopback/example-todo": "^8.0.2",
160+
"@loopback/example-todo-list": "^8.0.2",
161+
"@loopback/example-todo-jwt": "^6.0.2",
162+
"@loopback/example-validation-app": "^6.0.2",
163+
"@loopback/example-webpack": "^0.11.2",
164+
"@loopback/express": "^7.0.2",
165+
"@loopback/filter": "^5.0.2",
166+
"@loopback/graphql": "^0.11.2",
167+
"@loopback/health": "^0.14.2",
168+
"@loopback/http-caching-proxy": "^6.0.2",
169+
"@loopback/http-server": "^6.0.2",
170+
"@loopback/logging": "^0.12.2",
171+
"@loopback/metadata": "^7.0.2",
172+
"@loopback/metrics": "^0.14.2",
173+
"@loopback/mock-oauth2-provider": "^0.9.2",
174+
"@loopback/model-api-builder": "^6.0.2",
175175
"@loopback/monorepo": "^0.6.0",
176-
"@loopback/openapi-spec-builder": "^7.0.0",
177-
"@loopback/openapi-v3": "^10.0.0",
178-
"@loopback/pooling": "^0.11.0",
179-
"@loopback/repository": "^7.0.0",
180-
"@loopback/repository-json-schema": "^8.0.0",
181-
"@loopback/repository-tests": "^0.24.0",
182-
"@loopback/rest": "^14.0.0",
183-
"@loopback/rest-crud": "^0.18.0",
184-
"@loopback/rest-explorer": "^7.0.0",
185-
"@loopback/rest-msgpack": "^0.11.0",
186-
"@loopback/security": "^0.11.0",
187-
"@loopback/sequelize": "^0.6.0",
188-
"@loopback/service-proxy": "^7.0.0",
189-
"@loopback/socketio": "^0.8.0",
190-
"@loopback/testlab": "^7.0.0",
191-
"@loopback/tsdocs": "^6.0.0",
192-
"@loopback/typeorm": "^0.10.0",
176+
"@loopback/openapi-spec-builder": "^7.0.2",
177+
"@loopback/openapi-v3": "^10.0.2",
178+
"@loopback/pooling": "^0.11.2",
179+
"@loopback/repository": "^7.0.2",
180+
"@loopback/repository-json-schema": "^8.0.2",
181+
"@loopback/repository-tests": "^0.24.2",
182+
"@loopback/rest": "^14.0.2",
183+
"@loopback/rest-crud": "^0.18.2",
184+
"@loopback/rest-explorer": "^7.0.2",
185+
"@loopback/rest-msgpack": "^0.11.2",
186+
"@loopback/security": "^0.11.2",
187+
"@loopback/sequelize": "^0.6.2",
188+
"@loopback/service-proxy": "^7.0.2",
189+
"@loopback/socketio": "^0.8.2",
190+
"@loopback/testlab": "^7.0.2",
191+
"@loopback/tsdocs": "^6.0.2",
192+
"@loopback/typeorm": "^0.10.2",
193193
"glob": "^8.1.0",
194194
"express-composition": "^1.1.0",
195-
"eslint": "^8.44.0",
196-
"eslint-plugin-mocha": "^10.1.0",
197-
"@typescript-eslint/eslint-plugin": "^5.58.0",
198-
"@typescript-eslint/parser": "^5.58.0",
199-
"eslint-plugin-eslint-plugin": "^5.0.8",
200-
"eslint-config-prettier": "^8.8.0",
195+
"eslint": "^8.57.0",
196+
"eslint-config-prettier": "^9.1.0",
197+
"@typescript-eslint/eslint-plugin": "^7.8.0",
198+
"@typescript-eslint/parser": "^7.8.0",
199+
"eslint-plugin-eslint-plugin": "^5.5.1",
200+
"eslint-plugin-mocha": "^10.4.3",
201201
"@types/js-yaml": "^4.0.5",
202202
"js-yaml": "^4.1.0",
203203
"lodash": "^4.17.21",
204-
"@sourceloop/core": "^14.0.0",
205-
"@sourceloop/cache": "^0.8.0",
206-
"@sourceloop/feature-toggle": "^0.9.0",
207-
"@sourceloop/audit-service": "^12.0.0",
208-
"@sourceloop/authentication-service": "^17.0.0",
209-
"@sourceloop/bpmn-service": "^12.0.1",
210-
"@sourceloop/chat-service": "^10.0.0",
211-
"@sourceloop/feature-toggle-service": "^0.17.0",
212-
"@sourceloop/in-mail-service": "^10.0.0",
213-
"@sourceloop/notification-service": "^12.0.0",
214-
"@sourceloop/payment-service": "^12.0.0",
215-
"@sourceloop/oidc-service": "^0.6.0",
216-
"@sourceloop/reporting-service": "^0.9.0",
217-
"@sourceloop/scheduler-service": "^11.0.0",
218-
"@sourceloop/search-service": "^0.12.0",
219-
"@sourceloop/survey-service": "^0.7.0",
220-
"@sourceloop/task-service": "^0.8.1",
221-
"@sourceloop/user-tenant-service": "^0.16.0",
222-
"@sourceloop/video-conferencing-service": "^11.0.0",
223-
"@sourceloop/audit-log": "^7.0.0",
224-
"@sourceloop/vault": "^7.0.0",
225-
"loopback4-authentication": "^12.0.0",
226-
"loopback4-authorization": "^7.0.0",
227-
"loopback4-soft-delete": "^10.0.0",
228-
"loopback4-ratelimiter": "^7.0.0",
229-
"loopback4-helmet": "^7.0.0",
230-
"loopback4-notifications": "^8.0.0",
204+
"@sourceloop/core": "^14.1.0",
205+
"@sourceloop/cache": "^2.0.1",
206+
"@sourceloop/feature-toggle": "^2.0.1",
207+
"@sourceloop/audit-service": "^14.0.1",
208+
"@sourceloop/authentication-service": "^19.1.3",
209+
"@sourceloop/bpmn-service": "^13.0.1",
210+
"@sourceloop/chat-service": "^11.0.1",
211+
"@sourceloop/feature-toggle-service": "^2.0.1",
212+
"@sourceloop/in-mail-service": "^11.1.2",
213+
"@sourceloop/notification-service": "^13.0.1",
214+
"@sourceloop/payment-service": "^13.0.1",
215+
"@sourceloop/oidc-service": "^2.1.2",
216+
"@sourceloop/reporting-service": "^2.1.2",
217+
"@sourceloop/scheduler-service": "^12.0.1",
218+
"@sourceloop/search-service": "^3.0.2",
219+
"@sourceloop/survey-service": "^2.1.2",
220+
"@sourceloop/task-service": "^2.0.1",
221+
"@sourceloop/user-tenant-service": "^2.1.2",
222+
"@sourceloop/video-conferencing-service": "^13.0.0",
223+
"@sourceloop/audit-log": "^8.0.2",
224+
"@sourceloop/vault": "^7.0.2",
225+
"loopback4-authentication": "^12.0.2",
226+
"loopback4-authorization": "^7.0.2",
227+
"loopback4-soft-delete": "^10.0.2",
228+
"loopback4-ratelimiter": "^7.0.2",
229+
"loopback4-helmet": "^7.0.2",
230+
"loopback4-notifications": "^8.0.3",
231+
"loopback4-dynamic-datasource": "^2.0.1",
231232
"swagger-stats": "^0.99.5",
232233
"@opentelemetry/exporter-jaeger": "^1.15.0",
233234
"@opentelemetry/sdk-trace-node": "^1.15.0",
@@ -240,12 +241,12 @@
240241
"dotenv": "^16.0.3",
241242
"dotenv-extended": "^2.9.0",
242243
"@istanbuljs/nyc-config-typescript": "^1.0.2",
243-
"loopback-datasource-juggler": "^5.0.7",
244+
"loopback-datasource-juggler": "^5.0.9",
244245
"loopback-connector-rest": "^5.0.1",
245-
"loopback-connector-postgresql": "^7.0.4",
246-
"loopback-connector-mysql": "^7.0.8",
246+
"loopback-connector-postgresql": "^7.1.1",
247+
"loopback-connector-mysql": "^7.0.10",
247248
"loopback-connector-kv-redis": "^4.0.0",
248-
"loopback-connector": "^6.1.3",
249+
"loopback-connector": "^6.1.5",
249250
"db-migrate-pg": "^1.3.0",
250251
"db-migrate-mysql": "^2.2.0",
251252
"kindof": "^2.0.0",

packages/cli/src/generators/scaffold/index.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
//
33
// This software is released under the MIT License.
44
// https://opensource.org/licenses/MIT
5-
import {BaseGenerator} from '../../base-generator';
6-
import {ScaffoldOptions} from '../../types';
5+
import { BaseGenerator } from '../../base-generator';
6+
import { ScaffoldOptions } from '../../types';
77
// eslint-disable-next-line @typescript-eslint/naming-convention
88
import BackstageIntegrationGenerator from '../backstage-integration';
99
export default class ScaffoldGenerator extends BaseGenerator<ScaffoldOptions> {
@@ -34,11 +34,19 @@ export default class ScaffoldGenerator extends BaseGenerator<ScaffoldOptions> {
3434
this.options,
3535
);
3636
}
37+
await this._addDocs();
3738
}
3839

3940
async install() {
4041
await this.spawnCommand('npm', ['i']);
4142
}
43+
async _addDocs() {
44+
const sourcePath = `${this.destinationRoot()}/README.md`;
45+
const destinationPath = `${this.destinationRoot()}/docs/README.md`;
46+
/* eslint-disable-next-line @typescript-eslint/ban-ts-comment */
47+
//@ts-ignore
48+
await this.fs.copyTplAsync(sourcePath, destinationPath);
49+
}
4250

4351
private _setRoot() {
4452
if (this.options.cwd) {

0 commit comments

Comments
 (0)