From 64c63d922d56ff7c7b75a4d5f995fb9ed674cc02 Mon Sep 17 00:00:00 2001 From: Sander Nilsen Rysjedal Date: Fri, 25 Oct 2024 13:48:33 +0200 Subject: [PATCH] update remix --- package-lock.json | 243 +++++++++++++++++++++++++++++++++++++++++----- package.json | 4 +- remix.config.js | 6 ++ server.js | 6 +- 4 files changed, 230 insertions(+), 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index b09edf2..0a8a848 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,8 @@ "@navikt/ds-tokens": "^6.1.0", "@remix-run/css-bundle": "^2.3.1", "@remix-run/express": "^2.8.1", - "@remix-run/node": "^2.3.1", - "@remix-run/react": "^2.3.1", + "@remix-run/node": "^2.13.1", + "@remix-run/react": "^2.13.1", "@remix-run/serve": "^2.3.1", "express": "^4.19.1", "http-proxy-middleware": "^2.0.6", @@ -3936,6 +3936,34 @@ } } }, + "node_modules/@remix-run/dev/node_modules/@remix-run/node": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.3.1.tgz", + "integrity": "sha512-dXoNrmLrPblUM8UjgPzq3YBLXEGzm3HwtIt0iob1SlgKx0I5ii40JG0IXHDTI9f+fN9f/Ufx7Cjp0MGcUVXWVw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@remix-run/server-runtime": "2.3.1", + "@remix-run/web-fetch": "^4.4.1", + "@remix-run/web-file": "^3.1.0", + "@remix-run/web-stream": "^1.1.0", + "@web3-storage/multipart-parser": "^1.0.0", + "cookie-signature": "^1.1.0", + "source-map-support": "^0.5.21", + "stream-slice": "^0.1.2" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "typescript": "^5.1.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/@remix-run/eslint-config": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/@remix-run/eslint-config/-/eslint-config-2.3.1.tgz", @@ -4065,18 +4093,53 @@ } }, "node_modules/@remix-run/node": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.3.1.tgz", - "integrity": "sha512-dXoNrmLrPblUM8UjgPzq3YBLXEGzm3HwtIt0iob1SlgKx0I5ii40JG0IXHDTI9f+fN9f/Ufx7Cjp0MGcUVXWVw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.13.1.tgz", + "integrity": "sha512-2ly7bENj2n2FNBdEN60ZEbNCs5dAOex/QJoo6EZ8RNFfUQxVKAZkMwfQ4ETV2SLWDgkRLj3Jo5n/dx7O2ZGhGw==", + "license": "MIT", "dependencies": { - "@remix-run/server-runtime": "2.3.1", - "@remix-run/web-fetch": "^4.4.1", - "@remix-run/web-file": "^3.1.0", - "@remix-run/web-stream": "^1.1.0", + "@remix-run/server-runtime": "2.13.1", + "@remix-run/web-fetch": "^4.4.2", "@web3-storage/multipart-parser": "^1.0.0", "cookie-signature": "^1.1.0", "source-map-support": "^0.5.21", - "stream-slice": "^0.1.2" + "stream-slice": "^0.1.2", + "undici": "^6.11.1" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "typescript": "^5.1.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@remix-run/node/node_modules/@remix-run/router": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz", + "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@remix-run/node/node_modules/@remix-run/server-runtime": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.13.1.tgz", + "integrity": "sha512-2DfBPRcHKVzE4bCNsNkKB50BhCCKF73x+jiS836OyxSIAL+x0tguV2AEjmGXefEXc5AGGzoxkus0AUUEYa29Vg==", + "license": "MIT", + "dependencies": { + "@remix-run/router": "1.20.0", + "@types/cookie": "^0.6.0", + "@web3-storage/multipart-parser": "^1.0.0", + "cookie": "^0.6.0", + "set-cookie-parser": "^2.4.8", + "source-map": "^0.7.3", + "turbo-stream": "2.4.0" }, "engines": { "node": ">=18.0.0" @@ -4090,14 +4153,41 @@ } } }, + "node_modules/@remix-run/node/node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "license": "MIT" + }, + "node_modules/@remix-run/node/node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/@remix-run/node/node_modules/undici": { + "version": "6.20.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.20.1.tgz", + "integrity": "sha512-AjQF1QsmqfJys+LXfGTNum+qw4S88CojRInG/6t31W/1fk6G59s92bnAvGz5Cmur+kQv2SURXEvvudLmbrE8QA==", + "license": "MIT", + "engines": { + "node": ">=18.17" + } + }, "node_modules/@remix-run/react": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.3.1.tgz", - "integrity": "sha512-7NozlZtbL5jtRGJhSrMydUGJGVp8kSjnv7APcsDojLbRHZJsLw8B0eXlVqKDg2M+WfRcBkuTI/ipgwIyLPRRyw==", + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/@remix-run/react/-/react-2.13.1.tgz", + "integrity": "sha512-kZevCoKMz0ZDOOzTnG95yfM7M9ju38FkWNY1wtxCy+NnUJYrmTerGQtiBsJgMzYD6i29+w4EwoQsdqys7DmMSg==", + "license": "MIT", "dependencies": { - "@remix-run/router": "1.13.0", - "@remix-run/server-runtime": "2.3.1", - "react-router-dom": "6.20.0" + "@remix-run/router": "1.20.0", + "@remix-run/server-runtime": "2.13.1", + "react-router": "6.27.0", + "react-router-dom": "6.27.0", + "turbo-stream": "2.4.0" }, "engines": { "node": ">=18.0.0" @@ -4113,6 +4203,56 @@ } } }, + "node_modules/@remix-run/react/node_modules/@remix-run/router": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz", + "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/@remix-run/react/node_modules/@remix-run/server-runtime": { + "version": "2.13.1", + "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.13.1.tgz", + "integrity": "sha512-2DfBPRcHKVzE4bCNsNkKB50BhCCKF73x+jiS836OyxSIAL+x0tguV2AEjmGXefEXc5AGGzoxkus0AUUEYa29Vg==", + "license": "MIT", + "dependencies": { + "@remix-run/router": "1.20.0", + "@types/cookie": "^0.6.0", + "@web3-storage/multipart-parser": "^1.0.0", + "cookie": "^0.6.0", + "set-cookie-parser": "^2.4.8", + "source-map": "^0.7.3", + "turbo-stream": "2.4.0" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "typescript": "^5.1.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@remix-run/react/node_modules/@types/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==", + "license": "MIT" + }, + "node_modules/@remix-run/react/node_modules/cookie": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", + "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/@remix-run/router": { "version": "1.13.0", "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.13.0.tgz", @@ -4162,6 +4302,33 @@ } } }, + "node_modules/@remix-run/serve/node_modules/@remix-run/node": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.3.1.tgz", + "integrity": "sha512-dXoNrmLrPblUM8UjgPzq3YBLXEGzm3HwtIt0iob1SlgKx0I5ii40JG0IXHDTI9f+fN9f/Ufx7Cjp0MGcUVXWVw==", + "license": "MIT", + "dependencies": { + "@remix-run/server-runtime": "2.3.1", + "@remix-run/web-fetch": "^4.4.1", + "@remix-run/web-file": "^3.1.0", + "@remix-run/web-stream": "^1.1.0", + "@web3-storage/multipart-parser": "^1.0.0", + "cookie-signature": "^1.1.0", + "source-map-support": "^0.5.21", + "stream-slice": "^0.1.2" + }, + "engines": { + "node": ">=18.0.0" + }, + "peerDependencies": { + "typescript": "^5.1.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/@remix-run/server-runtime": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.3.1.tgz", @@ -14699,11 +14866,12 @@ } }, "node_modules/react-router": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.20.0.tgz", - "integrity": "sha512-pVvzsSsgUxxtuNfTHC4IxjATs10UaAtvLGVSA1tbUE4GDaOSU1Esu2xF5nWLz7KPiMuW8BJWuPFdlGYJ7/rW0w==", + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.27.0.tgz", + "integrity": "sha512-YA+HGZXz4jaAkVoYBE98VQl+nVzI+cVI2Oj/06F5ZM+0u3TgedN9Y9kmMRo2mnkSK2nCpNQn0DVob4HCsY/WLw==", + "license": "MIT", "dependencies": { - "@remix-run/router": "1.13.0" + "@remix-run/router": "1.20.0" }, "engines": { "node": ">=14.0.0" @@ -14713,12 +14881,13 @@ } }, "node_modules/react-router-dom": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.20.0.tgz", - "integrity": "sha512-CbcKjEyiSVpA6UtCHOIYLUYn/UJfwzp55va4yEfpk7JBN3GPqWfHrdLkAvNCcpXr8QoihcDMuk0dzWZxtlB/mQ==", + "version": "6.27.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.27.0.tgz", + "integrity": "sha512-+bvtFWMC0DgAFrfKXKG9Fc+BcXWRUO1aJIihbB79xaeq0v5UzfvnM5houGUm1Y461WVRcgAQ+Clh5rdb1eCx4g==", + "license": "MIT", "dependencies": { - "@remix-run/router": "1.13.0", - "react-router": "6.20.0" + "@remix-run/router": "1.20.0", + "react-router": "6.27.0" }, "engines": { "node": ">=14.0.0" @@ -14728,6 +14897,24 @@ "react-dom": ">=16.8" } }, + "node_modules/react-router-dom/node_modules/@remix-run/router": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz", + "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, + "node_modules/react-router/node_modules/@remix-run/router": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.20.0.tgz", + "integrity": "sha512-mUnk8rPJBI9loFDZ+YzPGdeniYK+FTmRD1TMCz7ev2SNIozyKKpnGgsxO34u6Z4z/t0ITuu7voi/AshfsGsgFg==", + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -16400,6 +16587,12 @@ "node": "*" } }, + "node_modules/turbo-stream": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz", + "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==", + "license": "ISC" + }, "node_modules/tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", diff --git a/package.json b/package.json index 0e8aac8..ea1af7e 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ "@navikt/ds-tokens": "^6.1.0", "@remix-run/css-bundle": "^2.3.1", "@remix-run/express": "^2.8.1", - "@remix-run/node": "^2.3.1", - "@remix-run/react": "^2.3.1", + "@remix-run/node": "^2.13.1", + "@remix-run/react": "^2.13.1", "@remix-run/serve": "^2.3.1", "express": "^4.19.1", "http-proxy-middleware": "^2.0.6", diff --git a/remix.config.js b/remix.config.js index f9751f7..eb540fa 100644 --- a/remix.config.js +++ b/remix.config.js @@ -8,6 +8,12 @@ // }; /** @type {import('@remix-run/dev').AppConfig} */ module.exports = { + future: { + v2_meta: true, + v2_routeConvention: true, + v2_errorBoundary: true, + v2_headers: true, + }, ignoredRouteFiles: ["**/.*,", "**/*.css"], serverModuleFormat: "cjs", publicPath: "/rapportering/build/", diff --git a/server.js b/server.js index 1f402b2..ee446e7 100644 --- a/server.js +++ b/server.js @@ -24,8 +24,10 @@ app.use('/rapportering/build', express.static('build', { immutable: true, maxAge // Handle all other requests with Remix app.all('*', createRequestHandler({ - getLoadContext: () => ({}), // Your context here - build: require(path.join(__dirname, 'build')), + getLoadContext() { + return {}; + }, + mode: process.env.NODE_ENV, })); const port = process.env.PORT || 8000;