diff --git a/packages/fetch/package.json b/packages/fetch/package.json index bba84df1..286859de 100644 --- a/packages/fetch/package.json +++ b/packages/fetch/package.json @@ -34,41 +34,46 @@ "dependencies": { "@opentelemetry/api": "*", "@types/qs": "^6.9.7", - "@waiting/shared-core": "^21.2.1", - "@waiting/shared-types": "^21.2.0", + "@waiting/shared-core": "^21.5.0", + "@waiting/shared-types": "^21.5.0", "form-data": "^4.0.0", - "qs": "^6.11.1", - "undici": "*" + "qs": "^6.11.2", + "undici": ">=5.23" }, "devDependencies": { - "cross-env": "7" }, "engines": { "node": ">=18.12.0" }, "files": [ + "README.*.md", + "Dockerfile", + "npm-shrinkwrap.json", "tsconfig.json", + "tsconfig.base.json", "src/**/*.ts", "bin/*.js", - "dist" + "dist", + "!**/*.spec.*", + "!**/*.tsbuildinfo" ], "publishConfig": { "access": "public" }, "scripts": { "build": "npm run tsc && tsc-alias && npm run rp", - "clean": "npm run clean:lock & npm run clean:cache & rm -rf dist/*", - "clean:cache": "rm -rf .eslintcache .vscode/.tsbuildinfo .vscode/.tsbuildinfo.*", + "clean": "npm run clean:lock && npm run clean:cache && npm run clean:dist && npm run clean:log", + "clean:cache": "rm -rf .eslintcache .tsbuildinfo", + "clean:dist": "rm -rf dist/* .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", + "clean:log": "rm -rf ./logs ./run", + "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", - "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 " } } diff --git a/packages/fetch/tsconfig.json b/packages/fetch/tsconfig.json index f106b10f..ffcbb947 100644 --- a/packages/fetch/tsconfig.json +++ b/packages/fetch/tsconfig.json @@ -1,23 +1,3 @@ { - "extends": "../../tsconfig.json", - "compilerOptions": { - "baseUrl": ".", - "incremental": true, - "outDir": "dist", - "paths": { - "~/*": ["./src/*"], - "@/*": ["./test/*"] - }, - "tsBuildInfoFile": ".tsbuildinfo" - }, - "ts-node": { - "esm": true, - "experimentalResolver": true, - "experimentalSpecifierResolution": "node", - "preferTsExts": true, - "transpileOnly": false - }, - "include": [ - "src/**/*.ts" - ] + "extends": "./tsconfig.base.json" } diff --git a/packages/midway-component-fetch/package.json b/packages/midway-component-fetch/package.json index 9dc3c4f9..cd91b379 100644 --- a/packages/midway-component-fetch/package.json +++ b/packages/midway-component-fetch/package.json @@ -26,7 +26,7 @@ "dependencies": { "@mwcp/otel": "7 - 12", "@waiting/fetch": "^23.3.2", - "@waiting/shared-core": "^21.2.1" + "@waiting/shared-core": "^21.5.0" }, "devDependencies": { "@mwcp/share": "6 - 8" @@ -62,8 +62,6 @@ "dev:debug": "cross-env MIDWAY_SERVER_ENV=local NODE_DEBUG=midway* ../../node_modules/.bin/midway-bin dev --ts", "lint": "eslint --fix --cache {src,test}/**/*.ts", "lint:nofix": "eslint --cache {src,test}/**/*.ts", - "pretest": "npm run build", - "pretest:local": "npm run build", "purge": "npm run clean && rm node_modules -rf && rm package-lock.json -f", "start": "node bootstrap.js", "test": "cross-env MIDWAY_SERVER_ENV=unittest TS_NODE_PROJECT=test/tsconfig.json mocha ",