Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade typeorm #41

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 12 additions & 21 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,61 +1,52 @@
version: 2

defaults: &defaults
working_directory: ~/repo
docker:
- image: circleci/node:erbium
- image: cimg/node:18.1.0

jobs:
build:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: ~/repo
- run: npm i -g pnpm && pnpm -v
- run:
name: Install dependencies
command: yarn
- run:
name: Bootstrap monorepo
command: yarn run bootstrap
command: pnpm i --frozen-lockfile
- run:
name: Lint
command: yarn run lint
command: pnpm run lint --recursive
- run:
name: Build
command: yarn run build
command: pnpm run build --recursive
- run:
name: Test
command: yarn run test
command: pnpm run test --recursive


deploy:
<<: *defaults
steps:
- checkout
- attach_workspace:
at: ~/repo
- run: npm i -g pnpm
- run:
name: Install dependencies
command: yarn
- run:
name: Bootstrap monorepo
command: yarn run bootstrap
command: pnpm i --frozen-lockfile
- run:
name: Lint
command: yarn run lint
command: pnpm run lint --recursive
- run:
name: Build
command: yarn run build
command: pnpm run build --recursive
- run:
name: Test
command: yarn run test
command: pnpm run test --recursive
- run:
name: Authenticate with registry
command: echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/repo/.npmrc
- run:
name: Publish
command: npx lerna publish from-package --yes
command: pnpm publish

workflows:
version: 2
Expand Down
8 changes: 0 additions & 8 deletions lerna.json

This file was deleted.

40 changes: 13 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,41 +4,27 @@
"description": "",
"private": true,
"scripts": {
"bootstrap": "lerna bootstrap",
"build": "lerna run build",
"lint": "lerna run lint",
"lint:fix": "lerna run lint:fix",
"test": "yarn run test:unit && yarn run test:integration --passWithNoTests",
"test": "pnpm run test:unit && pnpm run test:integration --passWithNoTests",
"test:unit": "dotenv -- jest \"packages\\/.*[\\/]?(src\\/.+\\.|/)spec\\.ts$\"",
"test:unit:coverage": "yarn run test:unit --coverage",
"test:unit:ci": "yarn run test:unit -w 8",
"test:unit:watch": "yarn run test:unit --watch",
"test:integration": "yarn run test:integration:run",
"test:integration:watch": "yarn run test:integration:run --watch",
"test:unit:coverage": "pnpm run test:unit --coverage",
"test:unit:ci": "pnpm run test:unit -w 8",
"test:unit:watch": "pnpm run test:unit --watch",
"test:integration": "pnpm run test:integration:run",
"test:integration:watch": "pnpm run test:integration:run --watch",
"test:integration:run": "dotenv -- jest \"$TEST_SCOPE[\\/]?(src\\/.+\\.|/)integration\\.ts$\"",
"test:integration:run:ci": "yarn run test:integration:run -w 8"
"test:integration:run:ci": "pnpm run test:integration:run -w 8"
},
"author": "Andrew den Hertog <andrew.denhertog@gmail.com>",
"license": "MIT",
"dependencies": {},
"devDependencies": {
"@node-ts/code-standards": "^0.0.10",
"@types/jest": "^24.0.11",
"dotenv-cli": "^3.0.0",
"jest": "^24.5.0",
"lerna": "^3.10.5",
"@types/jest": "^27.5.1",
"dotenv-cli": "^5.1.0",
"jest": "^28.1.0",
"reflect-metadata": "^0.1.13",
"ts-jest": "^24.0.0",
"tslib": "^1.9.3",
"typescript": "^3.3.3333"
},
"workspaces": {
"nohoist": [
"**"
],
"packages": [
"packages/*"
]
"ts-jest": "^28.0.2",
"tslib": "^2.4.0",
"typescript": "^4.6.4"
},
"jest": {
"collectCoverageFrom": [
Expand Down
8 changes: 4 additions & 4 deletions packages/ddd-example/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ The monitoring company can then dispatch security personel to go investigate and
To run this application:

```bash
yarn
yarn bootstrap
yarn build
pnpm
pnpm bootstrap
pnpm build
cd packages/ddd-example
yarn dev
pnpm dev
```

## Application structure
Expand Down
40 changes: 20 additions & 20 deletions packages/ddd-example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
"private": true,
"scripts": {
"build": "tsc --project tsconfig.json --stripInternal --outDir dist/ --declaration",
"dev": "nodemon --watch ./src -e ts --exec \"yarn dev:run\"",
"dev:run": "yarn run build && node dist/index.js",
"lint": "yarn lint:ts",
"dev": "nodemon --watch ./src -e ts --exec \"pnpm dev:run\"",
"dev:run": "pnpm run build && node dist/index.js",
"lint": "pnpm lint:ts",
"lint:ts": "tslint --project tsconfig.json 'src/**/*.ts'",
"lint:fix": "yarn lint --fix",
"lint:fix": "pnpm lint --fix",
"publish:packages": "npm publish --access=public",
"test": "jest \"(src\\/.+\\.|/)spec\\.ts$\"",
"test:coverage": "yarn run test --coverage",
"test:ci": "yarn run test -w 8",
"test:watch": "yarn run test --watch"
"test:coverage": "pnpm run test --coverage",
"test:ci": "pnpm run test -w 8",
"test:watch": "pnpm run test --watch"
},
"keywords": [
"typescript",
Expand All @@ -32,26 +32,26 @@
],
"devDependencies": {
"@node-ts/code-standards": "^0.0.10",
"@node-ts/logger-core": "^0.0.13",
"@types/jest": "^24.0.9",
"inversify": "^5.0.1",
"jest": "^24.1.0",
"nodemon": "^1.18.10",
"ts-jest": "^24.0.0",
"tslint": "^5.13.0",
"@node-ts/logger-core": "^0.1.1",
"@types/jest": "^27.5.1",
"inversify": "^6.0.1",
"jest": "^28.1.0",
"nodemon": "^2.0.16",
"ts-jest": "^28.0.2",
"tslint": "^6.1.3",
"typemoq": "^2.1.0",
"typescript": "^3.3.3333"
"typescript": "^4.6.4"
},
"peerDependencies": {
"@node-ts/logger-core": "^0.0.9",
"inversify": "^5.0.1"
},
"dependencies": {
"@node-ts/bus-messages": "^0.1.0",
"@node-ts/ddd": "^0.1.6",
"@node-ts/ddd-types": "^0.1.4",
"change-case": "^3.1.0",
"@node-ts/bus-messages": "^1.0.4",
"@node-ts/ddd": "workspace:^0.1.6",
"@node-ts/ddd-types": "workspace:^0.1.4",
"change-case": "^4.1.2",
"reflect-metadata": "^0.1.13",
"typeorm": "^0.2.29"
"typeorm": "^0.3.6"
}
}
Loading