From 5a027c772708eef4a79d11b901aa66f6780a15e0 Mon Sep 17 00:00:00 2001 From: Jake Archibald Date: Mon, 9 Nov 2020 10:54:35 +0000 Subject: [PATCH] Much simpler project structure --- .gitignore | 2 - client-tsconfig.json | 12 +++++ lib/feature-plugin.js | 53 ++----------------- .../decoders/avif/worker/avifDecode.ts | 2 +- .../decoders/avif/worker/tsconfig.json | 7 --- .../decoders/webp/worker/tsconfig.json | 7 --- .../decoders/webp/worker/webpDecode.ts | 2 +- .../encoders/avif/client/tsconfig.json | 13 ----- .../encoders/avif/shared/tsconfig.json | 7 --- .../encoders/avif/worker/avifEncode.ts | 2 +- .../encoders/avif/worker/tsconfig.json | 7 --- .../encoders/browserGIF/client/tsconfig.json | 14 ----- .../encoders/browserGIF/shared/tsconfig.json | 7 --- .../encoders/browserJPEG/client/tsconfig.json | 14 ----- .../encoders/browserJPEG/shared/tsconfig.json | 7 --- .../encoders/browserPNG/client/tsconfig.json | 14 ----- .../encoders/browserPNG/shared/tsconfig.json | 7 --- .../encoders/mozjpeg/client/tsconfig.json | 13 ----- .../encoders/mozjpeg/shared/tsconfig.json | 7 --- .../encoders/mozjpeg/worker/mozjpegEncode.ts | 2 +- .../encoders/mozjpeg/worker/tsconfig.json | 7 --- .../encoders/oxipng/client/tsconfig.json | 14 ----- .../encoders/oxipng/shared/tsconfig.json | 7 --- .../encoders/oxipng/worker/tsconfig.json | 7 --- .../encoders/webp/client/tsconfig.json | 13 ----- .../encoders/webp/shared/tsconfig.json | 7 --- .../encoders/webp/worker/tsconfig.json | 7 --- .../encoders/webp/worker/webpEncode.ts | 2 +- .../preprocessors/rotate/shared/tsconfig.json | 7 --- .../preprocessors/rotate/worker/tsconfig.json | 7 --- .../processors/quantize/shared/tsconfig.json | 7 --- .../processors/quantize/worker/quantize.ts | 2 +- .../processors/quantize/worker/tsconfig.json | 7 --- .../processors/resize/client/tsconfig.json | 14 ----- .../processors/resize/shared/tsconfig.json | 7 --- .../processors/resize/worker/tsconfig.json | 7 --- src/features/tsconfig.json | 8 --- .../{util.ts => worker-utils/index.ts} | 0 src/shared/tsconfig.json | 7 --- src/static-build/tsconfig.json | 8 --- src/sw/tsconfig.json | 6 --- static-build-tsconfig.json | 8 +++ tsconfig.json | 7 ++- worker-tsconfig.json | 13 +++++ 44 files changed, 47 insertions(+), 331 deletions(-) create mode 100644 client-tsconfig.json delete mode 100644 src/features/decoders/avif/worker/tsconfig.json delete mode 100644 src/features/decoders/webp/worker/tsconfig.json delete mode 100644 src/features/encoders/avif/client/tsconfig.json delete mode 100644 src/features/encoders/avif/shared/tsconfig.json delete mode 100644 src/features/encoders/avif/worker/tsconfig.json delete mode 100644 src/features/encoders/browserGIF/client/tsconfig.json delete mode 100644 src/features/encoders/browserGIF/shared/tsconfig.json delete mode 100644 src/features/encoders/browserJPEG/client/tsconfig.json delete mode 100644 src/features/encoders/browserJPEG/shared/tsconfig.json delete mode 100644 src/features/encoders/browserPNG/client/tsconfig.json delete mode 100644 src/features/encoders/browserPNG/shared/tsconfig.json delete mode 100644 src/features/encoders/mozjpeg/client/tsconfig.json delete mode 100644 src/features/encoders/mozjpeg/shared/tsconfig.json delete mode 100644 src/features/encoders/mozjpeg/worker/tsconfig.json delete mode 100644 src/features/encoders/oxipng/client/tsconfig.json delete mode 100644 src/features/encoders/oxipng/shared/tsconfig.json delete mode 100644 src/features/encoders/oxipng/worker/tsconfig.json delete mode 100644 src/features/encoders/webp/client/tsconfig.json delete mode 100644 src/features/encoders/webp/shared/tsconfig.json delete mode 100644 src/features/encoders/webp/worker/tsconfig.json delete mode 100644 src/features/preprocessors/rotate/shared/tsconfig.json delete mode 100644 src/features/preprocessors/rotate/worker/tsconfig.json delete mode 100644 src/features/processors/quantize/shared/tsconfig.json delete mode 100644 src/features/processors/quantize/worker/tsconfig.json delete mode 100644 src/features/processors/resize/client/tsconfig.json delete mode 100644 src/features/processors/resize/shared/tsconfig.json delete mode 100644 src/features/processors/resize/worker/tsconfig.json delete mode 100644 src/features/tsconfig.json rename src/features/{util.ts => worker-utils/index.ts} (100%) delete mode 100644 src/shared/tsconfig.json delete mode 100644 src/static-build/tsconfig.json delete mode 100644 src/sw/tsconfig.json create mode 100644 static-build-tsconfig.json create mode 100644 worker-tsconfig.json diff --git a/.gitignore b/.gitignore index 943e2a6b..4ae777d8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,5 @@ build # Auto-generated by lib/feature-plugin.js src/features-worker/index.ts -src/features-worker/tsconfig.json src/client/lazy-app/worker-bridge/meta.ts src/client/lazy-app/feature-meta/index.ts -src/client/tsconfig.json diff --git a/client-tsconfig.json b/client-tsconfig.json new file mode 100644 index 00000000..2f3eb1e7 --- /dev/null +++ b/client-tsconfig.json @@ -0,0 +1,12 @@ +{ + "extends": "./generic-tsconfig.json", + "compilerOptions": { + "lib": ["esnext", "dom", "dom.iterable"], + "types": [] + }, + "include": [ + "src/features/**/client/**/*", + "src/features/**/shared/**/*", + "src/shared/**/*" + ] +} diff --git a/lib/feature-plugin.js b/lib/feature-plugin.js index eb826dd7..46032210 100644 --- a/lib/feature-plugin.js +++ b/lib/feature-plugin.js @@ -59,23 +59,7 @@ export default function () { .flat(Infinity) .join('\n'); - const workerTsConfig = { - extends: '../../generic-tsconfig.json', - compilerOptions: { - lib: ['webworker', 'esnext'], - }, - references: featuresWorkerTsNames.map(([tsImport]) => ({ - path: path.dirname(tsImport), - })), - }; - - await Promise.all([ - fsp.writeFile( - path.join(workerBasePath, 'tsconfig.json'), - autoGenComment + JSON.stringify(workerTsConfig, null, ' '), - ), - fsp.writeFile(path.join(workerBasePath, 'index.ts'), workerFile), - ]); + await fsp.writeFile(path.join(workerBasePath, 'index.ts'), workerFile); } /** @@ -171,7 +155,6 @@ export default function () { 'lazy-app', 'feature-meta', ); - const clientBasePath = path.join(process.cwd(), 'src', 'client'); const joinedMetas = metas.flat().join(); @@ -194,13 +177,6 @@ export default function () { const preprocessorMetaTsNames = preprocessorMetas.map((tsImport) => getTsName(tsImport), ); - const tsConfigEncoderPaths = encoderMetas.flatMap((tsImport) => [ - path.relative(clientBasePath, tsImport.replace(/\/meta$/, '')), - path.relative( - clientBasePath, - tsImport.replace(/shared\/meta$/, 'client'), - ), - ]); const featureMeta = [ autoGenComment, @@ -267,29 +243,10 @@ export default function () { .flat(Infinity) .join('\n'); - const lazyTsConfig = { - extends: '../../generic-tsconfig.json', - compilerOptions: { - lib: ['esnext', 'dom', 'dom.iterable'], - types: [], - }, - references: [ - { path: '../features-worker' }, - { path: '../shared' }, - { path: '../features/processors/resize/client' }, - ...tsConfigEncoderPaths.map((projectPath) => ({ - path: projectPath, - })), - ], - }; - - await Promise.all([ - fsp.writeFile( - path.join(process.cwd(), 'src', 'client', 'tsconfig.json'), - autoGenComment + JSON.stringify(lazyTsConfig, null, ' '), - ), - fsp.writeFile(path.join(featureMetaBasePath, 'index.ts'), featureMeta), - ]); + await fsp.writeFile( + path.join(featureMetaBasePath, 'index.ts'), + featureMeta, + ); } return { diff --git a/src/features/decoders/avif/worker/avifDecode.ts b/src/features/decoders/avif/worker/avifDecode.ts index f53b0cef..963f7b14 100644 --- a/src/features/decoders/avif/worker/avifDecode.ts +++ b/src/features/decoders/avif/worker/avifDecode.ts @@ -12,7 +12,7 @@ */ import avifDecoder, { AVIFModule } from 'codecs/avif/dec/avif_dec'; import wasmUrl from 'url:codecs/avif/dec/avif_dec.wasm'; -import { initEmscriptenModule, blobToArrayBuffer } from 'features/util'; +import { initEmscriptenModule, blobToArrayBuffer } from 'features/worker-utils'; let emscriptenModule: Promise; diff --git a/src/features/decoders/avif/worker/tsconfig.json b/src/features/decoders/avif/worker/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/decoders/avif/worker/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/decoders/webp/worker/tsconfig.json b/src/features/decoders/webp/worker/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/decoders/webp/worker/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/decoders/webp/worker/webpDecode.ts b/src/features/decoders/webp/worker/webpDecode.ts index adf54f58..7db01f7c 100644 --- a/src/features/decoders/webp/worker/webpDecode.ts +++ b/src/features/decoders/webp/worker/webpDecode.ts @@ -12,7 +12,7 @@ */ import webpDecoder, { WebPModule } from 'codecs/webp/dec/webp_dec'; import wasmUrl from 'url:codecs/webp/dec/webp_dec.wasm'; -import { initEmscriptenModule, blobToArrayBuffer } from 'features/util'; +import { initEmscriptenModule, blobToArrayBuffer } from 'features/worker-utils'; let emscriptenModule: Promise; diff --git a/src/features/encoders/avif/client/tsconfig.json b/src/features/encoders/avif/client/tsconfig.json deleted file mode 100644 index 291818af..00000000 --- a/src/features/encoders/avif/client/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom", "dom.iterable"], - "types": [] - }, - "include": [ - "./*.ts", - "../../../../client/lazy-app/worker-bridge/index.ts", - "../shared/*.ts" - ], - "references": [{ "path": "../shared" }] -} diff --git a/src/features/encoders/avif/shared/tsconfig.json b/src/features/encoders/avif/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/encoders/avif/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/encoders/avif/worker/avifEncode.ts b/src/features/encoders/avif/worker/avifEncode.ts index ea0e19c5..5a63dbe5 100644 --- a/src/features/encoders/avif/worker/avifEncode.ts +++ b/src/features/encoders/avif/worker/avifEncode.ts @@ -13,7 +13,7 @@ import avifEncoder, { AVIFModule } from 'codecs/avif/enc/avif_enc'; import type { EncodeOptions } from '../shared/meta'; import wasmUrl from 'url:codecs/avif/enc/avif_enc.wasm'; -import { initEmscriptenModule } from 'features/util'; +import { initEmscriptenModule } from 'features/worker-utils'; let emscriptenModule: Promise; diff --git a/src/features/encoders/avif/worker/tsconfig.json b/src/features/encoders/avif/worker/tsconfig.json deleted file mode 100644 index 959fe910..00000000 --- a/src/features/encoders/avif/worker/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }, { "path": "../shared" }] -} diff --git a/src/features/encoders/browserGIF/client/tsconfig.json b/src/features/encoders/browserGIF/client/tsconfig.json deleted file mode 100644 index 663caade..00000000 --- a/src/features/encoders/browserGIF/client/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom", "dom.iterable"], - "types": [] - }, - "include": [ - "./*.ts", - "../../../../client/lazy-app/util.ts", - "../../../../client/lazy-app/worker-bridge/index.ts", - "../shared/*.ts" - ], - "references": [{ "path": "../shared" }] -} diff --git a/src/features/encoders/browserGIF/shared/tsconfig.json b/src/features/encoders/browserGIF/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/encoders/browserGIF/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/encoders/browserJPEG/client/tsconfig.json b/src/features/encoders/browserJPEG/client/tsconfig.json deleted file mode 100644 index 663caade..00000000 --- a/src/features/encoders/browserJPEG/client/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom", "dom.iterable"], - "types": [] - }, - "include": [ - "./*.ts", - "../../../../client/lazy-app/util.ts", - "../../../../client/lazy-app/worker-bridge/index.ts", - "../shared/*.ts" - ], - "references": [{ "path": "../shared" }] -} diff --git a/src/features/encoders/browserJPEG/shared/tsconfig.json b/src/features/encoders/browserJPEG/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/encoders/browserJPEG/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/encoders/browserPNG/client/tsconfig.json b/src/features/encoders/browserPNG/client/tsconfig.json deleted file mode 100644 index 663caade..00000000 --- a/src/features/encoders/browserPNG/client/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom", "dom.iterable"], - "types": [] - }, - "include": [ - "./*.ts", - "../../../../client/lazy-app/util.ts", - "../../../../client/lazy-app/worker-bridge/index.ts", - "../shared/*.ts" - ], - "references": [{ "path": "../shared" }] -} diff --git a/src/features/encoders/browserPNG/shared/tsconfig.json b/src/features/encoders/browserPNG/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/encoders/browserPNG/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/encoders/mozjpeg/client/tsconfig.json b/src/features/encoders/mozjpeg/client/tsconfig.json deleted file mode 100644 index b9e46117..00000000 --- a/src/features/encoders/mozjpeg/client/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom", "dom.iterable"], - "types": [] - }, - "include": [ - "*.ts", - "../../../../client/lazy-app/worker-bridge/index.ts", - "../shared/*.ts" - ], - "references": [{ "path": "../shared" }] -} diff --git a/src/features/encoders/mozjpeg/shared/tsconfig.json b/src/features/encoders/mozjpeg/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/encoders/mozjpeg/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/encoders/mozjpeg/worker/mozjpegEncode.ts b/src/features/encoders/mozjpeg/worker/mozjpegEncode.ts index 051c496d..09f5a5e4 100644 --- a/src/features/encoders/mozjpeg/worker/mozjpegEncode.ts +++ b/src/features/encoders/mozjpeg/worker/mozjpegEncode.ts @@ -13,7 +13,7 @@ import mozjpeg_enc, { MozJPEGModule } from 'codecs/mozjpeg_enc/mozjpeg_enc'; import { EncodeOptions } from '../shared/meta'; import wasmUrl from 'url:codecs/mozjpeg_enc/mozjpeg_enc.wasm'; -import { initEmscriptenModule } from 'features/util'; +import { initEmscriptenModule } from 'features/worker-utils'; let emscriptenModule: Promise; diff --git a/src/features/encoders/mozjpeg/worker/tsconfig.json b/src/features/encoders/mozjpeg/worker/tsconfig.json deleted file mode 100644 index 959fe910..00000000 --- a/src/features/encoders/mozjpeg/worker/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }, { "path": "../shared" }] -} diff --git a/src/features/encoders/oxipng/client/tsconfig.json b/src/features/encoders/oxipng/client/tsconfig.json deleted file mode 100644 index 663caade..00000000 --- a/src/features/encoders/oxipng/client/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom", "dom.iterable"], - "types": [] - }, - "include": [ - "./*.ts", - "../../../../client/lazy-app/util.ts", - "../../../../client/lazy-app/worker-bridge/index.ts", - "../shared/*.ts" - ], - "references": [{ "path": "../shared" }] -} diff --git a/src/features/encoders/oxipng/shared/tsconfig.json b/src/features/encoders/oxipng/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/encoders/oxipng/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/encoders/oxipng/worker/tsconfig.json b/src/features/encoders/oxipng/worker/tsconfig.json deleted file mode 100644 index 959fe910..00000000 --- a/src/features/encoders/oxipng/worker/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }, { "path": "../shared" }] -} diff --git a/src/features/encoders/webp/client/tsconfig.json b/src/features/encoders/webp/client/tsconfig.json deleted file mode 100644 index 291818af..00000000 --- a/src/features/encoders/webp/client/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom", "dom.iterable"], - "types": [] - }, - "include": [ - "./*.ts", - "../../../../client/lazy-app/worker-bridge/index.ts", - "../shared/*.ts" - ], - "references": [{ "path": "../shared" }] -} diff --git a/src/features/encoders/webp/shared/tsconfig.json b/src/features/encoders/webp/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/encoders/webp/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/encoders/webp/worker/tsconfig.json b/src/features/encoders/webp/worker/tsconfig.json deleted file mode 100644 index 959fe910..00000000 --- a/src/features/encoders/webp/worker/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }, { "path": "../shared" }] -} diff --git a/src/features/encoders/webp/worker/webpEncode.ts b/src/features/encoders/webp/worker/webpEncode.ts index 17008f4d..254cf070 100644 --- a/src/features/encoders/webp/worker/webpEncode.ts +++ b/src/features/encoders/webp/worker/webpEncode.ts @@ -12,7 +12,7 @@ */ import webpEncoder, { WebPModule } from 'codecs/webp/enc/webp_enc'; import wasmUrl from 'url:codecs/webp/enc/webp_enc.wasm'; -import { initEmscriptenModule } from 'features/util'; +import { initEmscriptenModule } from 'features/worker-utils'; import type { EncodeOptions } from '../shared/meta'; let emscriptenModule: Promise; diff --git a/src/features/preprocessors/rotate/shared/tsconfig.json b/src/features/preprocessors/rotate/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/preprocessors/rotate/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/preprocessors/rotate/worker/tsconfig.json b/src/features/preprocessors/rotate/worker/tsconfig.json deleted file mode 100644 index 959fe910..00000000 --- a/src/features/preprocessors/rotate/worker/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }, { "path": "../shared" }] -} diff --git a/src/features/processors/quantize/shared/tsconfig.json b/src/features/processors/quantize/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/processors/quantize/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/processors/quantize/worker/quantize.ts b/src/features/processors/quantize/worker/quantize.ts index 9d2db9f6..c62c02ee 100644 --- a/src/features/processors/quantize/worker/quantize.ts +++ b/src/features/processors/quantize/worker/quantize.ts @@ -12,7 +12,7 @@ */ import imagequant, { QuantizerModule } from 'codecs/imagequant/imagequant'; import wasmUrl from 'url:codecs/imagequant/imagequant.wasm'; -import { initEmscriptenModule } from 'features/util'; +import { initEmscriptenModule } from 'features/worker-utils'; import { Options } from '../shared/meta'; let emscriptenModule: Promise; diff --git a/src/features/processors/quantize/worker/tsconfig.json b/src/features/processors/quantize/worker/tsconfig.json deleted file mode 100644 index 959fe910..00000000 --- a/src/features/processors/quantize/worker/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }, { "path": "../shared" }] -} diff --git a/src/features/processors/resize/client/tsconfig.json b/src/features/processors/resize/client/tsconfig.json deleted file mode 100644 index 821289e4..00000000 --- a/src/features/processors/resize/client/tsconfig.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom", "dom.iterable"], - "types": [] - }, - "include": [ - "./*.ts", - "../../../../client/lazy-app/util.ts", - "../../../../client/lazy-app/Compress/index.tsx", - "../shared/*.ts" - ], - "references": [{ "path": "../shared" }] -} diff --git a/src/features/processors/resize/shared/tsconfig.json b/src/features/processors/resize/shared/tsconfig.json deleted file mode 100644 index bea39d16..00000000 --- a/src/features/processors/resize/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }] -} diff --git a/src/features/processors/resize/worker/tsconfig.json b/src/features/processors/resize/worker/tsconfig.json deleted file mode 100644 index 959fe910..00000000 --- a/src/features/processors/resize/worker/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../../../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "references": [{ "path": "../../../" }, { "path": "../shared" }] -} diff --git a/src/features/tsconfig.json b/src/features/tsconfig.json deleted file mode 100644 index 790bfa66..00000000 --- a/src/features/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - }, - "include": ["util.ts", "*.d.ts"], - "references": [] -} diff --git a/src/features/util.ts b/src/features/worker-utils/index.ts similarity index 100% rename from src/features/util.ts rename to src/features/worker-utils/index.ts diff --git a/src/shared/tsconfig.json b/src/shared/tsconfig.json deleted file mode 100644 index 19363e94..00000000 --- a/src/shared/tsconfig.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "extends": "../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom", "dom.iterable"], - "types": [] - } -} diff --git a/src/static-build/tsconfig.json b/src/static-build/tsconfig.json deleted file mode 100644 index ca483700..00000000 --- a/src/static-build/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["esnext", "dom"], - "types": ["node"] - }, - "references": [{ "path": "../shared" }] -} diff --git a/src/sw/tsconfig.json b/src/sw/tsconfig.json deleted file mode 100644 index ea96385f..00000000 --- a/src/sw/tsconfig.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "../../generic-tsconfig.json", - "compilerOptions": { - "lib": ["webworker", "esnext"] - } -} diff --git a/static-build-tsconfig.json b/static-build-tsconfig.json new file mode 100644 index 00000000..6bc8605f --- /dev/null +++ b/static-build-tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "./generic-tsconfig.json", + "compilerOptions": { + "lib": ["esnext", "dom"], + "types": ["node"] + }, + "include": ["src/shared/**/*", "src/static-build/**/*"] +} diff --git a/tsconfig.json b/tsconfig.json index 0bd1c448..9e0261be 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,9 +2,8 @@ "extends": "./generic-tsconfig.json", "files": [], "references": [ - { "path": "./src/client" }, - { "path": "./src/static-build" }, - { "path": "./src/shared" }, - { "path": "./src/sw" } + { "path": "./client-tsconfig.json" }, + { "path": "./worker-tsconfig.json" }, + { "path": "./static-build-tsconfig.json" } ] } diff --git a/worker-tsconfig.json b/worker-tsconfig.json new file mode 100644 index 00000000..b605e757 --- /dev/null +++ b/worker-tsconfig.json @@ -0,0 +1,13 @@ +{ + "extends": "./generic-tsconfig.json", + "compilerOptions": { + "lib": ["webworker", "esnext"] + }, + "include": [ + "src/features/**/worker/**/*", + "src/features/**/shared/**/*", + "src/features/worker-utils/**/*", + "src/features-worker/**/*", + "src/sw/**/*" + ] +}