diff --git a/.changeset/tricky-paws-hear.md b/.changeset/tricky-paws-hear.md new file mode 100644 index 00000000..d2920a2e --- /dev/null +++ b/.changeset/tricky-paws-hear.md @@ -0,0 +1,10 @@ +--- +"@tus/azure-store": major +"@tus/file-store": major +"@tus/gcs-store": major +"@tus/s3-store": major +"@tus/server": major +"@tus/utils": minor +--- + +Make this package ESM-only instead of CommonJS. Since Node.js >= 20.19.0 you can `require(esm)` so you can consume this package even if you don't ESM yourself yet. diff --git a/biome.json b/biome.json index 09af213a..9bb83bdb 100644 --- a/biome.json +++ b/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/1.8.3/schema.json", + "$schema": "https://biomejs.dev/schemas/1.9.0/schema.json", "organizeImports": { "enabled": true }, diff --git a/package-lock.json b/package-lock.json index e13bd93e..119ff1cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1577,17 +1577,6 @@ "prettier": "^2.7.1" } }, - "node_modules/@cspotcode/source-map-support": { - "version": "0.8.1", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/trace-mapping": "0.3.9" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/@google-cloud/paginator": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.2.tgz", @@ -1776,28 +1765,6 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "dev": true, - "license": "MIT" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.9", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" - } - }, "node_modules/@manypkg/find-root": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@manypkg/find-root/-/find-root-1.1.0.tgz", @@ -2722,26 +2689,6 @@ "node": ">= 10" } }, - "node_modules/@tsconfig/node10": { - "version": "1.0.9", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node12": { - "version": "1.0.11", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node14": { - "version": "1.0.3", - "dev": true, - "license": "MIT" - }, - "node_modules/@tsconfig/node16": { - "version": "1.0.4", - "dev": true, - "license": "MIT" - }, "node_modules/@tus/azure-store": { "resolved": "packages/azure-store", "link": true @@ -3066,25 +3013,6 @@ "node": ">= 0.6" } }, - "node_modules/acorn": { - "version": "8.10.0", - "dev": true, - "license": "MIT", - "bin": { - "acorn": "bin/acorn" - }, - "engines": { - "node": ">=0.4.0" - } - }, - "node_modules/acorn-walk": { - "version": "8.2.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4.0" - } - }, "node_modules/agent-base": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", @@ -3152,11 +3080,6 @@ "node": ">= 8" } }, - "node_modules/arg": { - "version": "4.1.3", - "dev": true, - "license": "MIT" - }, "node_modules/argparse": { "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", @@ -3454,11 +3377,6 @@ "dev": true, "license": "MIT" }, - "node_modules/create-require": { - "version": "1.1.1", - "dev": true, - "license": "MIT" - }, "node_modules/cross-spawn": { "version": "7.0.6", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", @@ -4688,11 +4606,6 @@ "node": ">=10" } }, - "node_modules/make-error": { - "version": "1.3.6", - "dev": true, - "license": "ISC" - }, "node_modules/math-intrinsics": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -6069,56 +5982,6 @@ "dev": true, "license": "MIT" }, - "node_modules/ts-node": { - "version": "10.9.2", - "dev": true, - "license": "MIT", - "dependencies": { - "@cspotcode/source-map-support": "^0.8.0", - "@tsconfig/node10": "^1.0.7", - "@tsconfig/node12": "^1.0.7", - "@tsconfig/node14": "^1.0.0", - "@tsconfig/node16": "^1.0.2", - "acorn": "^8.4.1", - "acorn-walk": "^8.1.1", - "arg": "^4.1.0", - "create-require": "^1.1.0", - "diff": "^4.0.1", - "make-error": "^1.1.1", - "v8-compile-cache-lib": "^3.0.1", - "yn": "3.1.1" - }, - "bin": { - "ts-node": "dist/bin.js", - "ts-node-cwd": "dist/bin-cwd.js", - "ts-node-esm": "dist/bin-esm.js", - "ts-node-script": "dist/bin-script.js", - "ts-node-transpile-only": "dist/bin-transpile.js", - "ts-script": "dist/bin-script-deprecated.js" - }, - "peerDependencies": { - "@swc/core": ">=1.2.50", - "@swc/wasm": ">=1.2.50", - "@types/node": "*", - "typescript": ">=2.7" - }, - "peerDependenciesMeta": { - "@swc/core": { - "optional": true - }, - "@swc/wasm": { - "optional": true - } - } - }, - "node_modules/ts-node/node_modules/diff": { - "version": "4.0.2", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/tslib": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.7.0.tgz", @@ -6187,11 +6050,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/v8-compile-cache-lib": { - "version": "3.0.1", - "dev": true, - "license": "MIT" - }, "node_modules/webidl-conversions": { "version": "3.0.1", "dev": true, @@ -6330,14 +6188,6 @@ "node": ">=8" } }, - "node_modules/yn": { - "version": "3.1.1", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/yocto-queue": { "version": "0.1.0", "dev": true, @@ -6477,8 +6327,7 @@ "node-mocks-http": "^1.16.1", "should": "^13.2.3", "sinon": "^18.0.0", - "supertest": "^6.3.4", - "ts-node": "^10.9.2" + "supertest": "^6.3.4" }, "engines": { "node": ">=20.19.0" @@ -6498,8 +6347,7 @@ "@types/node": "^22.13.7", "ioredis": "^5.4.1", "mocha": "^11.0.1", - "should": "^13.2.3", - "ts-node": "^10.9.2" + "should": "^13.2.3" }, "engines": { "node": ">=20.19.0" @@ -6524,8 +6372,7 @@ "should": "^13.2.3", "sinon": "^18.0.0", "supertest": "^6.3.4", - "throttle": "^1.0.3", - "ts-node": "^10.9.2" + "throttle": "^1.0.3" } } } diff --git a/package.json b/package.json index 56186483..9b5d9cf9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,10 @@ { "$schema": "https://json.schemastore.org/package.json", "private": true, - "workspaces": ["packages/*", "test"], + "workspaces": [ + "packages/*", + "test" + ], "scripts": { "build": "tsc --build", "lint": "biome lint --write .", diff --git a/packages/azure-store/package.json b/packages/azure-store/package.json index 554a5674..5fe571c7 100644 --- a/packages/azure-store/package.json +++ b/packages/azure-store/package.json @@ -3,20 +3,22 @@ "name": "@tus/azure-store", "version": "1.0.0", "description": "Azure blob storage for @tus/server", - "main": "dist/index.js", + "main": "./dist/index.js", + "exports": "./dist/index.js", + "type": "module", "homepage": "https://github.com/tus/tus-node-server#readme", "bugs": "https://github.com/tus/tus-node-server/issues", "repository": "tus/tus-node-server", "files": [ - "README.md", - "LICENSE", "dist", - "src" + "src", + "!test*" ], "license": "MIT", "scripts": { "build": "tsc --build", - "test": "mocha --exit --extension ts --require ts-node/register" + "pretest": "tsc --build", + "test": "mocha './dist/test/*.js' --exit" }, "dependencies": { "@tus/utils": "^0.5.0", diff --git a/packages/azure-store/test/index.ts b/packages/azure-store/src/test/index.ts similarity index 90% rename from packages/azure-store/test/index.ts rename to packages/azure-store/src/test/index.ts index 1a9b567c..b2f19026 100644 --- a/packages/azure-store/test/index.ts +++ b/packages/azure-store/src/test/index.ts @@ -1,7 +1,7 @@ import 'should' import path from 'node:path' -import {AzureStore} from '../src' -import * as shared from 'test/stores.test' +import {AzureStore} from '@tus/azure-store' +import * as shared from '../../../utils/dist/test/stores.js' const fixturesPath = path.resolve('../', '../', 'test', 'fixtures') const storePath = path.resolve('../', '../', 'test', 'output', 'azure-store') diff --git a/packages/azure-store/tsconfig.build.json b/packages/azure-store/tsconfig.build.json deleted file mode 100644 index 06719e77..00000000 --- a/packages/azure-store/tsconfig.build.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [{ "path": "../utils/tsconfig.build.json" }], - "extends": "../../tsconfig.base.json", - "include": ["src"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - } -} diff --git a/packages/azure-store/tsconfig.json b/packages/azure-store/tsconfig.json index 823c3da5..51a2b81f 100644 --- a/packages/azure-store/tsconfig.json +++ b/packages/azure-store/tsconfig.json @@ -1,12 +1,10 @@ { "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [ - { "path": "./tsconfig.build.json" }, - { "path": "../../test/tsconfig.json" } - ], "extends": "../../tsconfig.base.json", - "exclude": ["src"], + "references": [{ "path": "../utils/tsconfig.json" }], + "include": ["src"], "compilerOptions": { - "noEmit": true + "rootDir": "src", + "outDir": "dist", } } diff --git a/packages/file-store/package.json b/packages/file-store/package.json index ef948036..304bd85d 100644 --- a/packages/file-store/package.json +++ b/packages/file-store/package.json @@ -3,15 +3,22 @@ "name": "@tus/file-store", "version": "1.5.1", "description": "Local file storage for @tus/server", - "main": "dist/index.js", + "main": "./dist/index.js", + "exports": "./dist/index.js", + "type": "module", "homepage": "https://github.com/tus/tus-node-server#readme", "bugs": "https://github.com/tus/tus-node-server/issues", "repository": "tus/tus-node-server", - "files": ["README.md", "LICENSE", "dist", "src"], + "files": [ + "dist", + "src", + "!test*" + ], "license": "MIT", "scripts": { "build": "tsc --build", - "test": "mocha --exit --extension ts --require ts-node/register" + "pretest": "tsc --build", + "test": "mocha './dist/test/*.js' --exit" }, "dependencies": { "@tus/utils": "^0.5.0", diff --git a/packages/file-store/src/index.ts b/packages/file-store/src/index.ts index e54af0f8..43231c5f 100644 --- a/packages/file-store/src/index.ts +++ b/packages/file-store/src/index.ts @@ -7,10 +7,10 @@ import type http from 'node:http' import debug from 'debug' -import {type Configstore, FileConfigstore} from './configstores' +import {type Configstore, FileConfigstore} from './configstores/index.js' import {DataStore, Upload, ERRORS} from '@tus/utils' -export * from './configstores' +export * from './configstores/index.js' type Options = { directory: string diff --git a/packages/file-store/test/index.ts b/packages/file-store/src/test/index.ts similarity index 96% rename from packages/file-store/test/index.ts rename to packages/file-store/src/test/index.ts index 21d7ed3e..0c490581 100644 --- a/packages/file-store/test/index.ts +++ b/packages/file-store/src/test/index.ts @@ -7,10 +7,10 @@ import path from 'node:path' import sinon from 'sinon' -import {FileStore, FileConfigstore} from '../src' +import {FileStore, FileConfigstore} from '@tus/file-store' import {Upload} from '@tus/utils' -import * as shared from 'test/stores.test' +import * as shared from '../../../utils/dist/test/stores.js' const fixturesPath = path.resolve('../', '../', 'test', 'fixtures') const storePath = path.resolve('../', '../', 'test', 'output', 'file-store') diff --git a/packages/file-store/tsconfig.build.json b/packages/file-store/tsconfig.build.json deleted file mode 100644 index 06719e77..00000000 --- a/packages/file-store/tsconfig.build.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [{ "path": "../utils/tsconfig.build.json" }], - "extends": "../../tsconfig.base.json", - "include": ["src"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - } -} diff --git a/packages/file-store/tsconfig.json b/packages/file-store/tsconfig.json index 823c3da5..51a2b81f 100644 --- a/packages/file-store/tsconfig.json +++ b/packages/file-store/tsconfig.json @@ -1,12 +1,10 @@ { "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [ - { "path": "./tsconfig.build.json" }, - { "path": "../../test/tsconfig.json" } - ], "extends": "../../tsconfig.base.json", - "exclude": ["src"], + "references": [{ "path": "../utils/tsconfig.json" }], + "include": ["src"], "compilerOptions": { - "noEmit": true + "rootDir": "src", + "outDir": "dist", } } diff --git a/packages/gcs-store/package.json b/packages/gcs-store/package.json index 72133943..a5e1635d 100644 --- a/packages/gcs-store/package.json +++ b/packages/gcs-store/package.json @@ -3,20 +3,22 @@ "name": "@tus/gcs-store", "version": "1.4.2", "description": "Google Cloud Storage for @tus/server", - "main": "dist/index.js", + "main": "./dist/index.js", + "exports": "./dist/index.js", + "type": "module", "homepage": "https://github.com/tus/tus-node-server#readme", "bugs": "https://github.com/tus/tus-node-server/issues", "repository": "tus/tus-node-server", "license": "MIT", "files": [ - "README.md", - "LICENSE", "dist", - "src" + "src", + "!test*" ], "scripts": { "build": "tsc --build", - "test": "mocha --timeout 30000 --exit --extension ts --require ts-node/register" + "pretest": "tsc --build", + "test": "mocha './dist/test/*.js' --exit --timeout 30000" }, "dependencies": { "@tus/utils": "^0.5.0", diff --git a/packages/gcs-store/test/index.ts b/packages/gcs-store/src/test/index.ts similarity index 90% rename from packages/gcs-store/test/index.ts rename to packages/gcs-store/src/test/index.ts index c08f968b..95603bdf 100644 --- a/packages/gcs-store/test/index.ts +++ b/packages/gcs-store/src/test/index.ts @@ -1,8 +1,8 @@ import path from 'node:path' -import {GCSStore} from '../src' +import {GCSStore} from '@tus/gcs-store' -import * as shared from 'test/stores.test' +import * as shared from '../../../utils/dist/test/stores.js' import {Storage} from '@google-cloud/storage' diff --git a/packages/gcs-store/tsconfig.build.json b/packages/gcs-store/tsconfig.build.json deleted file mode 100644 index d199726e..00000000 --- a/packages/gcs-store/tsconfig.build.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [{ "path": "../utils//tsconfig.build.json" }], - "extends": "../../tsconfig.base.json", - "include": ["src"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - } -} diff --git a/packages/gcs-store/tsconfig.json b/packages/gcs-store/tsconfig.json index 823c3da5..51a2b81f 100644 --- a/packages/gcs-store/tsconfig.json +++ b/packages/gcs-store/tsconfig.json @@ -1,12 +1,10 @@ { "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [ - { "path": "./tsconfig.build.json" }, - { "path": "../../test/tsconfig.json" } - ], "extends": "../../tsconfig.base.json", - "exclude": ["src"], + "references": [{ "path": "../utils/tsconfig.json" }], + "include": ["src"], "compilerOptions": { - "noEmit": true + "rootDir": "src", + "outDir": "dist", } } diff --git a/packages/s3-store/package.json b/packages/s3-store/package.json index 4b791047..777c513b 100644 --- a/packages/s3-store/package.json +++ b/packages/s3-store/package.json @@ -3,21 +3,22 @@ "name": "@tus/s3-store", "version": "1.9.1", "description": "AWS S3 store for @tus/server", - "main": "dist/index.js", + "main": "./dist/index.js", + "exports": "./dist/index.js", + "type": "module", "homepage": "https://github.com/tus/tus-node-server#readme", "bugs": "https://github.com/tus/tus-node-server/issues", "repository": "tus/tus-node-server", "license": "MIT", "files": [ - "README.md", - "LICENSE", "dist", - "src" + "src", + "!test*" ], "scripts": { "build": "tsc --build", "pretest": "tsc --build", - "test": "mocha --timeout 40000 --exit --extension ts --require ts-node/register" + "test": "mocha './dist/test/*.js' --exit --timeout 40000" }, "dependencies": { "@aws-sdk/client-s3": "^3.758.0", diff --git a/packages/s3-store/test/index.ts b/packages/s3-store/src/test/index.ts similarity index 99% rename from packages/s3-store/test/index.ts rename to packages/s3-store/src/test/index.ts index e9042100..ab1342db 100644 --- a/packages/s3-store/test/index.ts +++ b/packages/s3-store/src/test/index.ts @@ -4,8 +4,8 @@ import {Readable} from 'node:stream' import sinon from 'sinon' -import {S3Store} from '../src' -import * as shared from 'test/stores.test' +import {S3Store} from '@tus/s3-store' +import * as shared from '../../../utils/dist/test/stores.js' import {Upload} from '@tus/utils' const fixturesPath = path.resolve('../', '../', 'test', 'fixtures') diff --git a/packages/s3-store/tsconfig.build.json b/packages/s3-store/tsconfig.build.json deleted file mode 100644 index d199726e..00000000 --- a/packages/s3-store/tsconfig.build.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [{ "path": "../utils//tsconfig.build.json" }], - "extends": "../../tsconfig.base.json", - "include": ["src"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - } -} diff --git a/packages/s3-store/tsconfig.json b/packages/s3-store/tsconfig.json index 823c3da5..51a2b81f 100644 --- a/packages/s3-store/tsconfig.json +++ b/packages/s3-store/tsconfig.json @@ -1,12 +1,10 @@ { "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [ - { "path": "./tsconfig.build.json" }, - { "path": "../../test/tsconfig.json" } - ], "extends": "../../tsconfig.base.json", - "exclude": ["src"], + "references": [{ "path": "../utils/tsconfig.json" }], + "include": ["src"], "compilerOptions": { - "noEmit": true + "rootDir": "src", + "outDir": "dist", } } diff --git a/packages/server/package.json b/packages/server/package.json index 1039c35c..92dcc899 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -3,20 +3,22 @@ "name": "@tus/server", "version": "1.10.2", "description": "Tus resumable upload protocol in Node.js", - "main": "dist/index.js", + "main": "./dist/index.js", + "exports": "./dist/index.js", + "type": "module", "homepage": "https://github.com/tus/tus-node-server#readme", "bugs": "https://github.com/tus/tus-node-server/issues", "repository": "tus/tus-node-server", "license": "MIT", "files": [ - "README.md", - "LICENSE", "dist", - "src" + "src", + "!test*" ], "scripts": { "build": "tsc --build", - "test": "mocha --timeout 40000 --exit --extension ts --require ts-node/register" + "pretest": "tsc --build", + "test": "mocha './dist/test/*.js' --exit --timeout 30000" }, "dependencies": { "@tus/utils": "^0.5.1", @@ -36,8 +38,7 @@ "node-mocks-http": "^1.16.1", "should": "^13.2.3", "sinon": "^18.0.0", - "supertest": "^6.3.4", - "ts-node": "^10.9.2" + "supertest": "^6.3.4" }, "optionalDependencies": { "@redis/client": "^1.6.0", diff --git a/packages/server/src/handlers/BaseHandler.ts b/packages/server/src/handlers/BaseHandler.ts index e52f5eae..0ae35b4c 100644 --- a/packages/server/src/handlers/BaseHandler.ts +++ b/packages/server/src/handlers/BaseHandler.ts @@ -1,6 +1,6 @@ import EventEmitter from 'node:events' -import type {ServerOptions} from '../types' +import type {ServerOptions} from '../types.js' import type {DataStore, CancellationContext} from '@tus/utils' import {ERRORS, type Upload, StreamLimiter, EVENTS} from '@tus/utils' import throttle from 'lodash.throttle' diff --git a/packages/server/src/handlers/DeleteHandler.ts b/packages/server/src/handlers/DeleteHandler.ts index 7beefa24..178ff482 100644 --- a/packages/server/src/handlers/DeleteHandler.ts +++ b/packages/server/src/handlers/DeleteHandler.ts @@ -1,4 +1,4 @@ -import {BaseHandler} from './BaseHandler' +import {BaseHandler} from './BaseHandler.js' import {ERRORS, EVENTS, type CancellationContext} from '@tus/utils' export class DeleteHandler extends BaseHandler { diff --git a/packages/server/src/handlers/GetHandler.ts b/packages/server/src/handlers/GetHandler.ts index 839c8dd7..84167005 100644 --- a/packages/server/src/handlers/GetHandler.ts +++ b/packages/server/src/handlers/GetHandler.ts @@ -1,7 +1,7 @@ -import {BaseHandler} from './BaseHandler' +import {BaseHandler} from './BaseHandler.js' import {type CancellationContext, ERRORS, type Upload} from '@tus/utils' -import type {RouteHandler} from '../types' +import type {RouteHandler} from '../types.js' export class GetHandler extends BaseHandler { paths: Map = new Map() diff --git a/packages/server/src/handlers/HeadHandler.ts b/packages/server/src/handlers/HeadHandler.ts index 871c2877..1ec02ee7 100644 --- a/packages/server/src/handlers/HeadHandler.ts +++ b/packages/server/src/handlers/HeadHandler.ts @@ -1,4 +1,4 @@ -import {BaseHandler} from './BaseHandler' +import {BaseHandler} from './BaseHandler.js' import {ERRORS, Metadata, type Upload, type CancellationContext} from '@tus/utils' diff --git a/packages/server/src/handlers/OptionsHandler.ts b/packages/server/src/handlers/OptionsHandler.ts index e6bf719e..a1aa3c07 100644 --- a/packages/server/src/handlers/OptionsHandler.ts +++ b/packages/server/src/handlers/OptionsHandler.ts @@ -1,4 +1,4 @@ -import {BaseHandler} from './BaseHandler' +import {BaseHandler} from './BaseHandler.js' import {ALLOWED_METHODS, MAX_AGE, HEADERS, type CancellationContext} from '@tus/utils' // A successful response indicated by the 204 No Content status MUST contain diff --git a/packages/server/src/handlers/PatchHandler.ts b/packages/server/src/handlers/PatchHandler.ts index 429fe139..5798baea 100644 --- a/packages/server/src/handlers/PatchHandler.ts +++ b/packages/server/src/handlers/PatchHandler.ts @@ -1,7 +1,7 @@ import debug from 'debug' import {Readable} from 'node:stream' -import {BaseHandler} from './BaseHandler' +import {BaseHandler} from './BaseHandler.js' import {ERRORS, EVENTS, type CancellationContext, type Upload} from '@tus/utils' diff --git a/packages/server/src/handlers/PostHandler.ts b/packages/server/src/handlers/PostHandler.ts index 4eda90b9..b92e2d2f 100644 --- a/packages/server/src/handlers/PostHandler.ts +++ b/packages/server/src/handlers/PostHandler.ts @@ -1,7 +1,7 @@ import debug from 'debug' import {Readable} from 'node:stream' -import {BaseHandler} from './BaseHandler' +import {BaseHandler} from './BaseHandler.js' import { Upload, Uid, @@ -11,9 +11,9 @@ import { type DataStore, type CancellationContext, } from '@tus/utils' -import {validateHeader} from '../validators/HeaderValidator' +import {validateHeader} from '../validators/HeaderValidator.js' -import type {ServerOptions, WithRequired} from '../types' +import type {ServerOptions, WithRequired} from '../types.js' const log = debug('tus-node-server:handlers:post') diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index c353f788..18df9648 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -1,4 +1,4 @@ -export {Server} from './server' -export * from './types' -export * from './lockers' +export {Server} from './server.js' +export * from './types.js' +export * from './lockers/index.js' export * from '@tus/utils' diff --git a/packages/server/src/lockers/index.ts b/packages/server/src/lockers/index.ts index b6de79c2..745fe233 100644 --- a/packages/server/src/lockers/index.ts +++ b/packages/server/src/lockers/index.ts @@ -1 +1 @@ -export * from './MemoryLocker' +export * from './MemoryLocker.js' diff --git a/packages/server/src/server.ts b/packages/server/src/server.ts index 2b3dae7a..2f2b8007 100644 --- a/packages/server/src/server.ts +++ b/packages/server/src/server.ts @@ -5,17 +5,17 @@ import debug from 'debug' import {EVENTS, ERRORS, EXPOSED_HEADERS, REQUEST_METHODS, TUS_RESUMABLE} from '@tus/utils' import type {DataStore, Upload, CancellationContext} from '@tus/utils' -import {BaseHandler} from './handlers/BaseHandler' -import {GetHandler} from './handlers/GetHandler' -import {HeadHandler} from './handlers/HeadHandler' -import {OptionsHandler} from './handlers/OptionsHandler' -import {PatchHandler} from './handlers/PatchHandler' -import {PostHandler} from './handlers/PostHandler' -import {DeleteHandler} from './handlers/DeleteHandler' -import {validateHeader} from './validators/HeaderValidator' -import type {ServerOptions, RouteHandler, WithOptional} from './types' -import {MemoryLocker} from './lockers' -import {getRequest, setResponse} from './web' +import {BaseHandler} from './handlers/BaseHandler.js' +import {GetHandler} from './handlers/GetHandler.js' +import {HeadHandler} from './handlers/HeadHandler.js' +import {OptionsHandler} from './handlers/OptionsHandler.js' +import {PatchHandler} from './handlers/PatchHandler.js' +import {PostHandler} from './handlers/PostHandler.js' +import {DeleteHandler} from './handlers/DeleteHandler.js' +import {validateHeader} from './validators/HeaderValidator.js' +import type {ServerOptions, RouteHandler, WithOptional} from './types.js' +import {MemoryLocker} from './lockers/index.js' +import {getRequest, setResponse} from './web.js' type Handlers = { GET: InstanceType @@ -178,7 +178,7 @@ export class Server extends EventEmitter { } // Validate all required headers to adhere to the tus protocol - const invalid_headers = [] + const invalid_headers: string[] = [] for (const [name, value] of req.headers.entries()) { if (req.method === 'OPTIONS') { continue diff --git a/packages/server/test/BaseHandler.test.ts b/packages/server/src/test/BaseHandler.test.ts similarity index 96% rename from packages/server/test/BaseHandler.test.ts rename to packages/server/src/test/BaseHandler.test.ts index 8800aff7..b6461acc 100644 --- a/packages/server/test/BaseHandler.test.ts +++ b/packages/server/src/test/BaseHandler.test.ts @@ -1,8 +1,8 @@ import {strict as assert} from 'node:assert' -import {BaseHandler} from '../src/handlers/BaseHandler' +import {BaseHandler} from '../handlers/BaseHandler.js' import {DataStore} from '@tus/utils' -import {MemoryLocker} from '../src' +import {MemoryLocker} from '@tus/server' describe('BaseHandler', () => { const store = new DataStore() diff --git a/packages/server/test/DataStore.test.ts b/packages/server/src/test/DataStore.test.ts similarity index 100% rename from packages/server/test/DataStore.test.ts rename to packages/server/src/test/DataStore.test.ts diff --git a/packages/server/test/DeleteHandler.test.ts b/packages/server/src/test/DeleteHandler.test.ts similarity index 96% rename from packages/server/test/DeleteHandler.test.ts rename to packages/server/src/test/DeleteHandler.test.ts index b06a81e3..b358ced5 100644 --- a/packages/server/test/DeleteHandler.test.ts +++ b/packages/server/src/test/DeleteHandler.test.ts @@ -5,8 +5,8 @@ import {strict as assert} from 'node:assert' import sinon from 'sinon' import {ERRORS, EVENTS, DataStore, type CancellationContext} from '@tus/utils' -import {DeleteHandler} from '../src/handlers/DeleteHandler' -import {MemoryLocker} from '../src' +import {DeleteHandler} from '../handlers/DeleteHandler.js' +import {MemoryLocker} from '@tus/server' describe('DeleteHandler', () => { const path = '/test/output' diff --git a/packages/server/test/GetHandler.test.ts b/packages/server/src/test/GetHandler.test.ts similarity index 99% rename from packages/server/test/GetHandler.test.ts rename to packages/server/src/test/GetHandler.test.ts index 08222219..75c0b514 100644 --- a/packages/server/test/GetHandler.test.ts +++ b/packages/server/src/test/GetHandler.test.ts @@ -6,10 +6,10 @@ import stream from 'node:stream' import sinon from 'sinon' -import {GetHandler} from '../src/handlers/GetHandler' +import {GetHandler} from '../handlers/GetHandler.js' import {type CancellationContext, DataStore, Upload} from '@tus/utils' import {FileStore} from '@tus/file-store' -import {MemoryLocker} from '../src' +import {MemoryLocker} from '@tus/server' describe('GetHandler', () => { const path = '/test/output' diff --git a/packages/server/test/HeadHandler.test.ts b/packages/server/src/test/HeadHandler.test.ts similarity index 96% rename from packages/server/test/HeadHandler.test.ts rename to packages/server/src/test/HeadHandler.test.ts index 3224f300..01a467e7 100644 --- a/packages/server/test/HeadHandler.test.ts +++ b/packages/server/src/test/HeadHandler.test.ts @@ -3,8 +3,8 @@ import {strict as assert} from 'node:assert' import sinon from 'sinon' import {ERRORS, DataStore, Upload, type CancellationContext} from '@tus/utils' -import {HeadHandler} from '../src/handlers/HeadHandler' -import {MemoryLocker} from '../src' +import {HeadHandler} from '../handlers/HeadHandler.js' +import {MemoryLocker} from '@tus/server' describe('HeadHandler', () => { const path = '/test/output' diff --git a/packages/server/test/HeaderValidator.test.ts b/packages/server/src/test/HeaderValidator.test.ts similarity index 98% rename from packages/server/test/HeaderValidator.test.ts rename to packages/server/src/test/HeaderValidator.test.ts index 4c8d6355..b20ed878 100644 --- a/packages/server/test/HeaderValidator.test.ts +++ b/packages/server/src/test/HeaderValidator.test.ts @@ -1,6 +1,6 @@ import {strict as assert} from 'node:assert' -import {validateHeader} from '../src/validators/HeaderValidator' +import {validateHeader} from '../validators/HeaderValidator.js' import {TUS_RESUMABLE} from '@tus/utils' describe('HeaderValidator', () => { diff --git a/packages/server/test/Locker.test.ts b/packages/server/src/test/Locker.test.ts similarity index 98% rename from packages/server/test/Locker.test.ts rename to packages/server/src/test/Locker.test.ts index bef07f0a..4b068745 100644 --- a/packages/server/test/Locker.test.ts +++ b/packages/server/src/test/Locker.test.ts @@ -1,6 +1,6 @@ import assert from 'node:assert' import sinon from 'sinon' -import {ERRORS, MemoryLocker} from '../src' +import {ERRORS, MemoryLocker} from '@tus/server' describe('MemoryLocker', () => { it('will acquire a lock by notifying another to release it', async () => { diff --git a/packages/server/test/OptionsHandler.test.ts b/packages/server/src/test/OptionsHandler.test.ts similarity index 93% rename from packages/server/test/OptionsHandler.test.ts rename to packages/server/src/test/OptionsHandler.test.ts index 01128cce..7a1fd404 100644 --- a/packages/server/test/OptionsHandler.test.ts +++ b/packages/server/src/test/OptionsHandler.test.ts @@ -2,7 +2,7 @@ import 'should' import {strict as assert} from 'node:assert' -import {OptionsHandler} from '../src/handlers/OptionsHandler' +import {OptionsHandler} from '../handlers/OptionsHandler.js' import { DataStore, ALLOWED_METHODS, @@ -10,7 +10,7 @@ import { MAX_AGE, type CancellationContext, } from '@tus/utils' -import {MemoryLocker, type ServerOptions} from '../src' +import {MemoryLocker, type ServerOptions} from '@tus/server' describe('OptionsHandler', () => { const options: ServerOptions = { diff --git a/packages/server/test/PatchHandler.test.ts b/packages/server/src/test/PatchHandler.test.ts similarity index 99% rename from packages/server/test/PatchHandler.test.ts rename to packages/server/src/test/PatchHandler.test.ts index b59e23bd..b15a71a1 100644 --- a/packages/server/test/PatchHandler.test.ts +++ b/packages/server/src/test/PatchHandler.test.ts @@ -2,14 +2,14 @@ import 'should' import {strict as assert} from 'node:assert' import type http from 'node:http' +import streamP from 'node:stream/promises' +import stream, {PassThrough} from 'node:stream' import sinon from 'sinon' -import {PatchHandler} from '../src/handlers/PatchHandler' +import {PatchHandler} from '../handlers/PatchHandler.js' import {Upload, DataStore, type CancellationContext} from '@tus/utils' -import {MemoryLocker} from '../src' -import streamP from 'node:stream/promises' -import stream, {PassThrough} from 'node:stream' +import {MemoryLocker} from '@tus/server' describe('PatchHandler', () => { const path = '/test/output' diff --git a/packages/server/test/PostHandler.test.ts b/packages/server/src/test/PostHandler.test.ts similarity index 99% rename from packages/server/test/PostHandler.test.ts rename to packages/server/src/test/PostHandler.test.ts index da3a8af7..5a98d907 100644 --- a/packages/server/test/PostHandler.test.ts +++ b/packages/server/src/test/PostHandler.test.ts @@ -6,8 +6,8 @@ import {strict as assert} from 'node:assert' import sinon from 'sinon' import {EVENTS, Upload, DataStore, type CancellationContext} from '@tus/utils' -import {PostHandler} from '../src/handlers/PostHandler' -import {MemoryLocker} from '../src' +import {PostHandler} from '../handlers/PostHandler.js' +import {MemoryLocker} from '@tus/server' const options = { path: '/test', diff --git a/packages/server/test/Server.test.ts b/packages/server/src/test/Server.test.ts similarity index 99% rename from packages/server/test/Server.test.ts rename to packages/server/src/test/Server.test.ts index 48b0ba01..c39bd067 100644 --- a/packages/server/test/Server.test.ts +++ b/packages/server/src/test/Server.test.ts @@ -10,7 +10,7 @@ import path from 'node:path' import request from 'supertest' import Throttle from 'throttle' -import {Server} from '../src' +import {Server} from '@tus/server' import {FileStore} from '@tus/file-store' import {TUS_RESUMABLE, EVENTS, DataStore, Metadata} from '@tus/utils' import httpMocks from 'node-mocks-http' @@ -18,7 +18,7 @@ import sinon from 'sinon' // Test server crashes on http://{some-ip} so we remove the protocol... const removeProtocol = (location: string) => location.slice(6) -const directory = path.resolve(__dirname, 'output', 'server') +const directory = path.resolve(import.meta.dirname, 'output', 'server') describe('Server', () => { before(async () => { diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json deleted file mode 100644 index 06719e77..00000000 --- a/packages/server/tsconfig.build.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [{ "path": "../utils/tsconfig.build.json" }], - "extends": "../../tsconfig.base.json", - "include": ["src"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - } -} diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json index 867c29f9..f0fa0802 100644 --- a/packages/server/tsconfig.json +++ b/packages/server/tsconfig.json @@ -1,9 +1,13 @@ { "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [{ "path": "./tsconfig.build.json" }], "extends": "../../tsconfig.base.json", - "exclude": ["src"], + "references": [ + { "path": "../utils/tsconfig.json" }, + { "path": "../file-store/tsconfig.json" } + ], + "include": ["src"], "compilerOptions": { - "noEmit": true + "rootDir": "src", + "outDir": "dist", } } diff --git a/packages/utils/package.json b/packages/utils/package.json index 6e914ff7..2d3edae7 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -3,20 +3,22 @@ "name": "@tus/utils", "version": "0.5.1", "description": "Internal utils for tus Node.js server and stores", - "main": "dist/index.js", + "main": "./dist/index.js", + "exports": "./dist/index.js", + "type": "module", "homepage": "https://github.com/tus/tus-node-server#readme", "bugs": "https://github.com/tus/tus-node-server/issues", "repository": "tus/tus-node-server", "license": "MIT", "files": [ - "README.md", - "LICENSE", "dist", - "src" + "src", + "!test*" ], "scripts": { "build": "tsc --build", - "test": "mocha --timeout 40000 --exit --extension ts --require ts-node/register" + "pretest": "tsc --build", + "test": "mocha './dist/test/*.js' --exit" }, "devDependencies": { "@types/debug": "^4.1.12", @@ -24,8 +26,7 @@ "@types/node": "^22.13.7", "ioredis": "^5.4.1", "mocha": "^11.0.1", - "should": "^13.2.3", - "ts-node": "^10.9.2" + "should": "^13.2.3" }, "engines": { "node": ">=20.19.0" diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 78b880f9..e55b6277 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -1,3 +1,3 @@ -export * from './models' -export * from './constants' -export * from './kvstores' +export * from './models/index.js' +export * from './constants.js' +export * from './kvstores/index.js' diff --git a/packages/utils/src/kvstores/FileKvStore.ts b/packages/utils/src/kvstores/FileKvStore.ts index 8bbee4d7..0255ba1a 100644 --- a/packages/utils/src/kvstores/FileKvStore.ts +++ b/packages/utils/src/kvstores/FileKvStore.ts @@ -1,8 +1,8 @@ import fs from 'node:fs/promises' import path from 'node:path' -import type {KvStore} from './Types' -import type {Upload} from '../models' +import type {KvStore} from './Types.js' +import type {Upload} from '../models/index.js' /** * FileConfigstore writes the `Upload` JSON metadata to disk next the uploaded file itself. diff --git a/packages/utils/src/kvstores/IoRedisKvStore.ts b/packages/utils/src/kvstores/IoRedisKvStore.ts index 8d4a1891..04f2a9eb 100644 --- a/packages/utils/src/kvstores/IoRedisKvStore.ts +++ b/packages/utils/src/kvstores/IoRedisKvStore.ts @@ -1,6 +1,6 @@ import type {Redis as IoRedis} from 'ioredis' -import type {KvStore} from './Types' -import type {Upload} from '../models' +import type {KvStore} from './Types.js' +import type {Upload} from '../models/index.js' export class IoRedisKvStore implements KvStore { constructor( diff --git a/packages/utils/src/kvstores/MemoryKvStore.ts b/packages/utils/src/kvstores/MemoryKvStore.ts index 8c01a528..cc556989 100644 --- a/packages/utils/src/kvstores/MemoryKvStore.ts +++ b/packages/utils/src/kvstores/MemoryKvStore.ts @@ -1,5 +1,5 @@ -import type {Upload} from '../models' -import type {KvStore} from './Types' +import type {Upload} from '../models/index.js' +import type {KvStore} from './Types.js' /** * Memory based configstore. diff --git a/packages/utils/src/kvstores/RedisKvStore.ts b/packages/utils/src/kvstores/RedisKvStore.ts index c1550ecd..8de54509 100644 --- a/packages/utils/src/kvstores/RedisKvStore.ts +++ b/packages/utils/src/kvstores/RedisKvStore.ts @@ -1,6 +1,6 @@ import type {RedisClientType} from '@redis/client' -import type {KvStore} from './Types' -import type {Upload} from '../models' +import type {KvStore} from './Types.js' +import type {Upload} from '../models/index.js' /** * Redis based configstore. diff --git a/packages/utils/src/kvstores/Types.ts b/packages/utils/src/kvstores/Types.ts index 740d3410..b83d73c5 100644 --- a/packages/utils/src/kvstores/Types.ts +++ b/packages/utils/src/kvstores/Types.ts @@ -1,4 +1,4 @@ -import type {Upload} from '../models' +import type {Upload} from '../models/index.js' export interface KvStore { get(key: string): Promise diff --git a/packages/utils/src/kvstores/index.ts b/packages/utils/src/kvstores/index.ts index 5d2aff72..a65124ff 100644 --- a/packages/utils/src/kvstores/index.ts +++ b/packages/utils/src/kvstores/index.ts @@ -1,5 +1,5 @@ -export {FileKvStore} from './FileKvStore' -export {MemoryKvStore} from './MemoryKvStore' -export {RedisKvStore} from './RedisKvStore' -export {IoRedisKvStore} from './IoRedisKvStore' -export {KvStore} from './Types' +export {FileKvStore} from './FileKvStore.js' +export {MemoryKvStore} from './MemoryKvStore.js' +export {RedisKvStore} from './RedisKvStore.js' +export {IoRedisKvStore} from './IoRedisKvStore.js' +export {KvStore} from './Types.js' diff --git a/packages/utils/src/models/DataStore.ts b/packages/utils/src/models/DataStore.ts index ec2b3edd..a429f614 100644 --- a/packages/utils/src/models/DataStore.ts +++ b/packages/utils/src/models/DataStore.ts @@ -1,7 +1,7 @@ import EventEmitter from 'node:events' import stream from 'node:stream' -import {Upload} from './Upload' +import {Upload} from './Upload.js' export class DataStore extends EventEmitter { extensions: string[] = [] diff --git a/packages/utils/src/models/Metadata.ts b/packages/utils/src/models/Metadata.ts index a17cc6cd..31fdd858 100644 --- a/packages/utils/src/models/Metadata.ts +++ b/packages/utils/src/models/Metadata.ts @@ -1,4 +1,4 @@ -import type {Upload} from './Upload' +import type {Upload} from './Upload.js' const ASCII_SPACE = ' '.codePointAt(0) const ASCII_COMMA = ','.codePointAt(0) diff --git a/packages/utils/src/models/StreamLimiter.ts b/packages/utils/src/models/StreamLimiter.ts index 8a35df96..8e1c2af9 100644 --- a/packages/utils/src/models/StreamLimiter.ts +++ b/packages/utils/src/models/StreamLimiter.ts @@ -1,5 +1,5 @@ import {Transform, type TransformCallback} from 'node:stream' -import {ERRORS} from '../constants' +import {ERRORS} from '../constants.js' // TODO: create HttpError and use it everywhere instead of throwing objects export class MaxFileExceededError extends Error { diff --git a/packages/utils/src/models/index.ts b/packages/utils/src/models/index.ts index 9d85b32e..62278278 100644 --- a/packages/utils/src/models/index.ts +++ b/packages/utils/src/models/index.ts @@ -1,8 +1,8 @@ -export {DataStore} from './DataStore' -export * as Metadata from './Metadata' -export {StreamSplitter} from './StreamSplitter' -export {StreamLimiter} from './StreamLimiter' -export {Uid} from './Uid' -export {Upload} from './Upload' -export {Locker, Lock, RequestRelease} from './Locker' -export {CancellationContext} from './Context' +export {DataStore} from './DataStore.js' +export * as Metadata from './Metadata.js' +export {StreamSplitter} from './StreamSplitter.js' +export {StreamLimiter} from './StreamLimiter.js' +export {Uid} from './Uid.js' +export {Upload} from './Upload.js' +export {Locker, Lock, RequestRelease} from './Locker.js' +export {CancellationContext} from './Context.js' diff --git a/packages/utils/test/Metadata.test.ts b/packages/utils/src/test/Metadata.test.ts similarity index 98% rename from packages/utils/test/Metadata.test.ts rename to packages/utils/src/test/Metadata.test.ts index b6ce0eab..5cd63f71 100644 --- a/packages/utils/test/Metadata.test.ts +++ b/packages/utils/src/test/Metadata.test.ts @@ -1,5 +1,5 @@ import {strict as assert} from 'node:assert' -import {parse, stringify} from '../src/models/Metadata' +import {parse, stringify} from '../models/Metadata.js' describe('Metadata', () => { it('parse valid metadata string', () => { diff --git a/packages/utils/test/StreamSplitter.test.ts b/packages/utils/src/test/StreamSplitter.test.ts similarity index 96% rename from packages/utils/test/StreamSplitter.test.ts rename to packages/utils/src/test/StreamSplitter.test.ts index c9cc5907..2c7108ff 100644 --- a/packages/utils/test/StreamSplitter.test.ts +++ b/packages/utils/src/test/StreamSplitter.test.ts @@ -3,7 +3,7 @@ import fs from 'node:fs' import stream from 'node:stream/promises' import {strict as assert} from 'node:assert' -import {StreamSplitter} from '../src/models' +import {StreamSplitter} from '../models/index.js' import {Readable} from 'node:stream' const fileSize = 20_971_520 diff --git a/packages/utils/test/Uid.test.ts b/packages/utils/src/test/Uid.test.ts similarity index 92% rename from packages/utils/test/Uid.test.ts rename to packages/utils/src/test/Uid.test.ts index b7134df2..3ea47c7b 100644 --- a/packages/utils/test/Uid.test.ts +++ b/packages/utils/src/test/Uid.test.ts @@ -1,6 +1,6 @@ import {strict as assert} from 'node:assert' -import {Uid} from '../src/models' +import {Uid} from '../models/index.js' describe('Uid', () => { it('returns a 32 char string', (done) => { diff --git a/packages/utils/test/Upload.test.ts b/packages/utils/src/test/Upload.test.ts similarity index 90% rename from packages/utils/test/Upload.test.ts rename to packages/utils/src/test/Upload.test.ts index a3cbb542..4174d7a9 100644 --- a/packages/utils/test/Upload.test.ts +++ b/packages/utils/src/test/Upload.test.ts @@ -1,8 +1,8 @@ import 'should' import {strict as assert} from 'node:assert' -import {Upload} from '../src/models/Upload' -import {Uid} from '../src/models/Uid' +import {Upload} from '../models/Upload.js' +import {Uid} from '../models/Uid.js' describe('Upload', () => { describe('constructor', () => { diff --git a/test/src/stores.test.ts b/packages/utils/src/test/stores.ts similarity index 99% rename from test/src/stores.test.ts rename to packages/utils/src/test/stores.ts index 264e55a8..cb4d773e 100644 --- a/test/src/stores.test.ts +++ b/packages/utils/src/test/stores.ts @@ -4,7 +4,7 @@ import fs from 'node:fs' import stream from 'node:stream' import {setTimeout as promSetTimeout} from 'node:timers/promises' -import {Upload, Uid} from '@tus/server' +import {Upload, Uid} from '@tus/utils' export function testId(id: string) { return `${id}-${Uid.rand()}` diff --git a/packages/utils/tsconfig.build.json b/packages/utils/tsconfig.build.json deleted file mode 100644 index 5eaf56de..00000000 --- a/packages/utils/tsconfig.build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://json.schemastore.org/tsconfig.json", - "extends": "../../tsconfig.base.json", - "include": ["src"], - "compilerOptions": { - "rootDir": "src", - "outDir": "dist" - } -} diff --git a/packages/utils/tsconfig.json b/packages/utils/tsconfig.json index 867c29f9..346c1ed4 100644 --- a/packages/utils/tsconfig.json +++ b/packages/utils/tsconfig.json @@ -1,9 +1,9 @@ { "$schema": "https://json.schemastore.org/tsconfig.json", - "references": [{ "path": "./tsconfig.build.json" }], "extends": "../../tsconfig.base.json", - "exclude": ["src"], + "include": ["src"], "compilerOptions": { - "noEmit": true + "rootDir": "src", + "outDir": "dist", } } diff --git a/test/package.json b/test/package.json index 90525a6a..df71e2d0 100644 --- a/test/package.json +++ b/test/package.json @@ -2,9 +2,10 @@ "$schema": "https://json.schemastore.org/package.json", "name": "test", "private": true, + "type":"module", "scripts": { "build": "tsc --build", - "test": "mocha dist/e2e.test.js dist/s3.e2e.js --timeout 40000 --exit --extension ts --require ts-node/register" + "test": "mocha dist/e2e.test.js dist/s3.e2e.js --timeout 40000 --exit" }, "exports": { "./stores.test": "./dist/stores.test.js" @@ -27,7 +28,6 @@ "should": "^13.2.3", "sinon": "^18.0.0", "supertest": "^6.3.4", - "throttle": "^1.0.3", - "ts-node": "^10.9.2" + "throttle": "^1.0.3" } } diff --git a/test/tsconfig.json b/test/tsconfig.json index e27cf8a4..7bf14f2a 100644 --- a/test/tsconfig.json +++ b/test/tsconfig.json @@ -1,11 +1,11 @@ { "$schema": "https://json.schemastore.org/tsconfig.json", "references": [ - { "path": "../packages/azure-store/tsconfig.build.json" }, - { "path": "../packages/file-store/tsconfig.build.json" }, - { "path": "../packages/gcs-store/tsconfig.build.json" }, - { "path": "../packages/s3-store/tsconfig.build.json" }, - { "path": "../packages/server/tsconfig.build.json" } + { "path": "../packages/azure-store/tsconfig.json" }, + { "path": "../packages/file-store/tsconfig.json" }, + { "path": "../packages/gcs-store/tsconfig.json" }, + { "path": "../packages/s3-store/tsconfig.json" }, + { "path": "../packages/server/tsconfig.json" } ], "extends": "../tsconfig.base.json", "include": ["src"],