From 1af812d8cdd14acded2aac86537e76681d21e1e0 Mon Sep 17 00:00:00 2001 From: Horus Lugo Date: Sat, 16 Mar 2024 23:11:02 +0100 Subject: [PATCH] Update deps and project config --- apps/remix-demo/app/root.tsx | 10 +- apps/remix-demo/package.json | 20 +- apps/remix-demo/test/build.test.ts | 4 +- apps/remix-demo/vite.config.ts | 13 +- pnpm-lock.yaml | 330 ++++++++++++----------------- 5 files changed, 158 insertions(+), 219 deletions(-) diff --git a/apps/remix-demo/app/root.tsx b/apps/remix-demo/app/root.tsx index db3d58b..167a611 100644 --- a/apps/remix-demo/app/root.tsx +++ b/apps/remix-demo/app/root.tsx @@ -1,6 +1,5 @@ import { Links, - LiveReload, Meta, Outlet, Scripts, @@ -9,7 +8,7 @@ import { import "./stylex.css"; -export default function App() { +export function Layout({ children }: { children: React.ReactNode }) { return ( @@ -19,11 +18,14 @@ export default function App() { - + {children} - ); } + +export default function App() { + return ; +} diff --git a/apps/remix-demo/package.json b/apps/remix-demo/package.json index 635b6b5..96f02ae 100644 --- a/apps/remix-demo/package.json +++ b/apps/remix-demo/package.json @@ -4,16 +4,16 @@ "sideEffects": false, "type": "module", "scripts": { - "build": "vite build && vite build --ssr", - "dev": "vite dev", - "start": "remix-serve ./build/index.js", + "build": "remix vite:build", + "dev": "remix vite:dev", + "start": "remix-serve ./build/server/index.js", "typecheck": "tsc", "test": "tsx --test test/*.test.ts" }, "dependencies": { - "@remix-run/node": "^2.4.0", - "@remix-run/react": "^2.4.0", - "@remix-run/serve": "^2.4.0", + "@remix-run/node": "^2.8.1", + "@remix-run/react": "^2.8.1", + "@remix-run/serve": "^2.8.1", "@stylexjs/stylex": "^0.5.1", "isbot": "^3.6.8", "react": "^18.2.0", @@ -21,16 +21,16 @@ }, "devDependencies": { "@internal/test-utils": "workspace:*", - "@remix-run/dev": "^2.4.0", - "@remix-run/eslint-config": "^2.4.0", + "@remix-run/dev": "^2.8.1", + "@remix-run/eslint-config": "^2.8.1", "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "eslint": "^8.38.0", "tsx": "^4.6.2", "typescript": "^5.1.6", - "vite": "^5.0.0", + "vite": "^5.1.6", "vite-plugin-stylex": "workspace:*", - "vite-tsconfig-paths": "^4.2.1" + "vite-tsconfig-paths": "^4.3.2" }, "engines": { "node": ">=18.0.0" diff --git a/apps/remix-demo/test/build.test.ts b/apps/remix-demo/test/build.test.ts index a74e0aa..1dbca2e 100644 --- a/apps/remix-demo/test/build.test.ts +++ b/apps/remix-demo/test/build.test.ts @@ -29,8 +29,8 @@ describe("build", () => { }); test("builds without crashing", async () => { - process.env.ASSETS_BUILD_DIRECTORY = path.join(tempPublicDir, "build"); - process.env.SERVER_BUILD_PATH = path.join(tempDir, "index.mjs"); + process.env.OVERRIDE_BUILD_DIRECTORY = path.join(tempPublicDir, "build"); + process.env.OVERRIDE_SERVER_BUILD_FILE = path.join(tempDir, "index.mjs"); const result = cp.spawnSync("pnpm", ["build"], { cwd: VITE_ROOT, diff --git a/apps/remix-demo/vite.config.ts b/apps/remix-demo/vite.config.ts index 757f5d2..142dc09 100644 --- a/apps/remix-demo/vite.config.ts +++ b/apps/remix-demo/vite.config.ts @@ -1,16 +1,19 @@ -import { unstable_vitePlugin as remix } from "@remix-run/dev"; +import { vitePlugin as remix } from "@remix-run/dev"; +import { installGlobals } from "@remix-run/node"; import { Plugin, defineConfig } from "vite"; import tsconfigPaths from "vite-tsconfig-paths"; import styleX from "vite-plugin-stylex"; -const OVERRIDE_ASSETS_BUILD_DIRECTORY = process.env.ASSETS_BUILD_DIRECTORY; -const OVERRIDE_SERVER_BUILD_PATH = process.env.SERVER_BUILD_PATH; +installGlobals(); + +const OVERRIDE_BUILD_DIRECTORY = process.env.OVERRIDE_BUILD_DIRECTORY; +const OVERRIDE_SERVER_BUILD_FILE = process.env.OVERRIDE_SERVER_BUILD_FILE; export default defineConfig({ plugins: [ remix({ - assetsBuildDirectory: OVERRIDE_ASSETS_BUILD_DIRECTORY, - serverBuildPath: OVERRIDE_SERVER_BUILD_PATH, + buildDirectory: OVERRIDE_BUILD_DIRECTORY || "build", + serverBuildFile: OVERRIDE_SERVER_BUILD_FILE || "build/server/index.mjs", }), tsconfigPaths(), styleX() as Plugin, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 20e6705..d01adc6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -55,14 +55,14 @@ importers: apps/remix-demo: dependencies: '@remix-run/node': - specifier: ^2.4.0 - version: 2.4.0(typescript@5.2.2) + specifier: ^2.8.1 + version: 2.8.1(typescript@5.2.2) '@remix-run/react': - specifier: ^2.4.0 - version: 2.4.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2) + specifier: ^2.8.1 + version: 2.8.1(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2) '@remix-run/serve': - specifier: ^2.4.0 - version: 2.4.0(typescript@5.2.2) + specifier: ^2.8.1 + version: 2.8.1(typescript@5.2.2) '@stylexjs/stylex': specifier: ^0.5.1 version: 0.5.1 @@ -80,11 +80,11 @@ importers: specifier: workspace:* version: link:../../packages/test-utils '@remix-run/dev': - specifier: ^2.4.0 - version: 2.4.0(@remix-run/serve@2.4.0)(typescript@5.2.2)(vite@5.0.6) + specifier: ^2.8.1 + version: 2.8.1(@remix-run/serve@2.8.1)(typescript@5.2.2)(vite@5.1.6) '@remix-run/eslint-config': - specifier: ^2.4.0 - version: 2.4.0(eslint@8.55.0)(react@18.2.0)(typescript@5.2.2) + specifier: ^2.8.1 + version: 2.8.1(eslint@8.55.0)(react@18.2.0)(typescript@5.2.2) '@types/react': specifier: ^18.2.20 version: 18.2.42 @@ -101,14 +101,14 @@ importers: specifier: ^5.1.6 version: 5.2.2 vite: - specifier: ^5.0.0 - version: 5.0.6 + specifier: ^5.1.6 + version: 5.1.6 vite-plugin-stylex: specifier: workspace:* version: link:../../packages/vite-plugin-stylex vite-tsconfig-paths: - specifier: ^4.2.1 - version: 4.2.1(typescript@5.2.2)(vite@5.0.6) + specifier: ^4.3.2 + version: 4.3.2(typescript@5.2.2)(vite@5.1.6) apps/storybook-demo: dependencies: @@ -423,14 +423,14 @@ packages: transitivePeerDependencies: - supports-color - /@babel/eslint-parser@7.23.3(@babel/core@7.23.5)(eslint@8.55.0): + /@babel/eslint-parser@7.23.3(@babel/core@7.23.9)(eslint@8.55.0): resolution: {integrity: sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} peerDependencies: '@babel/core': ^7.11.0 eslint: ^7.5.0 || ^8.0.0 dependencies: - '@babel/core': 7.23.5 + '@babel/core': 7.23.9 '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1 eslint: 8.55.0 eslint-visitor-keys: 2.1.0 @@ -491,24 +491,6 @@ packages: lru-cache: 5.1.1 semver: 6.3.1 - /@babel/helper-create-class-features-plugin@7.23.5(@babel/core@7.23.5): - resolution: {integrity: sha512-QELlRWxSpgdwdJzSJn4WAhKC+hvw/AtHbbrIoncKHkhKKR/luAlKkgBDcri1EzWAo8f8VvYVryEHN4tax/V67A==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/core': 7.23.5 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-function-name': 7.23.0 - '@babel/helper-member-expression-to-functions': 7.23.0 - '@babel/helper-optimise-call-expression': 7.22.5 - '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.5) - '@babel/helper-skip-transparent-expression-wrappers': 7.22.5 - '@babel/helper-split-export-declaration': 7.22.6 - semver: 6.3.1 - dev: true - /@babel/helper-create-class-features-plugin@7.23.5(@babel/core@7.23.9): resolution: {integrity: sha512-QELlRWxSpgdwdJzSJn4WAhKC+hvw/AtHbbrIoncKHkhKKR/luAlKkgBDcri1EzWAo8f8VvYVryEHN4tax/V67A==} engines: {node: '>=6.9.0'} @@ -634,18 +616,6 @@ packages: '@babel/helper-wrap-function': 7.22.20 dev: true - /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.5): - resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - dependencies: - '@babel/core': 7.23.5 - '@babel/helper-environment-visitor': 7.22.20 - '@babel/helper-member-expression-to-functions': 7.23.0 - '@babel/helper-optimise-call-expression': 7.22.5 - dev: true - /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.9): resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==} engines: {node: '>=6.9.0'} @@ -831,13 +801,13 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-decorators@7.23.3(@babel/core@7.23.5): + /@babel/plugin-syntax-decorators@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-cf7Niq4/+/juY67E0PbgH0TDhLQ5J7zS8C/Q5FFx+DWyrRa9sUQdTXkjqKu8zGvuqr7vw1muKiukseihU+PJDA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.5 + '@babel/core': 7.23.9 '@babel/helper-plugin-utils': 7.22.5 dev: true @@ -906,16 +876,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.5): - resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.5 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} engines: {node: '>=6.9.0'} @@ -999,16 +959,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.5): - resolution: {integrity: sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.5 - '@babel/helper-plugin-utils': 7.22.5 - dev: true - /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==} engines: {node: '>=6.9.0'} @@ -1287,18 +1237,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.5): - resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.5 - '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.5) - '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-simple-access': 7.22.5 - dev: true - /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==} engines: {node: '>=6.9.0'} @@ -1470,24 +1408,24 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-react-display-name@7.23.3(@babel/core@7.23.5): + /@babel/plugin-transform-react-display-name@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.5 + '@babel/core': 7.23.9 '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.23.5): + /@babel/plugin-transform-react-jsx-development@7.22.5(@babel/core@7.23.9): resolution: {integrity: sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.5 - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.5) + '@babel/core': 7.23.9 + '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.9) dev: true /@babel/plugin-transform-react-jsx-self@7.23.3(@babel/core@7.23.5): @@ -1530,27 +1468,27 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.23.5): + /@babel/plugin-transform-react-jsx@7.23.4(@babel/core@7.23.9): resolution: {integrity: sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.5 + '@babel/core': 7.23.9 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-module-imports': 7.22.15 '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.5) - '@babel/types': 7.23.5 + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.9) + '@babel/types': 7.23.9 dev: true - /@babel/plugin-transform-react-pure-annotations@7.23.3(@babel/core@7.23.5): + /@babel/plugin-transform-react-pure-annotations@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-qMFdSS+TUhB7Q/3HVPnEdYJDQIk57jkntAwSuz9xfSE4n+3I+vHYCli3HoHawN1Z3RfCz/y1zXA/JXjG6cVImQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.5 + '@babel/core': 7.23.9 '@babel/helper-annotate-as-pure': 7.22.5 '@babel/helper-plugin-utils': 7.22.5 dev: true @@ -1627,19 +1565,6 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: true - /@babel/plugin-transform-typescript@7.23.5(@babel/core@7.23.5): - resolution: {integrity: sha512-2fMkXEJkrmwgu2Bsv1Saxgj30IXZdJ+84lQcKKI7sm719oXs0BBw2ZENKdJdR1PjWndgLCEBNXJOri0fk7RYQA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.5 - '@babel/helper-annotate-as-pure': 7.22.5 - '@babel/helper-create-class-features-plugin': 7.23.5(@babel/core@7.23.5) - '@babel/helper-plugin-utils': 7.22.5 - '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.5) - dev: true - /@babel/plugin-transform-typescript@7.23.5(@babel/core@7.23.9): resolution: {integrity: sha512-2fMkXEJkrmwgu2Bsv1Saxgj30IXZdJ+84lQcKKI7sm719oXs0BBw2ZENKdJdR1PjWndgLCEBNXJOri0fk7RYQA==} engines: {node: '>=6.9.0'} @@ -1810,33 +1735,19 @@ packages: esutils: 2.0.3 dev: true - /@babel/preset-react@7.23.3(@babel/core@7.23.5): + /@babel/preset-react@7.23.3(@babel/core@7.23.9): resolution: {integrity: sha512-tbkHOS9axH6Ysf2OUEqoSZ6T3Fa2SrNH6WTWSPBboxKzdxNc9qOICeLXkNG0ZEwbQ1HY8liwOce4aN/Ceyuq6w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.23.5 - '@babel/helper-plugin-utils': 7.22.5 - '@babel/helper-validator-option': 7.23.5 - '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.23.5) - '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.5) - '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.23.5) - '@babel/plugin-transform-react-pure-annotations': 7.23.3(@babel/core@7.23.5) - dev: true - - /@babel/preset-typescript@7.23.3(@babel/core@7.23.5): - resolution: {integrity: sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - dependencies: - '@babel/core': 7.23.5 + '@babel/core': 7.23.9 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-option': 7.23.5 - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.5) - '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.5) - '@babel/plugin-transform-typescript': 7.23.5(@babel/core@7.23.5) + '@babel/plugin-transform-react-display-name': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-transform-react-jsx': 7.23.4(@babel/core@7.23.9) + '@babel/plugin-transform-react-jsx-development': 7.22.5(@babel/core@7.23.9) + '@babel/plugin-transform-react-pure-annotations': 7.23.3(@babel/core@7.23.9) dev: true /@babel/preset-typescript@7.23.3(@babel/core@7.23.9): @@ -3931,14 +3842,15 @@ packages: '@babel/runtime': 7.23.5 dev: true - /@remix-run/dev@2.4.0(@remix-run/serve@2.4.0)(typescript@5.2.2)(vite@5.0.6): - resolution: {integrity: sha512-qQsZv+uPw8IhAdUwIIaZqnJfgJXLahYuWHFQIcS7kBhr+PdwW6SA3gvmUhnkDrqV+HJdP1bUpwXYGT+vbDQGiQ==} + /@remix-run/dev@2.8.1(@remix-run/serve@2.8.1)(typescript@5.2.2)(vite@5.1.6): + resolution: {integrity: sha512-qFt4jAsAJeIOyg6ngeSnTG/9Z5N9QJfeThP/8wRHc1crqYgTiEtcI3DZ8WlAXjVSF5emgn/ZZKqzLAI02OgMfQ==} engines: {node: '>=18.0.0'} hasBin: true peerDependencies: - '@remix-run/serve': ^2.4.0 + '@remix-run/serve': ^2.8.1 typescript: ^5.1.0 - vite: ^5.0.0 + vite: ^5.1.0 + wrangler: ^3.28.2 peerDependenciesMeta: '@remix-run/serve': optional: true @@ -3946,21 +3858,23 @@ packages: optional: true vite: optional: true + wrangler: + optional: true dependencies: - '@babel/core': 7.23.5 - '@babel/generator': 7.23.5 - '@babel/parser': 7.23.5 - '@babel/plugin-syntax-decorators': 7.23.3(@babel/core@7.23.5) - '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.5) - '@babel/preset-typescript': 7.23.3(@babel/core@7.23.5) - '@babel/traverse': 7.23.5 - '@babel/types': 7.23.5 + '@babel/core': 7.23.9 + '@babel/generator': 7.23.6 + '@babel/parser': 7.23.9 + '@babel/plugin-syntax-decorators': 7.23.3(@babel/core@7.23.9) + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.9) + '@babel/preset-typescript': 7.23.3(@babel/core@7.23.9) + '@babel/traverse': 7.23.9 + '@babel/types': 7.23.9 '@mdx-js/mdx': 2.3.0 '@npmcli/package-json': 4.0.1 - '@remix-run/node': 2.4.0(typescript@5.2.2) - '@remix-run/router': 1.14.0 - '@remix-run/serve': 2.4.0(typescript@5.2.2) - '@remix-run/server-runtime': 2.4.0(typescript@5.2.2) + '@remix-run/node': 2.8.1(typescript@5.2.2) + '@remix-run/router': 1.15.3-pre.0 + '@remix-run/serve': 2.8.1(typescript@5.2.2) + '@remix-run/server-runtime': 2.8.1(typescript@5.2.2) '@types/mdx': 2.0.10 '@vanilla-extract/integration': 6.2.4 arg: 5.0.2 @@ -3983,7 +3897,6 @@ packages: lodash: 4.17.21 lodash.debounce: 4.0.8 minimatch: 9.0.3 - node-fetch: 2.7.0 ora: 5.4.1 picocolors: 1.0.0 picomatch: 2.3.1 @@ -4002,13 +3915,12 @@ packages: tar-fs: 2.1.1 tsconfig-paths: 4.2.0 typescript: 5.2.2 - vite: 5.0.6 + vite: 5.1.6 ws: 7.5.9 transitivePeerDependencies: - '@types/node' - bluebird - bufferutil - - encoding - less - lightningcss - sass @@ -4020,8 +3932,8 @@ packages: - utf-8-validate dev: true - /@remix-run/eslint-config@2.4.0(eslint@8.55.0)(react@18.2.0)(typescript@5.2.2): - resolution: {integrity: sha512-eKlRNt0k8QbU/6+HBQ+s/2gpcCgK13pMU7iPkmKILIon4MMxNgRhKcxJnJDbGbraTt8hcddhHuWHhVh/wTu4IQ==} + /@remix-run/eslint-config@2.8.1(eslint@8.55.0)(react@18.2.0)(typescript@5.2.2): + resolution: {integrity: sha512-lH5/H8oznYk0pVhrNTBt7+++U+guEKOYFwK1aO3zoeyrBtSc7OdX1KWWFlJw0IdGVMSKDqnW3U0n1VbIa4sX/g==} engines: {node: '>=18.0.0'} peerDependencies: eslint: ^8.0.0 @@ -4031,9 +3943,9 @@ packages: typescript: optional: true dependencies: - '@babel/core': 7.23.5 - '@babel/eslint-parser': 7.23.3(@babel/core@7.23.5)(eslint@8.55.0) - '@babel/preset-react': 7.23.3(@babel/core@7.23.5) + '@babel/core': 7.23.9 + '@babel/eslint-parser': 7.23.3(@babel/core@7.23.9)(eslint@8.55.0) + '@babel/preset-react': 7.23.3(@babel/core@7.23.9) '@rushstack/eslint-patch': 1.6.0 '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.55.0)(typescript@5.2.2) '@typescript-eslint/parser': 5.62.0(eslint@8.55.0)(typescript@5.2.2) @@ -4056,8 +3968,8 @@ packages: - supports-color dev: true - /@remix-run/express@2.4.0(express@4.18.2)(typescript@5.2.2): - resolution: {integrity: sha512-9vVs1cMoBHRVm4fFpEFAMmrYywKV4uKnyJgaM3Kw31O4EFtqbd1ai3SW6YhKuatxfD1YxYlpoHZ1XwXcnWRDuQ==} + /@remix-run/express@2.8.1(express@4.18.2)(typescript@5.2.2): + resolution: {integrity: sha512-p1eo8uwZk8uLihSDpUnPOPsTDfghWikVPQfa+e0ZMk6tnJCjcpHAyENKDFtn9vDh9h7YNUg6A7+19CStHgxd7Q==} engines: {node: '>=18.0.0'} peerDependencies: express: ^4.17.1 @@ -4066,12 +3978,12 @@ packages: typescript: optional: true dependencies: - '@remix-run/node': 2.4.0(typescript@5.2.2) + '@remix-run/node': 2.8.1(typescript@5.2.2) express: 4.18.2 typescript: 5.2.2 - /@remix-run/node@2.4.0(typescript@5.2.2): - resolution: {integrity: sha512-wYwBTGiZgRmpS1qoysracyJLExP3mo0HgkIzfTm1SX/i56mdCAAe1DFSwezAVXunTY0TPHXolJeeJCVwzz0gdA==} + /@remix-run/node@2.8.1(typescript@5.2.2): + resolution: {integrity: sha512-ddCwBVlfLvRxTQJHPcaM1lhfMjsFYG3EGmYpWJIWnnzDX5EbX9pUNHBWisMuH1eA0c7pbw0PbW0UtCttKYx2qg==} engines: {node: '>=18.0.0'} peerDependencies: typescript: ^5.1.0 @@ -4079,7 +3991,7 @@ packages: typescript: optional: true dependencies: - '@remix-run/server-runtime': 2.4.0(typescript@5.2.2) + '@remix-run/server-runtime': 2.8.1(typescript@5.2.2) '@remix-run/web-fetch': 4.4.2 '@remix-run/web-file': 3.1.0 '@remix-run/web-stream': 1.1.0 @@ -4089,8 +4001,8 @@ packages: stream-slice: 0.1.2 typescript: 5.2.2 - /@remix-run/react@2.4.0(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2): - resolution: {integrity: sha512-SO+VTSTd5oN7eAoTXV2E//LEu7cEO3VsqVDqETZG3X+MfpaU6dtng18FnY6X/ulBP62BjlH6HTwdTK8Lk+2msQ==} + /@remix-run/react@2.8.1(react-dom@18.2.0)(react@18.2.0)(typescript@5.2.2): + resolution: {integrity: sha512-HTPm1U8+xz2jPaVjZnssrckfmFMA8sUZUdaWnoF5lmLWdReqcQv+XlBhIrQQ3jO9L8iYYdnzaSZZcRFYSdpTYg==} engines: {node: '>=18.0.0'} peerDependencies: react: ^18.0.0 @@ -4100,26 +4012,31 @@ packages: typescript: optional: true dependencies: - '@remix-run/router': 1.14.0 - '@remix-run/server-runtime': 2.4.0(typescript@5.2.2) + '@remix-run/router': 1.15.3 + '@remix-run/server-runtime': 2.8.1(typescript@5.2.2) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.21.0(react@18.2.0) - react-router-dom: 6.21.0(react-dom@18.2.0)(react@18.2.0) + react-router: 6.22.3(react@18.2.0) + react-router-dom: 6.22.3(react-dom@18.2.0)(react@18.2.0) typescript: 5.2.2 dev: false - /@remix-run/router@1.14.0: - resolution: {integrity: sha512-WOHih+ClN7N8oHk9N4JUiMxQJmRVaOxcg8w7F/oHUXzJt920ekASLI/7cYX8XkntDWRhLZtsk6LbGrkgOAvi5A==} + /@remix-run/router@1.15.3: + resolution: {integrity: sha512-Oy8rmScVrVxWZVOpEF57ovlnhpZ8CCPlnIIumVcV9nFdiSIrus99+Lw78ekXyGvVDlIsFJbSfmSovJUhCWYV3w==} + engines: {node: '>=14.0.0'} + + /@remix-run/router@1.15.3-pre.0: + resolution: {integrity: sha512-JUQb6sztqJpRbsdKpx3D4+6eaGmHU4Yb/QeKrES/ZbLuijlZMOmZ+gV0ohX5vrRDnJHJmcQPq3Tpk0GGPNM9gg==} engines: {node: '>=14.0.0'} + dev: true - /@remix-run/serve@2.4.0(typescript@5.2.2): - resolution: {integrity: sha512-S9x7WEtIwL1xh3nf9gMIv++GXp8dKmyZi+9/uE6o5Am1BxV3wQNuQrtVlA8aPa8Wvr4vKlN+4mmIJNejlzSzDg==} + /@remix-run/serve@2.8.1(typescript@5.2.2): + resolution: {integrity: sha512-PyCV7IMnRshwfFw7JJ2hZJppX88VAhZyYjeTAmYb6PK7IDtdmqUf5eOrYDi8gCu914C+aZRu6blxpLRlpyCY8Q==} engines: {node: '>=18.0.0'} hasBin: true dependencies: - '@remix-run/express': 2.4.0(express@4.18.2)(typescript@5.2.2) - '@remix-run/node': 2.4.0(typescript@5.2.2) + '@remix-run/express': 2.8.1(express@4.18.2)(typescript@5.2.2) + '@remix-run/node': 2.8.1(typescript@5.2.2) chokidar: 3.5.3 compression: 1.7.4 express: 4.18.2 @@ -4130,8 +4047,8 @@ packages: - supports-color - typescript - /@remix-run/server-runtime@2.4.0(typescript@5.2.2): - resolution: {integrity: sha512-okNGtxB2eqEEsI0aDbmC/yCFhsDVD41P0TNPDHBxXy7PK3nzI9yywhknxLvim0lrxc/zKri/5gVKVJpipRekGQ==} + /@remix-run/server-runtime@2.8.1(typescript@5.2.2): + resolution: {integrity: sha512-fh4SOEoONrN73Kvzc0gMDCmYpVRVbvoj9j3BUXHAcn0An8iX+HD/22gU7nTkIBzExM/F9xgEcwTewOnWqLw0Bg==} engines: {node: '>=18.0.0'} peerDependencies: typescript: ^5.1.0 @@ -4139,10 +4056,10 @@ packages: typescript: optional: true dependencies: - '@remix-run/router': 1.14.0 - '@types/cookie': 0.5.4 + '@remix-run/router': 1.15.3 + '@types/cookie': 0.6.0 '@web3-storage/multipart-parser': 1.0.0 - cookie: 0.5.0 + cookie: 0.6.0 set-cookie-parser: 2.6.0 source-map: 0.7.4 typescript: 5.2.2 @@ -5285,6 +5202,10 @@ packages: /@types/cookie@0.5.4: resolution: {integrity: sha512-7z/eR6O859gyWIAjuvBWFzNURmf2oPBmJlfVWkwehU5nzIyjwBsTh7WMmEEV4JFnHuQ3ex4oyTvfKzcyJVDBNA==} + dev: true + + /@types/cookie@0.6.0: + resolution: {integrity: sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==} /@types/cross-spawn@6.0.6: resolution: {integrity: sha512-fXRhhUkG4H3TQk5dBhQ7m/JDdSNHKwR2BBia62lhwEIq9xGiQKLxd6LymNhn47SjXhsUEPmxi+PKw2OkW4LLjA==} @@ -6826,6 +6747,10 @@ packages: resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==} engines: {node: '>= 0.6'} + /cookie@0.6.0: + resolution: {integrity: sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==} + engines: {node: '>= 0.6'} + /core-js-compat@3.34.0: resolution: {integrity: sha512-4ZIyeNbW/Cn1wkMMDy+mvrRUxrwFNjKwbhCfQpDd+eLgYipDqp8oGFGtLmhh18EDPKA0g3VUBYOxQGGwvWLVpA==} dependencies: @@ -10942,6 +10867,15 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 + /postcss@8.4.35: + resolution: {integrity: sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.0.2 + dev: true + /preferred-pm@3.1.2: resolution: {integrity: sha512-nk7dKrcW8hfCZ4H6klWcdRknBOXWzNQByJ0oJyX97BOupsYD+FzLS4hflgEu/uPUEHZCuRfMxzCBsuWd7OzT8Q==} engines: {node: '>=10'} @@ -11265,26 +11199,26 @@ packages: use-sidecar: 1.1.2(@types/react@18.2.42)(react@18.2.0) dev: true - /react-router-dom@6.21.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-1dUdVj3cwc1npzJaf23gulB562ESNvxf7E4x8upNJycqyUm5BRRZ6dd3LrlzhtLaMrwOCO8R0zoiYxdaJx4LlQ==} + /react-router-dom@6.22.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-7ZILI7HjcE+p31oQvwbokjk6OA/bnFxrhJ19n82Ex9Ph8fNAq+Hm/7KchpMGlTgWhUxRHMMCut+vEtNpWpowKw==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' react-dom: '>=16.8' dependencies: - '@remix-run/router': 1.14.0 + '@remix-run/router': 1.15.3 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - react-router: 6.21.0(react@18.2.0) + react-router: 6.22.3(react@18.2.0) dev: false - /react-router@6.21.0(react@18.2.0): - resolution: {integrity: sha512-hGZ0HXbwz3zw52pLZV3j3+ec+m/PQ9cTpBvqjFQmy2XVUWGn5MD+31oXHb6dVTxYzmAeaiUBYjkoNz66n3RGCg==} + /react-router@6.22.3(react@18.2.0): + resolution: {integrity: sha512-dr2eb3Mj5zK2YISHK++foM9w4eBnO23eKnZEDs7c880P6oKbrjz/Svg9+nxqtHQK+oMW4OtjZca0RqPglXxguQ==} engines: {node: '>=14.0.0'} peerDependencies: react: '>=16.8' dependencies: - '@remix-run/router': 1.14.0 + '@remix-run/router': 1.15.3 react: 18.2.0 dev: false @@ -12435,7 +12369,7 @@ packages: engines: {node: '>=6.10'} dev: true - /tsconfck@2.1.2(typescript@5.2.2): + /tsconfck@2.1.2(typescript@5.3.3): resolution: {integrity: sha512-ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg==} engines: {node: ^14.13.1 || ^16 || >=18} hasBin: true @@ -12445,20 +12379,20 @@ packages: typescript: optional: true dependencies: - typescript: 5.2.2 + typescript: 5.3.3 dev: true - /tsconfck@2.1.2(typescript@5.3.3): - resolution: {integrity: sha512-ghqN1b0puy3MhhviwO2kGF8SeMDNhEbnKxjK7h6+fvY9JAxqvXi8y5NAHSQv687OVboS2uZIByzGd45/YxrRHg==} - engines: {node: ^14.13.1 || ^16 || >=18} + /tsconfck@3.0.3(typescript@5.2.2): + resolution: {integrity: sha512-4t0noZX9t6GcPTfBAbIbbIU4pfpCwh0ueq3S4O/5qXI1VwK1outmxhe9dOiEWqMz3MW2LKgDTpqWV+37IWuVbA==} + engines: {node: ^18 || >=20} hasBin: true peerDependencies: - typescript: ^4.3.5 || ^5.0.0 + typescript: ^5.0.0 peerDependenciesMeta: typescript: optional: true dependencies: - typescript: 5.3.3 + typescript: 5.2.2 dev: true /tsconfig-paths@3.14.2: @@ -13048,7 +12982,7 @@ packages: - terser dev: true - /vite-tsconfig-paths@4.2.1(typescript@5.2.2)(vite@5.0.6): + /vite-tsconfig-paths@4.2.1(typescript@5.3.3)(vite@5.0.9): resolution: {integrity: sha512-GNUI6ZgPqT3oervkvzU+qtys83+75N/OuDaQl7HmOqFTb0pjZsuARrRipsyJhJ3enqV8beI1xhGbToR4o78nSQ==} peerDependencies: vite: '*' @@ -13058,15 +12992,15 @@ packages: dependencies: debug: 4.3.4 globrex: 0.1.2 - tsconfck: 2.1.2(typescript@5.2.2) - vite: 5.0.6 + tsconfck: 2.1.2(typescript@5.3.3) + vite: 5.0.9(@types/node@20.10.3) transitivePeerDependencies: - supports-color - typescript dev: true - /vite-tsconfig-paths@4.2.1(typescript@5.3.3)(vite@5.0.9): - resolution: {integrity: sha512-GNUI6ZgPqT3oervkvzU+qtys83+75N/OuDaQl7HmOqFTb0pjZsuARrRipsyJhJ3enqV8beI1xhGbToR4o78nSQ==} + /vite-tsconfig-paths@4.3.2(typescript@5.2.2)(vite@5.1.6): + resolution: {integrity: sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==} peerDependencies: vite: '*' peerDependenciesMeta: @@ -13075,8 +13009,8 @@ packages: dependencies: debug: 4.3.4 globrex: 0.1.2 - tsconfck: 2.1.2(typescript@5.3.3) - vite: 5.0.9(@types/node@20.10.3) + tsconfck: 3.0.3(typescript@5.2.2) + vite: 5.1.6 transitivePeerDependencies: - supports-color - typescript @@ -13118,8 +13052,8 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.0.6: - resolution: {integrity: sha512-MD3joyAEBtV7QZPl2JVVUai6zHms3YOmLR+BpMzLlX2Yzjfcc4gTgNi09d/Rua3F4EtC8zdwPU8eQYyib4vVMQ==} + /vite@5.0.9(@types/node@20.10.3): + resolution: {integrity: sha512-wVqMd5kp28QWGgfYPDfrj771VyHTJ4UDlCteLH7bJDGDEamaz5hV8IX6h1brSGgnnyf9lI2RnzXq/JmD0c2wwg==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -13146,6 +13080,7 @@ packages: terser: optional: true dependencies: + '@types/node': 20.10.3 esbuild: 0.19.8 postcss: 8.4.32 rollup: 4.6.1 @@ -13153,8 +13088,8 @@ packages: fsevents: 2.3.3 dev: true - /vite@5.0.9(@types/node@20.10.3): - resolution: {integrity: sha512-wVqMd5kp28QWGgfYPDfrj771VyHTJ4UDlCteLH7bJDGDEamaz5hV8IX6h1brSGgnnyf9lI2RnzXq/JmD0c2wwg==} + /vite@5.1.6: + resolution: {integrity: sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -13181,9 +13116,8 @@ packages: terser: optional: true dependencies: - '@types/node': 20.10.3 esbuild: 0.19.8 - postcss: 8.4.32 + postcss: 8.4.35 rollup: 4.6.1 optionalDependencies: fsevents: 2.3.3