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 Jul 28, 2023
2 parents 5926409 + 940c617 commit 49d4236
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/nodejs-win.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:

strategy:
matrix:
node: ['lts/*', '19']
node: ['lts/*']
os: [windows-latest]

steps:
Expand Down
9 changes: 5 additions & 4 deletions .mocharc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ bail: true
full-trace: true
enable-source-maps: true
require:
- ts-node/register
# for cjs
# - ts-node/register
- tsconfig-paths/register.js
- test/root.hooks.ts
#loader:
# - ts-node/esm
loader:
- ts-node/esm
spec:
- test/**/*.test.ts
timeout: 120000
timeout: 90000
ui: bdd
parallel: false
exit: true
Expand Down
6 changes: 3 additions & 3 deletions packages/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@
"clean": "npm run clean:lock & npm run clean:cache & rm -rf dist/*",
"clean:cache": "rm -rf .eslintcache .tsbuildinfo",
"clean:lock": "rm package-lock.json -f",
"cov": "cross-env TS_NODE_PROJECT=test/tsconfig.json c8 mocha --loader=ts-node/esm --parallel=false",
"cov": "cross-env TS_NODE_PROJECT=test/tsconfig.json c8 mocha --parallel=false",
"lint": "eslint --fix --cache {src,test}/**/*.ts",
"lint:nofix": "eslint --cache {src,test}/**/*.ts",
"purge": "npm run clean && rm node_modules -rf",
"rp": "rollup -c rollup.config.js --context this",
"prepack": "rm -f dist/tsconfig.tsbuildinfo",
"pretest": "npm run build",
"pretest:local": "npm run build",
"test": "cross-env TS_NODE_PROJECT=test/tsconfig.json mocha --loader=ts-node/esm",
"test:local": "cross-env TS_NODE_PROJECT=test/tsconfig.json ../../node_modules/.bin/mocha --loader=ts-node/esm --parallel=false",
"test": "cross-env TS_NODE_PROJECT=test/tsconfig.json mocha",
"test:local": "cross-env TS_NODE_PROJECT=test/tsconfig.json ../../node_modules/.bin/mocha",
"tsc": "tsc -b "
}
}

0 comments on commit 49d4236

Please sign in to comment.