Skip to content

Commit

Permalink
Merge remote-tracking branch 'bp/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
waitingsong committed May 9, 2024
2 parents ed86d87 + 9541d18 commit 6412d93
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
3 changes: 2 additions & 1 deletion .githooks/init-repo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ fi;
echo It may going for a long time. Plese wait...
.githooks/gen-file-from-example.mts

nx reset
lerna list
set +e
nx reset
echo init done
3 changes: 1 addition & 2 deletions bin-hashbang.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { basename } from 'node:path'
import { readFile, writeFile } from 'node:fs/promises'
import assert from 'node:assert'

import pkg from './package.json' assert { type: 'json' }
import pkg from './package.json' with { type: 'json' }

let name = pkg.name

Expand Down Expand Up @@ -58,7 +58,6 @@ function parseName(name) {
else {
throw new TypeError('name invalid')
}
return name
}


3 changes: 2 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ const srcRules = {
optionalDependencies: false,
bundledDependencies: false,
packageDir: [
'./',
'.',
await genModuleAbsolutePathIfExists(projectDir, 'node_modules/@waiting/shared-core') ?? '.',
await genModuleAbsolutePathIfExists(projectDir, 'node_modules/@mwcp/share') ?? '.',
],
}],
Expand Down
17 changes: 8 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,25 @@
"devDependencies": {
"@commitlint/cli": "19",
"@commitlint/config-conventional": "19",
"@midwayjs/mock": "^3.15.8",
"@midwayjs/swagger": "^3.15.8",
"@midwayjs/validate": "^3.15.8",
"@midwayjs/mock": "^3.16.0",
"@midwayjs/swagger": "^3.16.1",
"@midwayjs/validate": "^3.16.1",
"@types/koa": "2",
"@types/koa": "2",
"@types/mocha": "10",
"@types/node": "20",
"@waiting/eslint-config": "^10.25.0",
"@waiting/shared-core": "^23.5.1",
"@waiting/shared-types": "^23.4.0",
"@waiting/eslint-config": "^10.25.1",
"@waiting/shared-core": "^23.8.0",
"@waiting/shared-types": "^23.6.0",
"autocannon": "7",
"coveralls": "3",
"cross-env": "7",
"debug": "^4.3.4",
"eslint": "8",
"mocha": "10",
"mocha-lcov-reporter": "1",
"mwtsc": "^1.7.2",
"mwtsc": "^1.8.1",
"nx": "18",
"swagger-ui-dist": "^5.16.2",
"swagger-ui-dist": "^5.17.6",
"ts-node": "^10.9.2",
"tsc-alias": "^1.8.8",
"typescript": "^5.4.5"
Expand Down
4 changes: 2 additions & 2 deletions packages/mw-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
},
"license": "MIT",
"dependencies": {
"@mwcp/otel": "25 - 26",
"@mwcp/share": "25 - 26"
"@mwcp/otel": "^26.5.0",
"@mwcp/share": "^26.5.0"
},
"devDependencies": {
},
Expand Down
2 changes: 1 addition & 1 deletion rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { basename, dirname } from 'node:path'
import assert from 'node:assert'

import pkg from './package.json' assert { type: 'json' }
import pkg from './package.json' with { type: 'json' }

// `npm run build` -> `production` is true
// `npm run dev` -> `production` is false
Expand Down

0 comments on commit 6412d93

Please sign in to comment.