Skip to content

Commit

Permalink
Merge branch 'main' into feature/user-password-history
Browse files Browse the repository at this point in the history
  • Loading branch information
MrMaz committed Jul 19, 2024
2 parents 2366273 + dfec8b2 commit 9fb2c92
Show file tree
Hide file tree
Showing 8 changed files with 18,960 additions and 13,782 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/ci-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ jobs:
node-version: [18.x]
steps:
- uses: actions/checkout@v2
- name: Enable Corepack
run: corepack enable
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
Expand All @@ -22,8 +24,10 @@ jobs:
path: "**/node_modules"
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

- name: Install and build
run: yarn --frozen-lockfile
- name: Install
run: yarn --immutable
- name: Build
run: yarn build
- name: Unit tests
run: yarn test:ci
- name: Process Test Results
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/ci-pr-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Enable Corepack
run: corepack enable
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v2
with:
Expand All @@ -24,8 +26,10 @@ jobs:
path: '**/node_modules'
key: ${{ runner.os }}-modules-${{ hashFiles('**/yarn.lock') }}

- name: Install and build
run: yarn --frozen-lockfile
- name: Install
run: yarn --immutable
- name: Build
run: yarn build
- name: Linting
run: yarn lint
- name: Unit tests
Expand Down
1 change: 1 addition & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
nodeLinker: node-modules
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
"typescript": "^4.3.5"
},
"scripts": {
"postinstall": "husky install",
"clean": "./node_modules/.bin/rimraf packages/*/dist packages/*/tsconfig.tsbuildinfo docs",
"build": "./node_modules/.bin/tsc --build",
"watch": "yarn build && ./node_modules/.bin/tsc --build --watch",
Expand All @@ -64,7 +65,6 @@
"lint:md": "markdownlint README.md packages/**/*.md",
"lint:md:fix": "yarn lint:md --fix",
"test": "jest --testTimeout 30000",
"prepare": "husky install && yarn clean && yarn build",
"test:watch": "jest --watch",
"test:cov": "jest --coverage",
"test:ci": "yarn test:cov --ci --reporters=default --reporters=jest-junit",
Expand All @@ -77,5 +77,6 @@
"changelog:minor": "standard-version --release-as minor",
"changelog:patch": "standard-version --release-as patch",
"changelog:major": "standard-version --release-as major"
}
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion packages/nestjs-samples/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"main": "dist/index.js",
"types": "dist/index.d.ts",
"license": "BSD-3-Clause",
"private": "true",
"private": true,
"publishConfig": {
"access": "restricted"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Logger, Module } from '@nestjs/common';
import { Module } from '@nestjs/common';
import { MailerModule, MailerService } from '@nestjs-modules/mailer';
import { EmailModule, EmailService } from '@concepta/nestjs-email';
import { EmailModule } from '@concepta/nestjs-email';
import { NotificationController } from './notification.controller';

@Module({
Expand All @@ -12,6 +12,5 @@ import { NotificationController } from './notification.controller';
}),
],
controllers: [NotificationController],
providers: [Logger, EmailService],
})
export class NotificationModule {}
2 changes: 1 addition & 1 deletion packages/nestjs-swagger-ui/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ All of the options in the official docs for
[NestJS OpenApi](https://docs.nestjs.com/openapi) are supported.

To see how they are mapped to the registration options `settings` property,
see the [SwaggerUiSettingsInterface](./src/interfaces/swagger-ui-settings.interface.ts)
see the [SwaggerUiSettingsInterface](https://github.com/conceptadev/rockets/blob/main/packages/nestjs-swagger-ui/src/interfaces/swagger-ui-settings.interface.ts)
Loading

0 comments on commit 9fb2c92

Please sign in to comment.