diff --git a/.github/workflows/experiments-test.yml b/.github/workflows/experiments-test.yml index c5bb274b7..ce1ab908d 100644 --- a/.github/workflows/experiments-test.yml +++ b/.github/workflows/experiments-test.yml @@ -30,8 +30,8 @@ jobs: - name: Running svelte-check run: npm run ex:check - - name: Building static version - run: npm run ex:build:static + - name: Building app + run: npm run ex:build env: SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} GA_TRACKING_ID: "G-PPE5XD2VKV" diff --git a/package-lock.json b/package-lock.json index 477a471ca..3d605533f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -683,7 +683,9 @@ "version": "4.20231218.0", "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20231218.0.tgz", "integrity": "sha512-Vs1FKjfUjXYGbCsXzkl+ITp0Iyb6QiW6+vTERTNThC+v96T0IvPVAioH4tT20rXwoxAfxh380mAaxYtTrJUNVg==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/@colors/colors": { "version": "1.5.0", @@ -10399,15 +10401,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/regexparam": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/regexparam/-/regexparam-3.0.0.tgz", - "integrity": "sha512-RSYAtP31mvYLkAHrOlh25pCNQ5hWnT106VukGaaFfuJrZFkGRX5GhUAdPqpSDXxOhA2c4akmRuplv1mRqnBn6Q==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/regexpp": { "version": "3.2.0", "dev": true, @@ -12281,19 +12274,6 @@ "dev": true, "peer": true }, - "node_modules/worktop": { - "version": "0.8.0-next.18", - "resolved": "https://registry.npmjs.org/worktop/-/worktop-0.8.0-next.18.tgz", - "integrity": "sha512-+TvsA6VAVoMC3XDKR5MoC/qlLqDixEfOBysDEKnPIPou/NvoPWCAuXHXMsswwlvmEuvX56lQjvELLyLuzTKvRw==", - "dev": true, - "dependencies": { - "mrmime": "^2.0.0", - "regexparam": "^3.0.0" - }, - "engines": { - "node": ">=12" - } - }, "node_modules/wrangler": { "version": "3.28.1", "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-3.28.1.tgz", @@ -12995,8 +12975,7 @@ }, "devDependencies": { "@rajesh896/broprint.js": "2.1.1", - "@sveltejs/adapter-cloudflare": "4.1.0", - "@sveltejs/adapter-static": "3.0.1", + "@sveltejs/adapter-node": "4.0.1", "@sveltejs/kit": "2.5.0", "@sveltejs/vite-plugin-svelte": "3.0.2", "@tailwindcss/forms": "0.5.7", @@ -13016,27 +12995,19 @@ "vite": "5.1.1" } }, - "packages/experiments/node_modules/@sveltejs/adapter-cloudflare": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-cloudflare/-/adapter-cloudflare-4.1.0.tgz", - "integrity": "sha512-AQQdZAZpcFDcBiMEmxbMYhn4yKZYoPZrKUrYpVejjbO+9obIGIuj/jWjVzAEkHqZMZuoRRqPbq+Zq+AWRm4x1Q==", + "packages/experiments/node_modules/@sveltejs/adapter-node": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-4.0.1.tgz", + "integrity": "sha512-IviiTtKCDp+0QoTmmMlGGZBA1EoUNsjecU6XGV9k62S3f01SNsVhpqi2e4nbI62BLGKh/YKKfFii+Vz/b9XIxg==", "dev": true, "dependencies": { - "@cloudflare/workers-types": "^4.20231121.0", - "esbuild": "^0.19.11", - "worktop": "0.8.0-next.18" + "@rollup/plugin-commonjs": "^25.0.7", + "@rollup/plugin-json": "^6.1.0", + "@rollup/plugin-node-resolve": "^15.2.3", + "rollup": "^4.9.5" }, "peerDependencies": { - "@sveltejs/kit": "^2.0.0" - } - }, - "packages/experiments/node_modules/@sveltejs/adapter-static": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.1.tgz", - "integrity": "sha512-6lMvf7xYEJ+oGeR5L8DFJJrowkefTK6ZgA4JiMqoClMkKq0s6yvsd3FZfCFvX1fQ0tpCD7fkuRVHsnUVgsHyNg==", - "dev": true, - "peerDependencies": { - "@sveltejs/kit": "^2.0.0" + "@sveltejs/kit": "^2.4.0" } }, "packages/experiments/node_modules/@sveltejs/kit": { @@ -13189,7 +13160,6 @@ }, "devDependencies": { "@flydotio/dockerfile": "0.5.2", - "@sveltejs/adapter-cloudflare": "4.1.0", "@sveltejs/adapter-node": "4.0.1", "@sveltejs/adapter-static": "3.0.1", "@sveltejs/kit": "2.5.0", @@ -13322,20 +13292,6 @@ "node": ">=8" } }, - "packages/web-client/node_modules/@sveltejs/adapter-cloudflare": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-cloudflare/-/adapter-cloudflare-4.1.0.tgz", - "integrity": "sha512-AQQdZAZpcFDcBiMEmxbMYhn4yKZYoPZrKUrYpVejjbO+9obIGIuj/jWjVzAEkHqZMZuoRRqPbq+Zq+AWRm4x1Q==", - "dev": true, - "dependencies": { - "@cloudflare/workers-types": "^4.20231121.0", - "esbuild": "^0.19.11", - "worktop": "0.8.0-next.18" - }, - "peerDependencies": { - "@sveltejs/kit": "^2.0.0" - } - }, "packages/web-client/node_modules/@sveltejs/adapter-node": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-4.0.1.tgz", @@ -13974,7 +13930,9 @@ "version": "4.20231218.0", "resolved": "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20231218.0.tgz", "integrity": "sha512-Vs1FKjfUjXYGbCsXzkl+ITp0Iyb6QiW6+vTERTNThC+v96T0IvPVAioH4tT20rXwoxAfxh380mAaxYtTrJUNVg==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "@colors/colors": { "version": "1.5.0", @@ -14833,8 +14791,7 @@ "requires": { "@hnn/components": "*", "@rajesh896/broprint.js": "2.1.1", - "@sveltejs/adapter-cloudflare": "4.1.0", - "@sveltejs/adapter-static": "3.0.1", + "@sveltejs/adapter-node": "4.0.1", "@sveltejs/kit": "2.5.0", "@sveltejs/vite-plugin-svelte": "3.0.2", "@tailwindcss/forms": "0.5.7", @@ -14862,24 +14819,18 @@ "vite": "5.1.1" }, "dependencies": { - "@sveltejs/adapter-cloudflare": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-cloudflare/-/adapter-cloudflare-4.1.0.tgz", - "integrity": "sha512-AQQdZAZpcFDcBiMEmxbMYhn4yKZYoPZrKUrYpVejjbO+9obIGIuj/jWjVzAEkHqZMZuoRRqPbq+Zq+AWRm4x1Q==", + "@sveltejs/adapter-node": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-4.0.1.tgz", + "integrity": "sha512-IviiTtKCDp+0QoTmmMlGGZBA1EoUNsjecU6XGV9k62S3f01SNsVhpqi2e4nbI62BLGKh/YKKfFii+Vz/b9XIxg==", "dev": true, "requires": { - "@cloudflare/workers-types": "^4.20231121.0", - "esbuild": "^0.19.11", - "worktop": "0.8.0-next.18" + "@rollup/plugin-commonjs": "^25.0.7", + "@rollup/plugin-json": "^6.1.0", + "@rollup/plugin-node-resolve": "^15.2.3", + "rollup": "^4.9.5" } }, - "@sveltejs/adapter-static": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.1.tgz", - "integrity": "sha512-6lMvf7xYEJ+oGeR5L8DFJJrowkefTK6ZgA4JiMqoClMkKq0s6yvsd3FZfCFvX1fQ0tpCD7fkuRVHsnUVgsHyNg==", - "dev": true, - "requires": {} - }, "@sveltejs/kit": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.0.tgz", @@ -14990,7 +14941,6 @@ "@hnn/components": "*", "@hnn/declarations": "*", "@sentry/sveltekit": "7.100.1", - "@sveltejs/adapter-cloudflare": "4.1.0", "@sveltejs/adapter-node": "4.0.1", "@sveltejs/adapter-static": "3.0.1", "@sveltejs/kit": "2.5.0", @@ -15103,17 +15053,6 @@ "@sentry/types": "7.100.1" } }, - "@sveltejs/adapter-cloudflare": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@sveltejs/adapter-cloudflare/-/adapter-cloudflare-4.1.0.tgz", - "integrity": "sha512-AQQdZAZpcFDcBiMEmxbMYhn4yKZYoPZrKUrYpVejjbO+9obIGIuj/jWjVzAEkHqZMZuoRRqPbq+Zq+AWRm4x1Q==", - "dev": true, - "requires": { - "@cloudflare/workers-types": "^4.20231121.0", - "esbuild": "^0.19.11", - "worktop": "0.8.0-next.18" - } - }, "@sveltejs/adapter-node": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/@sveltejs/adapter-node/-/adapter-node-4.0.1.tgz", @@ -21163,12 +21102,6 @@ "functions-have-names": "^1.2.2" } }, - "regexparam": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/regexparam/-/regexparam-3.0.0.tgz", - "integrity": "sha512-RSYAtP31mvYLkAHrOlh25pCNQ5hWnT106VukGaaFfuJrZFkGRX5GhUAdPqpSDXxOhA2c4akmRuplv1mRqnBn6Q==", - "dev": true - }, "regexpp": { "version": "3.2.0", "dev": true, @@ -22427,16 +22360,6 @@ "dev": true, "peer": true }, - "worktop": { - "version": "0.8.0-next.18", - "resolved": "https://registry.npmjs.org/worktop/-/worktop-0.8.0-next.18.tgz", - "integrity": "sha512-+TvsA6VAVoMC3XDKR5MoC/qlLqDixEfOBysDEKnPIPou/NvoPWCAuXHXMsswwlvmEuvX56lQjvELLyLuzTKvRw==", - "dev": true, - "requires": { - "mrmime": "^2.0.0", - "regexparam": "^3.0.0" - } - }, "wrangler": { "version": "3.28.1", "resolved": "https://registry.npmjs.org/wrangler/-/wrangler-3.28.1.tgz", diff --git a/package.json b/package.json index 44158cd87..6853b5e27 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "build": "echo RUN explicit build commands", "ex:check": "npm run ex:sync && npm run check --w @hnn/experiments", "ex:build": "npm run build --w @hnn/experiments", - "ex:build:static": "npm run build:static --w @hnn/experiments", "ex:dev": "npm run dev --w @hnn/experiments", "ex:preview": "npm run preview --w @hnn/experiments", "ex:start": "npm run start --w @hnn/experiments", diff --git a/packages/experiments/package.json b/packages/experiments/package.json index 80e17fb38..085847c50 100644 --- a/packages/experiments/package.json +++ b/packages/experiments/package.json @@ -6,9 +6,7 @@ "scripts": { "dev": "vite dev --host", "build": "vite build", - "build:static": "BUILD_MODE=static vite build", "preview": "vite preview", - "preview:static": "BUILD_MODE=static vite preview", "check": "svelte-check --tsconfig ./tsconfig.json --ignore .svelte-kit,build,tests --threshold warning --diagnostic-sources \"js,ts,svelte\"", "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch", "tsc": "tsc -b", @@ -29,8 +27,7 @@ "throttle-debounce": "5.0.0" }, "devDependencies": { - "@sveltejs/adapter-cloudflare": "4.1.0", - "@sveltejs/adapter-static": "3.0.1", + "@sveltejs/adapter-node": "4.0.1", "@sveltejs/kit": "2.5.0", "@tailwindcss/forms": "0.5.7", "@sveltejs/vite-plugin-svelte": "3.0.2", diff --git a/packages/experiments/svelte.config.js b/packages/experiments/svelte.config.js index fb62de49b..12810e185 100644 --- a/packages/experiments/svelte.config.js +++ b/packages/experiments/svelte.config.js @@ -1,16 +1,9 @@ -import staticAdapter from '@sveltejs/adapter-static' -import cfAdapter from '@sveltejs/adapter-cloudflare' +import adapter from '@sveltejs/adapter-node' import preprocess from 'svelte-preprocess' -const staticMode = process.env.BUILD_MODE == 'static' const isDev = process.env.NODE_ENV == 'dev' -console.log( - 'Adapter: ', - staticMode ? 'static' : 'cloudflare', - 'build mode; csp enabled', - isDev, -) +console.log('Adapter: node', 'build mode; csp enabled', isDev) /** @type {import('@sveltejs/kit').Config} */ const config = { @@ -28,11 +21,7 @@ const config = { server: './hooks/server.hooks.ts', }, }, - adapter: staticMode - ? staticAdapter({ - fallback: 'index.html', - }) - : cfAdapter(), + adapter: adapter(), }, } diff --git a/packages/web-client/package.json b/packages/web-client/package.json index 78867bffc..fb9ce9f36 100644 --- a/packages/web-client/package.json +++ b/packages/web-client/package.json @@ -41,7 +41,6 @@ }, "devDependencies": { "@flydotio/dockerfile": "0.5.2", - "@sveltejs/adapter-cloudflare": "4.1.0", "@sveltejs/adapter-node": "4.0.1", "@sveltejs/adapter-static": "3.0.1", "@sveltejs/kit": "2.5.0", diff --git a/packages/web-client/svelte.config.js b/packages/web-client/svelte.config.js index efc354a75..6509775c2 100644 --- a/packages/web-client/svelte.config.js +++ b/packages/web-client/svelte.config.js @@ -1,5 +1,4 @@ import staticAdapter from '@sveltejs/adapter-static' -// import cfAdapter from '@sveltejs/adapter-cloudflare' import preprocess from 'svelte-preprocess' import nodeAdapter from '@sveltejs/adapter-node' // import cspDirectives from './directives.js'