Skip to content

Commit

Permalink
Merge pull request #333 from ladesa-ro/dev/gabriel
Browse files Browse the repository at this point in the history
chore: give consistent package names
  • Loading branch information
guesant authored Oct 11, 2024
2 parents cdc0ecb + 2b78265 commit 44a7de0
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 29 deletions.
2 changes: 2 additions & 0 deletions .changeset/famous-chefs-flow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store HUSKY=0 pnpm install --frozen-

RUN pnpm run -r build

RUN pnpm deploy --filter=@ladesa-ro/api-service --prod "/ldsa/.builds/api-service"
RUN pnpm deploy --filter=@ladesa-ro/api.service --prod "/ldsa/.builds/api-service"

RUN pnpm deploy --filter=@ladesa-ro/api-client-fetch --prod "/ldsa/.builds/npm-api-client-fetch"
RUN cp "/ldsa/integrations/npm/api-client-fetch/docs" -r "/ldsa/.builds/npm-api-client-fetch/docs"
Expand Down
2 changes: 1 addition & 1 deletion api-service/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@ladesa-ro/api-service",
"name": "@ladesa-ro/api.service",
"version": "0.0.0-freezed.0",
"private": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion api-service/src/app.controller.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ describe("AppController", () => {
describe("root", () => {
it('should return "Hello World!"', () => {
expect(appController.getHello()).toEqual({
service: "@ladesa-ro/api",
service: "@ladesa-ro/api.service",
status: "up",
});
});
Expand Down
2 changes: 1 addition & 1 deletion api-service/src/app.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class AppController {
properties: {
service: {
type: "string",
enum: ["@ladesa-ro/api"],
enum: ["@ladesa-ro/api.service"],
description: "O nome desta aplicação.",
},
status: {
Expand Down
2 changes: 1 addition & 1 deletion api-service/src/app.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export class AppService {
getHello() {
return {
status: "up",
service: "@ladesa-ro/api",
service: "@ladesa-ro/api.service",
prefix: this.configService.getRuntimePrefix(),
version: this.configService.getRuntimeVersion(),
};
Expand Down
3 changes: 2 additions & 1 deletion integrations/npm/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"private": "true",
"name": "@ladesa-ro/api.internal.integrations.npm",
"private": true,
"scripts": {
"build": "wireit"
},
Expand Down
2 changes: 1 addition & 1 deletion integrations/openapi-json/generated.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"properties": {
"service": {
"type": "string",
"enum": ["@ladesa-ro/api"],
"enum": ["@ladesa-ro/api.service"],
"description": "O nome desta aplicação."
},
"status": {
Expand Down
23 changes: 3 additions & 20 deletions integrations/openapi-json/package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"name": "@ladesa-ro/api-service-openapi-json",
"version": "1.0.0-alpha.21",
"license": "MIT",
"description": "LADESA - Biblioteca com especificação OpenAPI/Swagger - Pacote NPM.",
"name": "@ladesa-ro/api.integrations.openapi-json",
"files": ["generated.json"],
"scripts": {
"build": "wireit",
Expand All @@ -13,7 +10,7 @@
"dependencies": ["generate"]
},
"generate": {
"command": "OUT_FILE=$(pwd)/generated.json pnpm run --filter '@ladesa-ro/api-service' generate:openapi && pnpm run -w code-static:fix $(pwd)/generated.json"
"command": "OUT_FILE=$(pwd)/generated.json pnpm run --filter '@ladesa-ro/api.service' generate:openapi && pnpm run -w code-static:fix $(pwd)/generated.json"
}
},
"devDependencies": {
Expand All @@ -23,19 +20,5 @@
"typedoc-plugin-mdn-links": "^3.3.2",
"typescript": "^5.6.3",
"wireit": "^0.14.9"
},
"publishConfig": {
"provenance": true,
"access": "public"
},
"homepage": "https://github.com/ladesa-ro/api/tree/development/integrations/openapi-json#readme",
"repository": {
"type": "git",
"url": "https://github.com/ladesa-ro/api.git"
},
"author": "Gabriel R. Antunes <gabrielrodantunes@gmail.com>",
"bugs": {
"url": "https://github.com/ladesa-ro/api/issues"
},
"keywords": ["ladesa-ro", "api", "api-client", "fetch", "sisgha", "sisgea"]
}
}
3 changes: 2 additions & 1 deletion integrations/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"private": "true",
"name": "@ladesa-ro/api.internal.integrations",
"private": true,
"scripts": {
"build": "wireit"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@ladesa-ro/api-root",
"name": "@ladesa-ro/api.internal.root",
"version": "0.0.0-freezed.0",
"private": true,
"scripts": {
Expand Down

0 comments on commit 44a7de0

Please sign in to comment.