diff --git a/src/client/lazy-app/Compress/custom-els/MultiPanel/index.ts b/in-progress/Compress/custom-els/MultiPanel/index.ts similarity index 100% rename from src/client/lazy-app/Compress/custom-els/MultiPanel/index.ts rename to in-progress/Compress/custom-els/MultiPanel/index.ts diff --git a/src/client/lazy-app/Compress/custom-els/MultiPanel/missing-types.d.ts b/in-progress/Compress/custom-els/MultiPanel/missing-types.d.ts similarity index 100% rename from src/client/lazy-app/Compress/custom-els/MultiPanel/missing-types.d.ts rename to in-progress/Compress/custom-els/MultiPanel/missing-types.d.ts diff --git a/src/client/lazy-app/Compress/custom-els/MultiPanel/styles.css b/in-progress/Compress/custom-els/MultiPanel/styles.css similarity index 100% rename from src/client/lazy-app/Compress/custom-els/MultiPanel/styles.css rename to in-progress/Compress/custom-els/MultiPanel/styles.css diff --git a/src/client/lazy-app/Compress/index.tsx b/in-progress/Compress/index.tsx similarity index 100% rename from src/client/lazy-app/Compress/index.tsx rename to in-progress/Compress/index.tsx diff --git a/src/client/lazy-app/Compress/result-cache.ts b/in-progress/Compress/result-cache.ts similarity index 96% rename from src/client/lazy-app/Compress/result-cache.ts rename to in-progress/Compress/result-cache.ts index dfef306e..839b499d 100644 --- a/src/client/lazy-app/Compress/result-cache.ts +++ b/in-progress/Compress/result-cache.ts @@ -1,4 +1,4 @@ -import { EncoderState } from '../../codecs/encoders'; +import { EncoderState } from '../feature-meta'; import { shallowEqual } from '../../lib/util'; import { PreprocessorState } from '../../codecs/preprocessors'; @@ -7,7 +7,7 @@ import * as identity from '../../codecs/identity/encoder-meta'; interface CacheResult { preprocessed: ImageData; data: ImageData; - file: Fileish; + file: File; } interface CacheEntry extends CacheResult { diff --git a/src/client/lazy-app/Compress/style.scss b/in-progress/Compress/style.scss similarity index 100% rename from src/client/lazy-app/Compress/style.scss rename to in-progress/Compress/style.scss diff --git a/in-progress/README.md b/in-progress/README.md new file mode 100644 index 00000000..25ee41ec --- /dev/null +++ b/in-progress/README.md @@ -0,0 +1 @@ +The compress folder was moved from src/client/lazy-app. diff --git a/package-lock.json b/package-lock.json index a3691be2..40593ac5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -205,9 +205,9 @@ "dev": true }, "@types/node": { - "version": "14.11.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz", - "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA==", + "version": "14.11.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.5.tgz", + "integrity": "sha512-jVFzDV6NTbrLMxm4xDSIW/gKnk8rQLF9wAzLWIOg+5nU6ACrIMndeBdXci0FGtqJbP9tQvm6V39eshc96TO2wQ==", "dev": true }, "@types/parse-json": { @@ -2783,9 +2783,9 @@ } }, "postcss": { - "version": "7.0.34", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz", - "integrity": "sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==", + "version": "7.0.35", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", + "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -5831,9 +5831,9 @@ "dev": true }, "preact": { - "version": "10.5.1", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.1.tgz", - "integrity": "sha512-1wiYdNmUNu5QshBGHalwpIBd8Fdf9354NkKRf6C0+qYlIL6Lp86u/W/JaJWT/DmTAuAyRJB4O6oGkcejupy88Q==", + "version": "10.5.4", + "resolved": "https://registry.npmjs.org/preact/-/preact-10.5.4.tgz", + "integrity": "sha512-u0LnVtL9WWF61RLzIbEsVFOdsahoTQkQqeRwyf4eWuLMFrxTH/C47tqcnizbUH54E4KG8UzuuZaMc9KarHmpqQ==", "dev": true }, "preact-render-to-string": { @@ -5984,9 +5984,9 @@ } }, "rollup": { - "version": "2.28.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.28.1.tgz", - "integrity": "sha512-DOtVoqOZt3+FjPJWLU8hDIvBjUylc9s6IZvy76XklxzcLvAQLtVAG/bbhsMhcWnYxC0TKKcf1QQ/tg29zeID0Q==", + "version": "2.28.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.28.2.tgz", + "integrity": "sha512-8txbsFBFLmm9Xdt4ByTOGa9Muonmc8MfNjnGAR8U8scJlF1ZW7AgNZa7aqBXaKtlvnYP/ab++fQIq9dB9NWUbg==", "dev": true, "requires": { "fsevents": "~2.1.2" diff --git a/package.json b/package.json index d77ec383..c3096abf 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@rollup/plugin-node-resolve": "^9.0.0", "@rollup/plugin-replace": "^2.3.3", "@surma/rollup-plugin-off-main-thread": "^1.4.1", - "@types/node": "^14.11.2", + "@types/node": "^14.11.5", "comlink": "^4.3.0", "cssnano": "^4.1.10", "del": "^5.1.0", @@ -24,15 +24,15 @@ "lint-staged": "^10.4.0", "lodash.camelcase": "^4.3.0", "mime-types": "^2.1.27", - "postcss": "^7.0.34", + "postcss": "^7.0.35", "postcss-modules": "^3.2.2", "postcss-nested": "^4.2.3", "postcss-simple-vars": "^5.0.2", "postcss-url": "^8.0.0", - "preact": "^10.5.1", + "preact": "^10.5.4", "preact-render-to-string": "^5.1.10", "prettier": "^2.1.2", - "rollup": "^2.28.1", + "rollup": "^2.28.2", "rollup-plugin-terser": "^7.0.2", "serve": "^11.3.2", "typescript": "^4.0.3" diff --git a/src/client/initial-app/App/index.tsx b/src/client/initial-app/App/index.tsx index a91ce7be..70ef1aa9 100644 --- a/src/client/initial-app/App/index.tsx +++ b/src/client/initial-app/App/index.tsx @@ -14,11 +14,9 @@ import 'shared/initial-app/custom-els/loading-spinner'; const ROUTE_EDITOR = '/editor'; -const compressPromise = import('client/lazy-app/Compress'); +//const compressPromise = import('client/lazy-app/Compress'); const swBridgePromise = import('client/lazy-app/sw-bridge'); -console.log(compressPromise); - function back() { window.history.back(); } diff --git a/src/client/lazy-app/worker-bridge/index.ts b/src/client/lazy-app/worker-bridge/index.ts index 26ee1233..9209a7d1 100644 --- a/src/client/lazy-app/worker-bridge/index.ts +++ b/src/client/lazy-app/worker-bridge/index.ts @@ -51,7 +51,8 @@ for (const methodName of methodNames) { return abortable( signal, - this._workerApi![methodName](...args) as any, + // @ts-ignore - TypeScript can't figure this out + this._workerApi![methodName](...args), ).finally(() => { // No longer care about aborting - this task is complete. signal.removeEventListener('abort', onAbort);