diff --git a/package-lock.json b/package-lock.json index a55e8ee..a9d6933 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,10 +12,8 @@ "@cloudflare/vitest-pool-workers": "0.5.40", "@cloudflare/workers-types": "4.20241224.0", "@nodecraft/eslint-config": "44.3.0", - "@types/base64-js": "1.3.2", "@typescript-eslint/eslint-plugin": "8.18.2", "@typescript-eslint/parser": "8.18.2", - "base64-js": "1.5.1", "eslint": "8.57.1", "eslint-plugin-import": "2.31.0", "eslint-plugin-json": "4.0.1", @@ -1212,13 +1210,6 @@ "eslint": ">=8.40.0" } }, - "node_modules/@types/base64-js": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/@types/base64-js/-/base64-js-1.3.2.tgz", - "integrity": "sha512-Q2Xn2/vQHRGLRXhQ5+BSLwhHkR3JVflxVKywH0Q6fVoAiUE8fFYL2pE5/l2ZiOiBDfA8qUqRnSxln4G/NFz1Sg==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/estree": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", @@ -1808,27 +1799,6 @@ "dev": true, "license": "MIT" }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/birpc": { "version": "0.2.14", "resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.14.tgz", diff --git a/package.json b/package.json index 99faf22..dc59c31 100644 --- a/package.json +++ b/package.json @@ -23,10 +23,8 @@ "@cloudflare/vitest-pool-workers": "0.5.40", "@cloudflare/workers-types": "4.20241224.0", "@nodecraft/eslint-config": "44.3.0", - "@types/base64-js": "1.3.2", "@typescript-eslint/eslint-plugin": "8.18.2", "@typescript-eslint/parser": "8.18.2", - "base64-js": "1.5.1", "eslint": "8.57.1", "eslint-plugin-import": "2.31.0", "eslint-plugin-json": "4.0.1", diff --git a/src/worker/alex.png b/src/worker/assets/alex.png similarity index 100% rename from src/worker/alex.png rename to src/worker/assets/alex.png diff --git a/src/worker/assets/assets.d.ts b/src/worker/assets/assets.d.ts new file mode 100644 index 0000000..9f58c03 --- /dev/null +++ b/src/worker/assets/assets.d.ts @@ -0,0 +1,4 @@ +declare module '*.png' { + const value: ArrayBuffer; + export default value; +} diff --git a/src/worker/assets/empty.png b/src/worker/assets/empty.png new file mode 100644 index 0000000..3c86ed1 Binary files /dev/null and b/src/worker/assets/empty.png differ diff --git a/src/worker/assets/steve.png b/src/worker/assets/steve.png new file mode 100644 index 0000000..079c8bc Binary files /dev/null and b/src/worker/assets/steve.png differ diff --git a/src/worker/data.ts b/src/worker/data.ts index 275d69d..18e8793 100644 --- a/src/worker/data.ts +++ b/src/worker/data.ts @@ -1,5 +1,3 @@ -import { toByteArray } from 'base64-js'; - -export const STEVE_SKIN = toByteArray('iVBORw0KGgoAAAANSUhEUgAAAEAAAAAgCAMAAACVQ462AAABI1BMVEX///////9VxsnAmIO3kHe3kHW3jXW4i3C1i3Wxi2+xhXWuhnBIqq2ognCufmqsfmalf2lFo6ameV5AmpyXdF8+lZeRcV6cbUyXbVOWbFCZa02WakyUZ06WZkuWZkqUZkmQYkaQYkVra2uKYUeJYEIye32DXD2EWz+CWj5MWsmBWD9+Vz+AVjl8VT1+VTZ7VTh1UDcoZWdwSjNvSjNxRjhMR4c+SKNqRzBoRS4kXV9lQzNeRDIiWFo0PIc/Pz9NMycrMXBNLCg/KxU9KxciKFo4KBYoKCgyJRQxJBMwIxIuIhMsIBItIA8tHxErHhAqHhIqHhAqHg8pHQ8oHA4nHA0nGw0nGwwmGw0mGg4lGg0lGgwkGA0jGAsjGAoiFwodEQwAAABM5QizAAAAAXRSTlMAQObYZgAAAl9JREFUeNqlkwtX0zAYhmHeUKI21gwQZfVSwNEhGYJa2oEKCsyOtIVuZAz8/7/Ctwk54nakuzxnZ3nb7X3OlzWbMiRJD6/eVf2aqVFJelEEQa/ue77njSOIIqkFv4E/uqAX5XuIkrEF6EoZTSJQfSP4OoZARqm8ygWKMQSpBEky8mPMMtlOj5rNX3F02pNx0mwepW2ZZeZcDCOQIo0P4zg+/PZdnB7GqZAQmHNRKBBdmYqzizR+eO/O/bvPfqYXZyKVXWHORfEEnZbI2uLYmrUeP59ZWDgW7Uy0Opk5F8WCLDu/XF06mJ3eejKzNW0dLK1enuOmPhdDCTrdk3Vn+dXTR77/YO7DsrN+0u1AoPpDCETW2pmvePW3rz+Cd7W6V5nfaWXCnItCgedVvEVnZfPT51ptY21tY3PlxeLLxQr+kBLUvalheA9+AHNdqitKX64x92mpRP1df7dY4CsGBCUwqYCi70+yhUHB3t7+3jbAkq+h67oBs2tztZptu8CmlBJCqc5ErQT8FezfEACXc5dSG31CkDklAAJEl1Bi416/QBfNytUXqM3Q5IBoqBIjFAoCzgN8bjO86cwIZVpgk9smQAgBD4KAsbzGWABUG9eO41QtUEWwwL+CMMQEWoAOZ0zXODJRF1QLypblVLXgv1vIS/kAVAk4V21IqlpQVoJy+YYA9D8FI0DmiFqgR4cAIjAoAEZAVIswnTXoaYHTJ2g0jKDReANc7rqMoU+1AFn9DE4uAA7It3JDoItmxVb2t3NCCPJDFoaUsXBbCdDEJEUCTKQNTGcEvDkAvXK1b4I/5xTh7KYhy4MAAAAASUVORK5CYII='); -export const ALEX_SKIN = toByteArray('iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAA6lBMVEUAAADlmUfljT/YgDLckzzonUyqiV6ce1DfxqPr07Py2rrky6n7+/sjYiTy3cLu1rbv2bvy273u17nvu7FkQSwoKCh6tXeGh2FoRTB6r3fYupR5VT2AWkBtSjOMvop9snqBtX+LuohyTjZvTDWKi2aMjWh3r3WAglqHiWKPkGuGXkZ9tHrkyag7Ozt4VDxGRkZJSUlaWlpdXV1NTU1XV1fp0K/s1Ljky6phYWFra2vp0bPv2b3ly63v2r8YOBYaPxlPgEx3sHRSUlJjY2NKSkpQUFDy38jq1LhcXFw/Pz9wcHBISEhMTEx1UDg5NQK9AAAAAXRSTlMAQObYZgAAAypJREFUeNqczkd2A0EQw1ADU5RdbWXd/67K6wnY8z/+fANBnD79rE2EItO0e7QBoIIl0+730W7DgwpgbQeMmPrbCiAWyWagFPABPNsABBNTf59WXA9JRBRBxCAicRaQ71QK/GoJJjILJCIBqW6MGkxiWAJQkCqqqsf/P1CYYAziLFBAddf//jCOh/1/CYgIgcwDpvo4xuk8juNyHV0I0aCBWUBCj+PxMb/dxuhjl0hUAs4CSD8fjIfwdLoEEQP3dsujK3IYCMJkkA46eT0SNu2RTc5RRHvImf//d7Z6Ld56nmDiderSrcfU12qSCtebGkQR9Af6PsetWWh+WntNeRljlsXyQABodno+AMSDA5aWWj8CxLIYCCCkxHciXCEEgBobnaQrOtIRUZbFOBMD+Ffx358J/1jbFtMN2Yw/bsk2pxuj8ySBX0dFmuYxf3AVAMk/RWP476TdthbTY5sRf9laagJgLVKd1zXJDQOyNSHwa8CmNkQWAFzNEhdD3YAIs3XSBVgnWlubnsc6JibL9sxubG5utLZavjQBULG9XXDVEE8CIKP5HVzbA4hoFxJC+NIA7O3tRXp/X0doDiCDqRlc7DOQxYFP7JOSEUIK2QAcHh7uHR0fH+2hOTk9PWEAUY3gdTDd4kjwA3Am3LmTUjUB0MXl5QVXBsQQ0Tp7AOAeLQ5OOHEl5bW7KaW86gLs1YC9GlB1qs4tAOtEtx3uie5wuHXQlVKudE6p5g1OTu73jh4ejvbuT04en54esYGpqgreqmNwBVTmdJwrS6WeGfCsXroBr3yD1wbA8trWkuGeV0Bflq58flYl6nPXDd7e3l4f3t8fXtF8fH5+mBgm/QVpW8OIZd01AFjBecBEE0000Uh5Yd4/6yMDpufHBczwsz4GYCYeAsA5YSVNNNci48cFL7x/5WhmkOlw6iTJv/MCjPPTAAS5oBcg12nx/7nnXJAFuaDH/gDwBh4Q5ILeCvNCkAt6K8wLQS7orTAv8FwJghM+F/RWmBdgvL5iwM1AgDAv+FxQlwEAQV7g51ipq7oMAAjyQslO5AIQ1PNzT+vPeaEUiCQ+2vwE+AvPvqCUbKfGoQAAAABJRU5ErkJggg=='); -export const EMPTY = toByteArray('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAC0lEQVQIW2NgAAIAAAUAAR4f7BQAAAAASUVORK5CYII='); +export { default as STEVE_SKIN } from './assets/steve.png'; +export { default as ALEX_SKIN } from './assets/alex.png'; +export { default as EMPTY } from './assets/empty.png'; diff --git a/src/worker/metadata_wasm.json b/src/worker/metadata_wasm.json deleted file mode 100644 index afc6d35..0000000 --- a/src/worker/metadata_wasm.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "body_part": "script", - "bindings": [ - { - "name": "wasm", - "type": "wasm_module", - "part": "wasmprogram" - } - ] -} diff --git a/src/worker/steve.png b/src/worker/steve.png deleted file mode 100644 index e7a2244..0000000 Binary files a/src/worker/steve.png and /dev/null differ diff --git a/wrangler.toml b/wrangler.toml index 0d929fe..468ba39 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -1,13 +1,17 @@ name = "crafthead-dev" main = "src/worker/index.ts" workers_dev = true -compatibility_date = "2024-01-28" +compatibility_date = "2024-12-27" analytics_engine_datasets = [ { binding = "CRAFTHEAD_ANALYTICS" } ] compatibility_flags = ["nodejs_compat", "no_nodejs_compat_v2"] +rules = [ + { type = "Data", globs = ["**/*.png"], fallthrough = true } +] + [assets] directory = "./src/website" binding = "ASSETS" @@ -20,6 +24,7 @@ command = "npm run build" # required [env.production] name = "crafthead" +main = "src/worker/index.ts" route = { pattern = "crafthead.net/*", zone_name = "crafthead.net" } analytics_engine_datasets = [ { binding = "CRAFTHEAD_ANALYTICS" }