one 1.2.40 → 1.2.42
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Root.cjs +1 -1
- package/dist/cjs/Root.js +1 -1
- package/dist/cjs/Root.js.map +1 -1
- package/dist/cjs/Root.native.js +1 -1
- package/dist/cjs/Root.native.js.map +1 -1
- package/dist/cjs/cli/build.cjs +157 -2
- package/dist/cjs/cli/build.js +159 -2
- package/dist/cjs/cli/build.js.map +1 -1
- package/dist/cjs/cli/build.native.js +222 -18
- package/dist/cjs/cli/build.native.js.map +1 -1
- package/dist/cjs/createHandleRequest.cjs +21 -20
- package/dist/cjs/createHandleRequest.js +25 -24
- package/dist/cjs/createHandleRequest.js.map +1 -1
- package/dist/cjs/createHandleRequest.native.js +23 -22
- package/dist/cjs/createHandleRequest.native.js.map +1 -1
- package/dist/cjs/router/useScreens.cjs +14 -5
- package/dist/cjs/router/useScreens.js +20 -3
- package/dist/cjs/router/useScreens.js.map +1 -1
- package/dist/cjs/router/useScreens.native.js +13 -4
- package/dist/cjs/router/useScreens.native.js.map +1 -1
- package/dist/cjs/serve-worker.cjs +28 -12
- package/dist/cjs/serve-worker.js +17 -7
- package/dist/cjs/serve-worker.js.map +1 -1
- package/dist/cjs/serve-worker.native.js +28 -12
- package/dist/cjs/serve-worker.native.js.map +1 -1
- package/dist/cjs/serve.cjs +5 -2
- package/dist/cjs/serve.js +2 -2
- package/dist/cjs/serve.js.map +1 -1
- package/dist/cjs/serve.native.js +5 -2
- package/dist/cjs/serve.native.js.map +1 -1
- package/dist/cjs/server/ServerContextScript.cjs +7 -3
- package/dist/cjs/server/ServerContextScript.js +4 -1
- package/dist/cjs/server/ServerContextScript.js.map +1 -1
- package/dist/cjs/server/ServerContextScript.native.js +7 -3
- package/dist/cjs/server/ServerContextScript.native.js.map +1 -1
- package/dist/cjs/server/oneServe.cjs +79 -70
- package/dist/cjs/server/oneServe.js +33 -12
- package/dist/cjs/server/oneServe.js.map +2 -2
- package/dist/cjs/server/oneServe.native.js +105 -81
- package/dist/cjs/server/oneServe.native.js.map +1 -1
- package/dist/cjs/{__mocks__/@react-navigation/native-stack.cjs → server/staticHtmlFetcher.cjs} +12 -8
- package/dist/cjs/{utils/style.js → server/staticHtmlFetcher.js} +12 -8
- package/dist/cjs/server/staticHtmlFetcher.js.map +6 -0
- package/dist/cjs/{utils/style.native.js → server/staticHtmlFetcher.native.js} +12 -7
- package/dist/cjs/server/staticHtmlFetcher.native.js.map +1 -0
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.cjs +19 -2
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.js +13 -1
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.js.map +1 -1
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js +38 -2
- package/dist/cjs/vercel/build/buildVercelOutputDirectory.native.js.map +1 -1
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.cjs +63 -3
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.js +63 -3
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.js.map +1 -1
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.native.js +63 -3
- package/dist/cjs/vercel/build/generate/createSsrServerlessFunction.native.js.map +1 -1
- package/dist/cjs/vite/one-server-only.cjs +8 -4
- package/dist/cjs/vite/one-server-only.js +6 -3
- package/dist/cjs/vite/one-server-only.js.map +1 -1
- package/dist/esm/Root.js +1 -1
- package/dist/esm/Root.js.map +1 -1
- package/dist/esm/Root.mjs +1 -1
- package/dist/esm/Root.mjs.map +1 -1
- package/dist/esm/Root.native.js +1 -1
- package/dist/esm/Root.native.js.map +1 -1
- package/dist/esm/cli/build.js +159 -1
- package/dist/esm/cli/build.js.map +1 -1
- package/dist/esm/cli/build.mjs +156 -1
- package/dist/esm/cli/build.mjs.map +1 -1
- package/dist/esm/cli/build.native.js +221 -17
- package/dist/esm/cli/build.native.js.map +1 -1
- package/dist/esm/createHandleRequest.js +25 -24
- package/dist/esm/createHandleRequest.js.map +1 -1
- package/dist/esm/createHandleRequest.mjs +21 -20
- package/dist/esm/createHandleRequest.mjs.map +1 -1
- package/dist/esm/createHandleRequest.native.js +23 -22
- package/dist/esm/createHandleRequest.native.js.map +1 -1
- package/dist/esm/router/useScreens.js +20 -3
- package/dist/esm/router/useScreens.js.map +1 -1
- package/dist/esm/router/useScreens.mjs +14 -5
- package/dist/esm/router/useScreens.mjs.map +1 -1
- package/dist/esm/router/useScreens.native.js +13 -4
- package/dist/esm/router/useScreens.native.js.map +1 -1
- package/dist/esm/serve-worker.js +7 -6
- package/dist/esm/serve-worker.js.map +1 -1
- package/dist/esm/serve-worker.mjs +10 -7
- package/dist/esm/serve-worker.mjs.map +1 -1
- package/dist/esm/serve-worker.native.js +10 -7
- package/dist/esm/serve-worker.native.js.map +1 -1
- package/dist/esm/serve.js +2 -2
- package/dist/esm/serve.js.map +1 -1
- package/dist/esm/serve.mjs +5 -2
- package/dist/esm/serve.mjs.map +1 -1
- package/dist/esm/serve.native.js +5 -2
- package/dist/esm/serve.native.js.map +1 -1
- package/dist/esm/server/ServerContextScript.js +4 -1
- package/dist/esm/server/ServerContextScript.js.map +1 -1
- package/dist/esm/server/ServerContextScript.mjs +7 -3
- package/dist/esm/server/ServerContextScript.mjs.map +1 -1
- package/dist/esm/server/ServerContextScript.native.js +7 -3
- package/dist/esm/server/ServerContextScript.native.js.map +1 -1
- package/dist/esm/server/oneServe.js +35 -16
- package/dist/esm/server/oneServe.js.map +1 -1
- package/dist/esm/server/oneServe.mjs +79 -70
- package/dist/esm/server/oneServe.mjs.map +1 -1
- package/dist/esm/server/oneServe.native.js +105 -81
- package/dist/esm/server/oneServe.native.js.map +1 -1
- package/dist/esm/server/staticHtmlFetcher.js +12 -0
- package/dist/esm/server/staticHtmlFetcher.js.map +6 -0
- package/dist/esm/server/staticHtmlFetcher.mjs +9 -0
- package/dist/esm/server/staticHtmlFetcher.mjs.map +1 -0
- package/dist/esm/server/staticHtmlFetcher.native.js +9 -0
- package/dist/esm/server/staticHtmlFetcher.native.js.map +1 -0
- package/dist/esm/vercel/build/buildVercelOutputDirectory.js +13 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.js.map +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs +19 -2
- package/dist/esm/vercel/build/buildVercelOutputDirectory.mjs.map +1 -1
- package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js +38 -2
- package/dist/esm/vercel/build/buildVercelOutputDirectory.native.js.map +1 -1
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js +63 -3
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.js.map +1 -1
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs +63 -3
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.mjs.map +1 -1
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js +63 -3
- package/dist/esm/vercel/build/generate/createSsrServerlessFunction.native.js.map +1 -1
- package/dist/esm/vite/one-server-only.js +6 -3
- package/dist/esm/vite/one-server-only.js.map +1 -1
- package/dist/esm/vite/one-server-only.mjs +8 -4
- package/dist/esm/vite/one-server-only.mjs.map +1 -1
- package/package.json +9 -9
- package/src/Root.tsx +4 -1
- package/src/cli/build.ts +187 -18
- package/src/createHandleRequest.ts +31 -29
- package/src/router/useScreens.tsx +27 -4
- package/src/serve-worker.ts +25 -8
- package/src/serve.ts +2 -2
- package/src/server/ServerContextScript.tsx +9 -3
- package/src/server/oneServe.ts +100 -29
- package/src/server/staticHtmlFetcher.ts +10 -0
- package/src/useLoader.ts +1 -1
- package/src/vercel/build/buildVercelOutputDirectory.ts +36 -0
- package/src/vercel/build/generate/createSsrServerlessFunction.ts +63 -3
- package/src/vite/one-server-only.tsx +13 -2
- package/src/vite/types.ts +9 -3
- package/types/Root.d.ts.map +1 -1
- package/types/cli/build.d.ts.map +1 -1
- package/types/createHandleRequest.d.ts.map +1 -1
- package/types/router/useScreens.d.ts.map +1 -1
- package/types/serve-worker.d.ts +24 -1
- package/types/serve-worker.d.ts.map +1 -1
- package/types/server/ServerContextScript.d.ts.map +1 -1
- package/types/server/oneServe.d.ts +21 -1
- package/types/server/oneServe.d.ts.map +1 -1
- package/types/server/staticHtmlFetcher.d.ts +3 -0
- package/types/server/staticHtmlFetcher.d.ts.map +1 -0
- package/types/vercel/build/buildVercelOutputDirectory.d.ts.map +1 -1
- package/types/vercel/build/generate/createSsrServerlessFunction.d.ts.map +1 -1
- package/types/vite/one-server-only.d.ts.map +1 -1
- package/types/vite/types.d.ts +8 -3
- package/types/vite/types.d.ts.map +1 -1
- package/dist/cjs/__mocks__/@react-navigation/native-stack.js +0 -24
- package/dist/cjs/__mocks__/@react-navigation/native-stack.js.map +0 -6
- package/dist/cjs/__mocks__/@react-navigation/native-stack.native.js +0 -38
- package/dist/cjs/__mocks__/@react-navigation/native-stack.native.js.map +0 -1
- package/dist/cjs/__mocks__/@react-navigation/native.js +0 -45
- package/dist/cjs/__mocks__/@react-navigation/native.js.map +0 -1
- package/dist/cjs/__mocks__/expo-linking.cjs +0 -36
- package/dist/cjs/__mocks__/expo-linking.js +0 -25
- package/dist/cjs/__mocks__/expo-linking.js.map +0 -6
- package/dist/cjs/__mocks__/expo-linking.native.js +0 -47
- package/dist/cjs/__mocks__/expo-linking.native.js.map +0 -1
- package/dist/cjs/__mocks__/expo-modules-core.cjs +0 -36
- package/dist/cjs/__mocks__/expo-modules-core.js +0 -31
- package/dist/cjs/__mocks__/expo-modules-core.js.map +0 -6
- package/dist/cjs/__mocks__/expo-modules-core.native.js +0 -67
- package/dist/cjs/__mocks__/expo-modules-core.native.js.map +0 -1
- package/dist/cjs/__mocks__/react-native-screens.cjs +0 -28
- package/dist/cjs/__mocks__/react-native-screens.js +0 -22
- package/dist/cjs/__mocks__/react-native-screens.js.map +0 -6
- package/dist/cjs/__mocks__/react-native-screens.native.js +0 -31
- package/dist/cjs/__mocks__/react-native-screens.native.js.map +0 -1
- package/dist/cjs/__mocks__/react-native.js +0 -49
- package/dist/cjs/__mocks__/react-native.js.map +0 -1
- package/dist/cjs/experimental-useLoaderState.cjs +0 -64
- package/dist/cjs/experimental-useLoaderState.js +0 -44
- package/dist/cjs/experimental-useLoaderState.js.map +0 -6
- package/dist/cjs/experimental-useLoaderState.native.js +0 -69
- package/dist/cjs/experimental-useLoaderState.native.js.map +0 -1
- package/dist/cjs/layouts/stack-utils/StackHeaderBackButton.cjs +0 -40
- package/dist/cjs/layouts/stack-utils/StackHeaderBackButton.js +0 -35
- package/dist/cjs/layouts/stack-utils/StackHeaderBackButton.js.map +0 -6
- package/dist/cjs/layouts/stack-utils/StackHeaderBackButton.native.js +0 -43
- package/dist/cjs/layouts/stack-utils/StackHeaderBackButton.native.js.map +0 -1
- package/dist/cjs/layouts/stack-utils/StackHeaderComponent.cjs +0 -69
- package/dist/cjs/layouts/stack-utils/StackHeaderComponent.js +0 -54
- package/dist/cjs/layouts/stack-utils/StackHeaderComponent.js.map +0 -6
- package/dist/cjs/layouts/stack-utils/StackHeaderComponent.native.js +0 -78
- package/dist/cjs/layouts/stack-utils/StackHeaderComponent.native.js.map +0 -1
- package/dist/cjs/layouts/stack-utils/StackHeaderLeft.cjs +0 -35
- package/dist/cjs/layouts/stack-utils/StackHeaderLeft.js +0 -30
- package/dist/cjs/layouts/stack-utils/StackHeaderLeft.js.map +0 -6
- package/dist/cjs/layouts/stack-utils/StackHeaderLeft.native.js +0 -40
- package/dist/cjs/layouts/stack-utils/StackHeaderLeft.native.js.map +0 -1
- package/dist/cjs/layouts/stack-utils/StackHeaderRight.cjs +0 -35
- package/dist/cjs/layouts/stack-utils/StackHeaderRight.js +0 -30
- package/dist/cjs/layouts/stack-utils/StackHeaderRight.js.map +0 -6
- package/dist/cjs/layouts/stack-utils/StackHeaderRight.native.js +0 -40
- package/dist/cjs/layouts/stack-utils/StackHeaderRight.native.js.map +0 -1
- package/dist/cjs/layouts/stack-utils/StackHeaderSearchBar.cjs +0 -35
- package/dist/cjs/layouts/stack-utils/StackHeaderSearchBar.js +0 -30
- package/dist/cjs/layouts/stack-utils/StackHeaderSearchBar.js.map +0 -6
- package/dist/cjs/layouts/stack-utils/StackHeaderSearchBar.native.js +0 -38
- package/dist/cjs/layouts/stack-utils/StackHeaderSearchBar.native.js.map +0 -1
- package/dist/cjs/layouts/stack-utils/StackHeaderTitle.cjs +0 -53
- package/dist/cjs/layouts/stack-utils/StackHeaderTitle.js +0 -46
- package/dist/cjs/layouts/stack-utils/StackHeaderTitle.js.map +0 -6
- package/dist/cjs/layouts/stack-utils/StackHeaderTitle.native.js +0 -56
- package/dist/cjs/layouts/stack-utils/StackHeaderTitle.native.js.map +0 -1
- package/dist/cjs/layouts/stack-utils/StackScreen.cjs +0 -57
- package/dist/cjs/layouts/stack-utils/StackScreen.js +0 -43
- package/dist/cjs/layouts/stack-utils/StackScreen.js.map +0 -6
- package/dist/cjs/layouts/stack-utils/StackScreen.native.js +0 -64
- package/dist/cjs/layouts/stack-utils/StackScreen.native.js.map +0 -1
- package/dist/cjs/layouts/stack-utils/index.cjs +0 -47
- package/dist/cjs/layouts/stack-utils/index.js +0 -36
- package/dist/cjs/layouts/stack-utils/index.js.map +0 -6
- package/dist/cjs/layouts/stack-utils/index.native.js +0 -50
- package/dist/cjs/layouts/stack-utils/index.native.js.map +0 -1
- package/dist/cjs/utils/children.cjs +0 -38
- package/dist/cjs/utils/children.js +0 -37
- package/dist/cjs/utils/children.js.map +0 -6
- package/dist/cjs/utils/children.native.js +0 -60
- package/dist/cjs/utils/children.native.js.map +0 -1
- package/dist/cjs/utils/safeWrite.cjs +0 -56
- package/dist/cjs/utils/safeWrite.js +0 -51
- package/dist/cjs/utils/safeWrite.js.map +0 -6
- package/dist/cjs/utils/safeWrite.native.js +0 -63
- package/dist/cjs/utils/safeWrite.native.js.map +0 -1
- package/dist/cjs/utils/style.cjs +0 -28
- package/dist/cjs/utils/style.js.map +0 -6
- package/dist/cjs/utils/style.native.js.map +0 -1
- package/dist/esm/__mocks__/@react-navigation/native-stack.js +0 -8
- package/dist/esm/__mocks__/@react-navigation/native-stack.js.map +0 -6
- package/dist/esm/__mocks__/@react-navigation/native-stack.mjs +0 -6
- package/dist/esm/__mocks__/@react-navigation/native-stack.mjs.map +0 -1
- package/dist/esm/__mocks__/@react-navigation/native-stack.native.js +0 -12
- package/dist/esm/__mocks__/@react-navigation/native-stack.native.js.map +0 -1
- package/dist/esm/__mocks__/@react-navigation/native.js +0 -18
- package/dist/esm/__mocks__/@react-navigation/native.js.map +0 -1
- package/dist/esm/__mocks__/expo-linking.js +0 -9
- package/dist/esm/__mocks__/expo-linking.js.map +0 -6
- package/dist/esm/__mocks__/expo-linking.mjs +0 -10
- package/dist/esm/__mocks__/expo-linking.mjs.map +0 -1
- package/dist/esm/__mocks__/expo-linking.native.js +0 -18
- package/dist/esm/__mocks__/expo-linking.native.js.map +0 -1
- package/dist/esm/__mocks__/expo-modules-core.js +0 -15
- package/dist/esm/__mocks__/expo-modules-core.js.map +0 -6
- package/dist/esm/__mocks__/expo-modules-core.mjs +0 -10
- package/dist/esm/__mocks__/expo-modules-core.mjs.map +0 -1
- package/dist/esm/__mocks__/expo-modules-core.native.js +0 -38
- package/dist/esm/__mocks__/expo-modules-core.native.js.map +0 -1
- package/dist/esm/__mocks__/react-native-screens.js +0 -6
- package/dist/esm/__mocks__/react-native-screens.js.map +0 -6
- package/dist/esm/__mocks__/react-native-screens.mjs +0 -4
- package/dist/esm/__mocks__/react-native-screens.mjs.map +0 -1
- package/dist/esm/__mocks__/react-native-screens.native.js +0 -4
- package/dist/esm/__mocks__/react-native-screens.native.js.map +0 -1
- package/dist/esm/__mocks__/react-native.js +0 -19
- package/dist/esm/__mocks__/react-native.js.map +0 -1
- package/dist/esm/experimental-useLoaderState.js +0 -32
- package/dist/esm/experimental-useLoaderState.js.map +0 -6
- package/dist/esm/experimental-useLoaderState.mjs +0 -41
- package/dist/esm/experimental-useLoaderState.mjs.map +0 -1
- package/dist/esm/experimental-useLoaderState.native.js +0 -43
- package/dist/esm/experimental-useLoaderState.native.js.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderBackButton.js +0 -19
- package/dist/esm/layouts/stack-utils/StackHeaderBackButton.js.map +0 -6
- package/dist/esm/layouts/stack-utils/StackHeaderBackButton.mjs +0 -16
- package/dist/esm/layouts/stack-utils/StackHeaderBackButton.mjs.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderBackButton.native.js +0 -16
- package/dist/esm/layouts/stack-utils/StackHeaderBackButton.native.js.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderComponent.js +0 -51
- package/dist/esm/layouts/stack-utils/StackHeaderComponent.js.map +0 -6
- package/dist/esm/layouts/stack-utils/StackHeaderComponent.mjs +0 -45
- package/dist/esm/layouts/stack-utils/StackHeaderComponent.mjs.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderComponent.native.js +0 -51
- package/dist/esm/layouts/stack-utils/StackHeaderComponent.native.js.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderLeft.js +0 -14
- package/dist/esm/layouts/stack-utils/StackHeaderLeft.js.map +0 -6
- package/dist/esm/layouts/stack-utils/StackHeaderLeft.mjs +0 -11
- package/dist/esm/layouts/stack-utils/StackHeaderLeft.mjs.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderLeft.native.js +0 -13
- package/dist/esm/layouts/stack-utils/StackHeaderLeft.native.js.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderRight.js +0 -14
- package/dist/esm/layouts/stack-utils/StackHeaderRight.js.map +0 -6
- package/dist/esm/layouts/stack-utils/StackHeaderRight.mjs +0 -11
- package/dist/esm/layouts/stack-utils/StackHeaderRight.mjs.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderRight.native.js +0 -13
- package/dist/esm/layouts/stack-utils/StackHeaderRight.native.js.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderSearchBar.js +0 -14
- package/dist/esm/layouts/stack-utils/StackHeaderSearchBar.js.map +0 -6
- package/dist/esm/layouts/stack-utils/StackHeaderSearchBar.mjs +0 -11
- package/dist/esm/layouts/stack-utils/StackHeaderSearchBar.mjs.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderSearchBar.native.js +0 -11
- package/dist/esm/layouts/stack-utils/StackHeaderSearchBar.native.js.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderTitle.js +0 -31
- package/dist/esm/layouts/stack-utils/StackHeaderTitle.js.map +0 -6
- package/dist/esm/layouts/stack-utils/StackHeaderTitle.mjs +0 -29
- package/dist/esm/layouts/stack-utils/StackHeaderTitle.mjs.map +0 -1
- package/dist/esm/layouts/stack-utils/StackHeaderTitle.native.js +0 -29
- package/dist/esm/layouts/stack-utils/StackHeaderTitle.native.js.map +0 -1
- package/dist/esm/layouts/stack-utils/StackScreen.js +0 -33
- package/dist/esm/layouts/stack-utils/StackScreen.js.map +0 -6
- package/dist/esm/layouts/stack-utils/StackScreen.mjs +0 -33
- package/dist/esm/layouts/stack-utils/StackScreen.mjs.map +0 -1
- package/dist/esm/layouts/stack-utils/StackScreen.native.js +0 -38
- package/dist/esm/layouts/stack-utils/StackScreen.native.js.map +0 -1
- package/dist/esm/layouts/stack-utils/index.js +0 -26
- package/dist/esm/layouts/stack-utils/index.js.map +0 -6
- package/dist/esm/layouts/stack-utils/index.mjs +0 -16
- package/dist/esm/layouts/stack-utils/index.mjs.map +0 -1
- package/dist/esm/layouts/stack-utils/index.native.js +0 -16
- package/dist/esm/layouts/stack-utils/index.native.js.map +0 -1
- package/dist/esm/utils/children.js +0 -23
- package/dist/esm/utils/children.js.map +0 -6
- package/dist/esm/utils/children.mjs +0 -13
- package/dist/esm/utils/children.mjs.map +0 -1
- package/dist/esm/utils/children.native.js +0 -32
- package/dist/esm/utils/children.native.js.map +0 -1
- package/dist/esm/utils/safeWrite.js +0 -29
- package/dist/esm/utils/safeWrite.js.map +0 -6
- package/dist/esm/utils/safeWrite.mjs +0 -21
- package/dist/esm/utils/safeWrite.mjs.map +0 -1
- package/dist/esm/utils/safeWrite.native.js +0 -25
- package/dist/esm/utils/safeWrite.native.js.map +0 -1
- package/dist/esm/utils/style.js +0 -8
- package/dist/esm/utils/style.js.map +0 -6
- package/dist/esm/utils/style.mjs +0 -5
- package/dist/esm/utils/style.mjs.map +0 -1
- package/dist/esm/utils/style.native.js +0 -5
- package/dist/esm/utils/style.native.js.map +0 -1
- package/types/__mocks__/@react-navigation/native-stack.d.ts.map +0 -1
- package/types/__mocks__/@react-navigation/native.d.ts.map +0 -1
- package/types/__mocks__/expo-linking.d.ts.map +0 -1
- package/types/__mocks__/expo-modules-core.d.ts.map +0 -1
- package/types/__mocks__/react-native-screens.d.ts.map +0 -1
- package/types/__mocks__/react-native.d.ts.map +0 -1
- package/types/experimental-useLoaderState.d.ts.map +0 -1
- package/types/layouts/stack-utils/StackHeaderBackButton.d.ts.map +0 -1
- package/types/layouts/stack-utils/StackHeaderComponent.d.ts.map +0 -1
- package/types/layouts/stack-utils/StackHeaderLeft.d.ts.map +0 -1
- package/types/layouts/stack-utils/StackHeaderRight.d.ts.map +0 -1
- package/types/layouts/stack-utils/StackHeaderSearchBar.d.ts.map +0 -1
- package/types/layouts/stack-utils/StackHeaderTitle.d.ts.map +0 -1
- package/types/layouts/stack-utils/StackScreen.d.ts.map +0 -1
- package/types/layouts/stack-utils/index.d.ts.map +0 -1
- package/types/utils/children.d.ts.map +0 -1
- package/types/utils/safeWrite.d.ts.map +0 -1
- package/types/utils/style.d.ts.map +0 -1
package/dist/cjs/{__mocks__/@react-navigation/native-stack.cjs → server/staticHtmlFetcher.cjs}
RENAMED
|
@@ -18,12 +18,16 @@ var __export = (target, all) => {
|
|
|
18
18
|
var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
19
19
|
value: !0
|
|
20
20
|
}), mod);
|
|
21
|
-
var
|
|
22
|
-
__export(
|
|
23
|
-
|
|
21
|
+
var staticHtmlFetcher_exports = {};
|
|
22
|
+
__export(staticHtmlFetcher_exports, {
|
|
23
|
+
getFetchStaticHtml: () => getFetchStaticHtml,
|
|
24
|
+
setFetchStaticHtml: () => setFetchStaticHtml
|
|
24
25
|
});
|
|
25
|
-
module.exports = __toCommonJS(
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
}
|
|
26
|
+
module.exports = __toCommonJS(staticHtmlFetcher_exports);
|
|
27
|
+
let _fetchStaticHtml = null;
|
|
28
|
+
function setFetchStaticHtml(fn) {
|
|
29
|
+
_fetchStaticHtml = fn;
|
|
30
|
+
}
|
|
31
|
+
function getFetchStaticHtml() {
|
|
32
|
+
return _fetchStaticHtml;
|
|
33
|
+
}
|
|
@@ -12,13 +12,17 @@ var __export = (target, all) => {
|
|
|
12
12
|
return to;
|
|
13
13
|
};
|
|
14
14
|
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: !0 }), mod);
|
|
15
|
-
var
|
|
16
|
-
__export(
|
|
17
|
-
|
|
15
|
+
var staticHtmlFetcher_exports = {};
|
|
16
|
+
__export(staticHtmlFetcher_exports, {
|
|
17
|
+
getFetchStaticHtml: () => getFetchStaticHtml,
|
|
18
|
+
setFetchStaticHtml: () => setFetchStaticHtml
|
|
18
19
|
});
|
|
19
|
-
module.exports = __toCommonJS(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
20
|
+
module.exports = __toCommonJS(staticHtmlFetcher_exports);
|
|
21
|
+
let _fetchStaticHtml = null;
|
|
22
|
+
function setFetchStaticHtml(fn) {
|
|
23
|
+
_fetchStaticHtml = fn;
|
|
23
24
|
}
|
|
24
|
-
|
|
25
|
+
function getFetchStaticHtml() {
|
|
26
|
+
return _fetchStaticHtml;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=staticHtmlFetcher.js.map
|
|
@@ -20,12 +20,17 @@ var __export = (target, all) => {
|
|
|
20
20
|
var __toCommonJS = mod => __copyProps(__defProp({}, "__esModule", {
|
|
21
21
|
value: !0
|
|
22
22
|
}), mod);
|
|
23
|
-
var
|
|
24
|
-
__export(
|
|
25
|
-
|
|
23
|
+
var staticHtmlFetcher_exports = {};
|
|
24
|
+
__export(staticHtmlFetcher_exports, {
|
|
25
|
+
getFetchStaticHtml: () => getFetchStaticHtml,
|
|
26
|
+
setFetchStaticHtml: () => setFetchStaticHtml
|
|
26
27
|
});
|
|
27
|
-
module.exports = __toCommonJS(
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
module.exports = __toCommonJS(staticHtmlFetcher_exports);
|
|
29
|
+
var _fetchStaticHtml = null;
|
|
30
|
+
function setFetchStaticHtml(fn) {
|
|
31
|
+
_fetchStaticHtml = fn;
|
|
30
32
|
}
|
|
31
|
-
|
|
33
|
+
function getFetchStaticHtml() {
|
|
34
|
+
return _fetchStaticHtml;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=staticHtmlFetcher.native.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","staticHtmlFetcher_exports","__export","getFetchStaticHtml","setFetchStaticHtml","module","exports","_fetchStaticHtml","fn"],"sources":["../../../src/server/staticHtmlFetcher.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;EAAAC,KAAA;AAAA,IAAAH,GAAA;AAAA,IAAAI,yBAAA;AAAAC,QAAA,CAAAD,yBAAA;EAAAE,kBAAA,EAAAA,CAAA,KAAAA,kBAAA;EAAAC,kBAAA,EAAAA,CAAA,KAAAA;AAAA;AACAC,MAAI,CAAAC,OAAA,GAAAV,YAAsE,CAAAK,yBAAA;AAEnE,IAAAM,gBAAS;AACd,SAAAH,kBAAmBA,CAAAI,EAAA;EACrBD,gBAAA,GAAAC,EAAA;AAEO;AACL,SAAOL,mBAAA;EACT,OAAAI,gBAAA","ignoreList":[]}
|
|
@@ -157,7 +157,22 @@ export { wrappedMiddlewareFunction as default }
|
|
|
157
157
|
}
|
|
158
158
|
const vercelOutputStaticDir = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output/static"));
|
|
159
159
|
await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
|
|
160
|
-
const
|
|
160
|
+
const ssrLoaderRoutes = buildInfoForWriting.manifest.pageRoutes.filter(r => r.type === "ssr").map(r => {
|
|
161
|
+
const pagePath = (0, import_getPathFromRoute.getPathFromRoute)(r) || "/",
|
|
162
|
+
cleanPath = pagePath.slice(1).replace(/\//g, "_"),
|
|
163
|
+
src = `^/assets/${cleanPath.replace(/:([^_]+)/g, "(?<$1>[^_]+)")}(?:_refetch_\\d+)?_\\d+_vxrn_loader\\.js$`;
|
|
164
|
+
let dest = `${pagePath}?__loader=1`;
|
|
165
|
+
const paramMatches = cleanPath.match(/:([^_]+)/g);
|
|
166
|
+
if (paramMatches) for (const match of paramMatches) {
|
|
167
|
+
const paramName = match.slice(1);
|
|
168
|
+
dest += `&${paramName}=$${paramName}`;
|
|
169
|
+
}
|
|
170
|
+
return {
|
|
171
|
+
src,
|
|
172
|
+
dest
|
|
173
|
+
};
|
|
174
|
+
}),
|
|
175
|
+
vercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output", "config.json"));
|
|
161
176
|
await writeJSON(vercelConfigFilePath, {
|
|
162
177
|
...import_vc_build_output_config_base.vercelBuildOutputConfigBase,
|
|
163
178
|
routes: [...import_vc_build_output_config_base.vercelBuildOutputConfigBase.routes, ...(existsSync(distMiddlewareDir) ? [{
|
|
@@ -166,7 +181,9 @@ export { wrappedMiddlewareFunction as default }
|
|
|
166
181
|
continue: !0
|
|
167
182
|
}] : []), {
|
|
168
183
|
handle: "rewrite"
|
|
169
|
-
},
|
|
184
|
+
},
|
|
185
|
+
// SSR loader routes must come before dynamic page routes
|
|
186
|
+
...ssrLoaderRoutes, ...buildInfoForWriting.manifest.allRoutes.filter(r => r.routeKeys && Object.keys(r.routeKeys).length > 0).map(r => ({
|
|
170
187
|
src: r.namedRegex,
|
|
171
188
|
dest: `${(0, import_getPathFromRoute.getPathFromRoute)(r) || "/"}?${Object.entries(r.routeKeys).map(([k, v]) => `${k}=$${v}`).join("&")}`
|
|
172
189
|
}))]
|
|
@@ -159,7 +159,17 @@ export { wrappedMiddlewareFunction as default }
|
|
|
159
159
|
await ensureDir(vercelOutputStaticDir), postBuildLogs.push(
|
|
160
160
|
`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`
|
|
161
161
|
), await moveAllFiles(clientDir, vercelOutputStaticDir);
|
|
162
|
-
const
|
|
162
|
+
const ssrLoaderRoutes = buildInfoForWriting.manifest.pageRoutes.filter((r) => r.type === "ssr").map((r) => {
|
|
163
|
+
const pagePath = (0, import_getPathFromRoute.getPathFromRoute)(r) || "/", cleanPath = pagePath.slice(1).replace(/\//g, "_"), src = `^/assets/${cleanPath.replace(/:([^_]+)/g, "(?<$1>[^_]+)")}(?:_refetch_\\d+)?_\\d+_vxrn_loader\\.js$`;
|
|
164
|
+
let dest = `${pagePath}?__loader=1`;
|
|
165
|
+
const paramMatches = cleanPath.match(/:([^_]+)/g);
|
|
166
|
+
if (paramMatches)
|
|
167
|
+
for (const match of paramMatches) {
|
|
168
|
+
const paramName = match.slice(1);
|
|
169
|
+
dest += `&${paramName}=$${paramName}`;
|
|
170
|
+
}
|
|
171
|
+
return { src, dest };
|
|
172
|
+
}), vercelConfigFilePath = (0, import_node_path.resolve)((0, import_node_path.join)(oneOptionsRoot, ".vercel/output", "config.json"));
|
|
163
173
|
await writeJSON(vercelConfigFilePath, {
|
|
164
174
|
...import_vc_build_output_config_base.vercelBuildOutputConfigBase,
|
|
165
175
|
routes: [
|
|
@@ -174,6 +184,8 @@ export { wrappedMiddlewareFunction as default }
|
|
|
174
184
|
{
|
|
175
185
|
handle: "rewrite"
|
|
176
186
|
},
|
|
187
|
+
// SSR loader routes must come before dynamic page routes
|
|
188
|
+
...ssrLoaderRoutes,
|
|
177
189
|
...buildInfoForWriting.manifest.allRoutes.filter((r) => r.routeKeys && Object.keys(r.routeKeys).length > 0).map((r) => ({
|
|
178
190
|
src: r.namedRegex,
|
|
179
191
|
dest: `${(0, import_getPathFromRoute.getPathFromRoute)(r) || "/"}?${Object.entries(r.routeKeys).map(([k, v]) => `${k}=$${v}`).join("&")}`
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA8B,sBAE9B,kBAAoB,iCAEpB,oBAA8B,uBAE9B,qCAA4C,iDAE5C,yBAA4C,qCAC5C,qCAA4C,mDAC5C,qCAA4C,mDAC5C,0BAAiC;AAEjC,MAAM,EAAE,MAAM,WAAW,YAAY,UAAU,IAAI,gBAAAA;AAEnD,eAAe,aAAa,KAAa,MAAc;AACrD,MAAI;AACF,UAAM,KAAK,KAAK,MAAM,EAAE,WAAW,IAAM,cAAc,GAAM,CAAC;AAAA,EAChE,SAAS,KAAK;AACZ,YAAQ,MAAM,uBAAuB,GAAG;AAAA,EAC1C;AACF;AAEA,SAAS,2BAA2B,qBAAoC;AACtE,SAAO,oBAAoB,SAAS,UACjC,OAAO,CAAC,MAAM,EAAE,eAAe,EAAE,YAAY,SAAS,CAAC,EACvD,IAAI,CAAC,MAAM;AAAA,IACV,EAAE;AAAA,IACF,EAAE,YAAa;AAAA,MAAI,CAAC,MAClB,EAAE,WAAW,WAAW,mBAAmB,IACvC,EAAE,WAAW,UAAU,EAA0B,IACjD,EAAE;AAAA,IACR;AAAA,EACF,CAAC,EACA,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM;AAC7C;AAEO,MAAM,6BAA6B,OAAO;AAAA,EAC/C;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AACF,MAMM;AACJ,QAAM,EAAE,iBAAiB,IAAI;AAC7B,MAAI,WAAW;AACb,UAAM,sBAAsB,WAAW,UAAU,CAAC,GAAG;AAAA,MAAO,CAAC,UAC3D,8BAAW,EAAE,MAAM,oBAAE,QAAQ,gBAAgB,oBAAE,OAAO,GAAG,CAAC;AAAA,IAC5D;AACA,eAAW,SAAS,oBAAoB,SAAS,WAAW;AAC1D,YAAM,gBAAgB,mBAAmB,KAAK,CAAC,aAChC,SAAS,eAAe,SAAS,MAAM,KAAK,QAAQ,MAAM,EAAE,CAAC,CAE3E;AACD,MAAI,iBACF,cAAc;AAAA,QACZ,mEAAmE,MAAM,IAAI;AAAA,MAC/E,GAEA,UAAM,gEAA4B,OAAO,cAAc,MAAM,gBAAgB,aAAa,KAE1F,QAAQ,KAAK;AAAA,sEAAkE,MAAM,IAAI;AAAA,IAE7F;AAAA,EACF;AAEA,QAAM,+BAA2B,uBAAK,gBAAgB,0BAA0B;AAChF,QAAM,UAAU,wBAAwB;AAExC,aAAW,SAAS,oBAAoB,SAAS;AAC/C,YAAQ,MAAM,MAAM;AAAA,MAClB,KAAK,OAAO;AAGV,QADuB,iBAAiB,MAAM,IAAI,MAEhD,cAAc;AAAA,UACZ,wDAAwD,MAAM,IAAI,SAAS,MAAM,IAAI;AAAA,QACvF,GACA,UAAM;AAAA,UACJ;AAAA,UACA;AAAA,UACA;AAAA,UACA;AAAA,QACF;AAEF;AAAA,MACF;AAAA,MACA;AAGE;AAAA,IACJ;AAGF,QAAM,wBAAoB,8BAAQ,uBAAK,gBAAgB,QAAQ,aAAa,CAAC;AAC7E,MAAI,WAAW,iBAAiB,GAAG;AACjC,UAAM,0BAAsB;AAAA,UAC1B,uBAAK,gBAAgB,2CAA2C;AAAA,IAClE;AACA,UAAM,UAAU,mBAAmB,GACnC,cAAc;AAAA,MACZ,gDAAgD,iBAAiB,OAAO,mBAAmB;AAAA,IAC7F,GACA,MAAM,iBAAa,8BAAQ,uBAAK,gBAAgB,QAAQ,aAAa,CAAC,GAAG,mBAAmB;AAC5F,UAAM,0CAAsC,8BAAQ,uBAAK,qBAAqB,cAAc,CAAC;AAC7F,kBAAc;AAAA,MACZ,+CAA+C,mCAAmC;AAAA,IACpF,GACA,MAAM,UAAU,qCAAqC,kDAA2B;AAChF,UAAM,sCAAsC,0BACtC,sCAAkC;AAAA,UACtC,uBAAK,qBAAqB,mCAAmC;AAAA,IAC/D,GACM,0BAA0B,2BAA2B,mBAAmB,GACxE,+BAA+B,wBAAwB;AAAA,MAC3D,CAAC,KAAK,CAAC,YAAY,WAAW,QAC1B,MAAM,QAAQ,WAAW,IAAI,cAAc,CAAC,WAAW,GAAG,QAAQ,CAAC,eAAe;AAClF,cAAM,yBAAyB,WAAW,QAAQ,aAAa,EAAE,EAAE,WAAW,KAAK,GAAG;AACtF,YAAI,UAAU,IAAI;AAAA,MACpB,CAAC,GACM;AAAA,MAET,CAAC;AAAA,IACH;AACA,UAAM,gBAAAA,QAAQ;AAAA,MACZ;AAAA,MACA;AAAA,kCAC4B,KAAK,UAAU,uBAAuB,CAAC;AAAA,EACvE,OAAO,QAAQ,4BAA4B,EAC1C,IAAI,CAAC,CAAC,MAAM,YAAY,MAAM,UAAU,YAAY,YAAY,IAAI,GAAG,EACvE,KAAK;AAAA,CAAI,CAAC;AAAA;AAAA;AAAA;AAAA,QAIL,OAAO,QAAQ,4BAA4B,EAC1C,IAAI,CAAC,CAAC,MAAM,YAAY,MAAM,SAAS,IAAI,aAAa,YAAY,EAAE,EACtE,KAAK;AAAA,CAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAkCf;AACA,UAAM,qCAAiC,8BAAQ,uBAAK,qBAAqB,iBAAiB,CAAC;AAC3F,kBAAc;AAAA,MACZ,kDAAkD,8BAA8B;AAAA,IAClF,GACA,MAAM,UAAU,gCAAgC;AAAA,MAC9C,SAAS;AAAA;AAAA,MACT,YAAY;AAAA,IACd,CAAC;AAAA,EACH;AAEA,QAAM,4BAAwB,8BAAQ,uBAAK,gBAAgB,uBAAuB,CAAC;AACnF,QAAM,UAAU,qBAAqB,GAErC,cAAc;AAAA,IACZ,iDAAiD,SAAS,OAAO,qBAAqB;AAAA,EACxF,GACA,MAAM,aAAa,WAAW,qBAAqB;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["FSExtra"]
|
|
6
6
|
}
|
|
@@ -214,7 +214,41 @@ export { wrappedMiddlewareFunction as default }
|
|
|
214
214
|
}
|
|
215
215
|
var vercelOutputStaticDir = (0, import_path.resolve)((0, import_path.join)(oneOptionsRoot, ".vercel/output/static"));
|
|
216
216
|
await ensureDir(vercelOutputStaticDir), postBuildLogs.push(`[one.build][vercel] copying static files from ${clientDir} to ${vercelOutputStaticDir}`), await moveAllFiles(clientDir, vercelOutputStaticDir);
|
|
217
|
-
var
|
|
217
|
+
var ssrLoaderRoutes = buildInfoForWriting.manifest.pageRoutes.filter(function (r) {
|
|
218
|
+
return r.type === "ssr";
|
|
219
|
+
}).map(function (r) {
|
|
220
|
+
var pagePath = (0, import_getPathFromRoute.getPathFromRoute)(r) || "/",
|
|
221
|
+
cleanPath = pagePath.slice(1).replace(/\//g, "_"),
|
|
222
|
+
loaderPattern = cleanPath.replace(/:([^_]+)/g, "(?<$1>[^_]+)"),
|
|
223
|
+
src = `^/assets/${loaderPattern}(?:_refetch_\\d+)?_\\d+_vxrn_loader\\.js$`,
|
|
224
|
+
dest = `${pagePath}?__loader=1`,
|
|
225
|
+
paramMatches = cleanPath.match(/:([^_]+)/g);
|
|
226
|
+
if (paramMatches) {
|
|
227
|
+
var _iteratorNormalCompletion2 = !0,
|
|
228
|
+
_didIteratorError2 = !1,
|
|
229
|
+
_iteratorError2 = void 0;
|
|
230
|
+
try {
|
|
231
|
+
for (var _iterator2 = paramMatches[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = !0) {
|
|
232
|
+
var match = _step2.value,
|
|
233
|
+
paramName = match.slice(1);
|
|
234
|
+
dest += `&${paramName}=$${paramName}`;
|
|
235
|
+
}
|
|
236
|
+
} catch (err) {
|
|
237
|
+
_didIteratorError2 = !0, _iteratorError2 = err;
|
|
238
|
+
} finally {
|
|
239
|
+
try {
|
|
240
|
+
!_iteratorNormalCompletion2 && _iterator2.return != null && _iterator2.return();
|
|
241
|
+
} finally {
|
|
242
|
+
if (_didIteratorError2) throw _iteratorError2;
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
}
|
|
246
|
+
return {
|
|
247
|
+
src,
|
|
248
|
+
dest
|
|
249
|
+
};
|
|
250
|
+
}),
|
|
251
|
+
vercelConfigFilePath = (0, import_path.resolve)((0, import_path.join)(oneOptionsRoot, ".vercel/output", "config.json"));
|
|
218
252
|
await writeJSON(vercelConfigFilePath, {
|
|
219
253
|
...import_vc_build_output_config_base.vercelBuildOutputConfigBase,
|
|
220
254
|
routes: [...import_vc_build_output_config_base.vercelBuildOutputConfigBase.routes, ...(existsSync(distMiddlewareDir) ? [{
|
|
@@ -223,7 +257,9 @@ export { wrappedMiddlewareFunction as default }
|
|
|
223
257
|
continue: !0
|
|
224
258
|
}] : []), {
|
|
225
259
|
handle: "rewrite"
|
|
226
|
-
},
|
|
260
|
+
},
|
|
261
|
+
// SSR loader routes must come before dynamic page routes
|
|
262
|
+
...ssrLoaderRoutes, ...buildInfoForWriting.manifest.allRoutes.filter(function (r) {
|
|
227
263
|
return r.routeKeys && Object.keys(r.routeKeys).length > 0;
|
|
228
264
|
}).map(function (r) {
|
|
229
265
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","buildVercelOutputDirectory_exports","__export","buildVercelOutputDirectory","module","exports","import_path","require","import_fs_extra","__toESM","import_ts_pattern","import_vc_build_output_config_base","import_vc_package_base","import_createApiServerlessFunction","import_createSsrServerlessFunction","import_getPathFromRoute","copy","ensureDir","existsSync","writeJSON","default","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","getMiddlewaresByNamedRegex","buildInfoForWriting","manifest","allRoutes","filter","r","middlewares","length","map","namedRegex","m","contextKey","startsWith","substring","sort","a","b","param","apiOutput","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","_apiOutput_output","compiltedApiRoutes","output","o","isMatching","code","P","string","facadeModuleId","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","route2","_step","compiledRoute","find","compiled","flag","includes","file","replace","push","page","createApiServerlessFunction","warn","_iterator","apiRoutes","Symbol","iterator","next","done","return","vercelOutputFunctionsDir","join","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","pageRoutes","_step1","route","type","builtPageRoute","createSsrServerlessFunction","distMiddlewareDir","resolve","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","serverlessVercelPackageJson","wrappedMiddlewareEntryPointFilename","wrappedMiddlewareEntryPointPath","middlewaresByNamedRegex","middlewaresToVariableNameMap","reduce","acc","param2","Array","isArray","forEach","middleware","middlewareVariableName","replaceAll","writeFile","JSON","stringify","Object","entries","path","variableName","middlewareVercelConfigFilePath","runtime","entrypoint","vercelOutputStaticDir","
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","buildVercelOutputDirectory_exports","__export","buildVercelOutputDirectory","module","exports","import_path","require","import_fs_extra","__toESM","import_ts_pattern","import_vc_build_output_config_base","import_vc_package_base","import_createApiServerlessFunction","import_createSsrServerlessFunction","import_getPathFromRoute","copy","ensureDir","existsSync","writeJSON","default","moveAllFiles","src","dest","overwrite","errorOnExist","err","console","error","getMiddlewaresByNamedRegex","buildInfoForWriting","manifest","allRoutes","filter","r","middlewares","length","map","namedRegex","m","contextKey","startsWith","substring","sort","a","b","param","apiOutput","clientDir","oneOptionsRoot","postBuildLogs","routeToBuildInfo","_apiOutput_output","compiltedApiRoutes","output","o","isMatching","code","P","string","facadeModuleId","_iteratorNormalCompletion","_didIteratorError","_iteratorError","_loop","route2","_step","compiledRoute","find","compiled","flag","includes","file","replace","push","page","createApiServerlessFunction","warn","_iterator","apiRoutes","Symbol","iterator","next","done","return","vercelOutputFunctionsDir","join","_iteratorNormalCompletion1","_didIteratorError1","_iteratorError1","_iterator1","pageRoutes","_step1","route","type","builtPageRoute","createSsrServerlessFunction","distMiddlewareDir","resolve","vercelMiddlewareDir","vercelMiddlewarePackageJsonFilePath","serverlessVercelPackageJson","wrappedMiddlewareEntryPointFilename","wrappedMiddlewareEntryPointPath","middlewaresByNamedRegex","middlewaresToVariableNameMap","reduce","acc","param2","Array","isArray","forEach","middleware","middlewareVariableName","replaceAll","writeFile","JSON","stringify","Object","entries","path","variableName","middlewareVercelConfigFilePath","runtime","entrypoint","vercelOutputStaticDir","ssrLoaderRoutes","pagePath","getPathFromRoute","cleanPath","slice","loaderPattern","paramMatches","match","_iteratorNormalCompletion2","_didIteratorError2","_iteratorError2","_iterator2","_step2","paramName"],"sources":["../../../../src/vercel/build/buildVercelOutputDirectory.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -60,10 +60,58 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
|
|
|
60
60
|
const handler = async (req, res) => {
|
|
61
61
|
// console.debug("req.url", req.url);
|
|
62
62
|
const url = new URL(req.url, \`https://\${process.env.VERCEL_URL}\`);
|
|
63
|
+
|
|
64
|
+
// Check if this is a loader request (routed here by config.json rewrite)
|
|
65
|
+
const isLoaderRequest = url.searchParams.get('__loader') === '1';
|
|
66
|
+
|
|
67
|
+
// Extract route params - from URL path match OR from query params (for loader requests)
|
|
68
|
+
const routePattern = ${JSON.stringify(route.page)};
|
|
69
|
+
const paramNames = [];
|
|
70
|
+
const regexPattern = routePattern
|
|
71
|
+
.replace(/\\[\\.\\.\\.(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: true }); return '(.+)'; })
|
|
72
|
+
.replace(/\\[(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: false }); return '([^/]+)'; });
|
|
73
|
+
|
|
74
|
+
const routeParams = {};
|
|
75
|
+
|
|
76
|
+
// First try to get params from query string (set by Vercel rewrite rules)
|
|
77
|
+
// This handles both loader requests and regular page requests that went through rewrites
|
|
78
|
+
for (const param of paramNames) {
|
|
79
|
+
const value = url.searchParams.get(param.name);
|
|
80
|
+
if (value) {
|
|
81
|
+
routeParams[param.name] = param.catch ? value.split('/') : value;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
// If no params found in query string, try extracting from URL path
|
|
86
|
+
if (Object.keys(routeParams).length === 0) {
|
|
87
|
+
const match = url.pathname.match(new RegExp(\`^\${regexPattern}$\`));
|
|
88
|
+
if (match) {
|
|
89
|
+
paramNames.forEach((param, index) => {
|
|
90
|
+
const value = match[index + 1];
|
|
91
|
+
routeParams[param.name] = param.catch ? value.split('/') : value;
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
// Create a proper Request object for SSR loaders
|
|
97
|
+
const request = new Request(url.toString(), {
|
|
98
|
+
method: req.method || 'GET',
|
|
99
|
+
headers: new Headers(req.headers || {}),
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
// Reconstruct the original path by replacing :param placeholders with actual values
|
|
103
|
+
// The pathname might be the rewritten path (e.g., /dynamic/:id instead of /dynamic/123)
|
|
104
|
+
let originalPath = url.pathname;
|
|
105
|
+
for (const [key, value] of Object.entries(routeParams)) {
|
|
106
|
+
originalPath = originalPath.replace(\`:\${key}\`, String(value));
|
|
107
|
+
}
|
|
108
|
+
|
|
63
109
|
const loaderProps = {
|
|
64
|
-
path:
|
|
65
|
-
params:
|
|
110
|
+
path: originalPath,
|
|
111
|
+
params: routeParams,
|
|
112
|
+
request,
|
|
66
113
|
}
|
|
114
|
+
|
|
67
115
|
const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
|
|
68
116
|
// const routeFile = \`.\${url.pathname}\${postfix}\`;
|
|
69
117
|
let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
|
|
@@ -76,16 +124,28 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
|
|
|
76
124
|
route = buildInfoConfig.default.routeToBuildInfo[routeName];
|
|
77
125
|
}
|
|
78
126
|
|
|
79
|
-
const render = entry.default.render;
|
|
80
127
|
const exported = await import(route.serverJsPath.replace('dist/','../'))
|
|
81
128
|
const loaderData = await exported.loader?.(loaderProps)
|
|
129
|
+
|
|
130
|
+
// For loader requests, return the loader data as a JavaScript module
|
|
131
|
+
if (isLoaderRequest) {
|
|
132
|
+
res.setHeader('Content-Type', 'application/javascript; charset=utf-8')
|
|
133
|
+
res.setHeader('Cache-Control', 'no-store')
|
|
134
|
+
res.end(\`export function loader() { return \${JSON.stringify(loaderData)} }\`)
|
|
135
|
+
return
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
// For page requests, render the full HTML
|
|
139
|
+
const render = entry.default.render;
|
|
82
140
|
const preloads = route.preloads
|
|
141
|
+
const css = route.css || []
|
|
83
142
|
const rendered = await render({
|
|
84
143
|
mode: route.type,
|
|
85
144
|
loaderData,
|
|
86
145
|
loaderProps,
|
|
87
146
|
path: loaderProps?.path || '/',
|
|
88
147
|
preloads,
|
|
148
|
+
css,
|
|
89
149
|
})
|
|
90
150
|
res.setHeader('Content-Type', 'text/html; charset=utf-8')
|
|
91
151
|
// https://vercel.com/docs/deployments/skew-protection#supported-frameworks__
|
|
@@ -49,10 +49,58 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
|
|
|
49
49
|
const handler = async (req, res) => {
|
|
50
50
|
// console.debug("req.url", req.url);
|
|
51
51
|
const url = new URL(req.url, \`https://\${process.env.VERCEL_URL}\`);
|
|
52
|
+
|
|
53
|
+
// Check if this is a loader request (routed here by config.json rewrite)
|
|
54
|
+
const isLoaderRequest = url.searchParams.get('__loader') === '1';
|
|
55
|
+
|
|
56
|
+
// Extract route params - from URL path match OR from query params (for loader requests)
|
|
57
|
+
const routePattern = ${JSON.stringify(route.page)};
|
|
58
|
+
const paramNames = [];
|
|
59
|
+
const regexPattern = routePattern
|
|
60
|
+
.replace(/\\[\\.\\.\\.(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: true }); return '(.+)'; })
|
|
61
|
+
.replace(/\\[(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: false }); return '([^/]+)'; });
|
|
62
|
+
|
|
63
|
+
const routeParams = {};
|
|
64
|
+
|
|
65
|
+
// First try to get params from query string (set by Vercel rewrite rules)
|
|
66
|
+
// This handles both loader requests and regular page requests that went through rewrites
|
|
67
|
+
for (const param of paramNames) {
|
|
68
|
+
const value = url.searchParams.get(param.name);
|
|
69
|
+
if (value) {
|
|
70
|
+
routeParams[param.name] = param.catch ? value.split('/') : value;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
// If no params found in query string, try extracting from URL path
|
|
75
|
+
if (Object.keys(routeParams).length === 0) {
|
|
76
|
+
const match = url.pathname.match(new RegExp(\`^\${regexPattern}$\`));
|
|
77
|
+
if (match) {
|
|
78
|
+
paramNames.forEach((param, index) => {
|
|
79
|
+
const value = match[index + 1];
|
|
80
|
+
routeParams[param.name] = param.catch ? value.split('/') : value;
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
// Create a proper Request object for SSR loaders
|
|
86
|
+
const request = new Request(url.toString(), {
|
|
87
|
+
method: req.method || 'GET',
|
|
88
|
+
headers: new Headers(req.headers || {}),
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
// Reconstruct the original path by replacing :param placeholders with actual values
|
|
92
|
+
// The pathname might be the rewritten path (e.g., /dynamic/:id instead of /dynamic/123)
|
|
93
|
+
let originalPath = url.pathname;
|
|
94
|
+
for (const [key, value] of Object.entries(routeParams)) {
|
|
95
|
+
originalPath = originalPath.replace(\`:\${key}\`, String(value));
|
|
96
|
+
}
|
|
97
|
+
|
|
52
98
|
const loaderProps = {
|
|
53
|
-
path:
|
|
54
|
-
params:
|
|
99
|
+
path: originalPath,
|
|
100
|
+
params: routeParams,
|
|
101
|
+
request,
|
|
55
102
|
}
|
|
103
|
+
|
|
56
104
|
const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
|
|
57
105
|
// const routeFile = \`.\${url.pathname}\${postfix}\`;
|
|
58
106
|
let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
|
|
@@ -65,16 +113,28 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
|
|
|
65
113
|
route = buildInfoConfig.default.routeToBuildInfo[routeName];
|
|
66
114
|
}
|
|
67
115
|
|
|
68
|
-
const render = entry.default.render;
|
|
69
116
|
const exported = await import(route.serverJsPath.replace('dist/','../'))
|
|
70
117
|
const loaderData = await exported.loader?.(loaderProps)
|
|
118
|
+
|
|
119
|
+
// For loader requests, return the loader data as a JavaScript module
|
|
120
|
+
if (isLoaderRequest) {
|
|
121
|
+
res.setHeader('Content-Type', 'application/javascript; charset=utf-8')
|
|
122
|
+
res.setHeader('Cache-Control', 'no-store')
|
|
123
|
+
res.end(\`export function loader() { return \${JSON.stringify(loaderData)} }\`)
|
|
124
|
+
return
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
// For page requests, render the full HTML
|
|
128
|
+
const render = entry.default.render;
|
|
71
129
|
const preloads = route.preloads
|
|
130
|
+
const css = route.css || []
|
|
72
131
|
const rendered = await render({
|
|
73
132
|
mode: route.type,
|
|
74
133
|
loaderData,
|
|
75
134
|
loaderProps,
|
|
76
135
|
path: loaderProps?.path || '/',
|
|
77
136
|
preloads,
|
|
137
|
+
css,
|
|
78
138
|
})
|
|
79
139
|
res.setHeader('Content-Type', 'text/html; charset=utf-8')
|
|
80
140
|
// https://vercel.com/docs/deployments/skew-protection#supported-frameworks__
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA8B,sBAC9B,kBAAe,iCAEf,wBAA6C,qCAC7C,yBAA4C,sCAC5C,0BAAiC;AAIjC,eAAsB,4BACpB,OACA,WACA,gBACA,eACA;AACA,MAAI;AACF,UAAM,WAAO,0CAAiB,OAAO,EAAE,cAAc,GAAK,CAAC;AAC3D,kBAAc,KAAK,yDAAyD,IAAI,EAAE;AAElF,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,iBAAa,8BAAQ,uBAAK,gBAAgB,4BAA4B,IAAI,OAAO,CAAC;AACxF,UAAM,gBAAAA,QAAG,UAAU,UAAU;AAE7B,UAAM,qBAAiB,8BAAQ,uBAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,mBAAe,8BAAQ,uBAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,gBAAAA,QAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,gBAAAA,QAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,gBAAAA,QAAG,cAAU,uBAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,gBAAAA,QAAG,cAAU,uBAAK,YAAY,YAAY,CAAC;AACjD,UAAM,yBAAqB,8BAAQ,uBAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,gBAAAA,QAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA,sBAGgB,KAAK,UAAU,MAAM,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,
|
|
4
|
+
"mappings": ";;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAA8B,sBAC9B,kBAAe,iCAEf,wBAA6C,qCAC7C,yBAA4C,sCAC5C,0BAAiC;AAIjC,eAAsB,4BACpB,OACA,WACA,gBACA,eACA;AACA,MAAI;AACF,UAAM,WAAO,0CAAiB,OAAO,EAAE,cAAc,GAAK,CAAC;AAC3D,kBAAc,KAAK,yDAAyD,IAAI,EAAE;AAElF,UAAM,oBAAoB,KAAK,UAAU,SAAS,GAC5C,iBAAa,8BAAQ,uBAAK,gBAAgB,4BAA4B,IAAI,OAAO,CAAC;AACxF,UAAM,gBAAAA,QAAG,UAAU,UAAU;AAE7B,UAAM,qBAAiB,8BAAQ,uBAAK,gBAAgB,QAAQ,QAAQ,CAAC,GAC/D,mBAAe,8BAAQ,uBAAK,YAAY,QAAQ,CAAC;AACvD,UAAM,gBAAAA,QAAG,UAAU,YAAY,GAC/B,cAAc;AAAA,MACZ,+EAA+E,cAAc,OAAO,YAAY;AAAA,IAClH,GACA,MAAM,gBAAAA,QAAG,KAAK,gBAAgB,YAAY,GAE1C,cAAc,KAAK,wEAAwE,GAC3F,MAAM,gBAAAA,QAAG,cAAU,uBAAK,YAAY,cAAc,GAAG,kBAAkB,iBAAiB,EAAE,GAE1F,MAAM,gBAAAA,QAAG,cAAU,uBAAK,YAAY,YAAY,CAAC;AACjD,UAAM,yBAAqB,8BAAQ,uBAAK,YAAY,cAAc,UAAU,CAAC;AAC7E,kBAAc;AAAA,MACZ,yEAAyE,kBAAkB;AAAA,IAC7F,GACA,MAAM,gBAAAA,QAAG;AAAA,MACP;AAAA,MACA;AAAA;AAAA;AAAA,sBAGgB,KAAK,UAAU,MAAM,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,2BAUrB,KAAK,UAAU,MAAM,IAAI,CAAC;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IA8FjD;AAEA,UAAM,0BAAsB,8BAAQ,uBAAK,YAAY,cAAc,CAAC;AACpE,kBAAc;AAAA,MACZ,2EAA2E,mBAAmB;AAAA,IAChG,GACA,MAAM,gBAAAA,QAAG,UAAU,qBAAqB,kDAA2B;AAInE,UAAM,uBAAmB,8BAAQ,uBAAK,YAAY,iBAAiB,CAAC;AACpE,yBAAc;AAAA,MACZ,8EAA8E,gBAAgB;AAAA,IAChG,GACO,gBAAAA,QAAG,UAAU,kBAAkB;AAAA,MACpC,GAAG;AAAA,MACH,SAAS;AAAA,MACT,aAAa;AAAA,QACX,GAAG,mDAA6B;AAAA,QAChC,yBAAyB;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,SAAS,GAAG;AACV,YAAQ;AAAA,MACN,+EAA+E,MAAM,IAAI;AAAA,MACzF;AAAA,IACF;AAAA,EACF;AACF;",
|
|
5
5
|
"names": ["fs"]
|
|
6
6
|
}
|
|
@@ -62,10 +62,58 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
|
|
|
62
62
|
const handler = async (req, res) => {
|
|
63
63
|
// console.debug("req.url", req.url);
|
|
64
64
|
const url = new URL(req.url, \`https://\${process.env.VERCEL_URL}\`);
|
|
65
|
+
|
|
66
|
+
// Check if this is a loader request (routed here by config.json rewrite)
|
|
67
|
+
const isLoaderRequest = url.searchParams.get('__loader') === '1';
|
|
68
|
+
|
|
69
|
+
// Extract route params - from URL path match OR from query params (for loader requests)
|
|
70
|
+
const routePattern = ${JSON.stringify(route.page)};
|
|
71
|
+
const paramNames = [];
|
|
72
|
+
const regexPattern = routePattern
|
|
73
|
+
.replace(/\\[\\.\\.\\.(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: true }); return '(.+)'; })
|
|
74
|
+
.replace(/\\[(\\w+)\\]/g, (_, name) => { paramNames.push({ name, catch: false }); return '([^/]+)'; });
|
|
75
|
+
|
|
76
|
+
const routeParams = {};
|
|
77
|
+
|
|
78
|
+
// First try to get params from query string (set by Vercel rewrite rules)
|
|
79
|
+
// This handles both loader requests and regular page requests that went through rewrites
|
|
80
|
+
for (const param of paramNames) {
|
|
81
|
+
const value = url.searchParams.get(param.name);
|
|
82
|
+
if (value) {
|
|
83
|
+
routeParams[param.name] = param.catch ? value.split('/') : value;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
// If no params found in query string, try extracting from URL path
|
|
88
|
+
if (Object.keys(routeParams).length === 0) {
|
|
89
|
+
const match = url.pathname.match(new RegExp(\`^\${regexPattern}$\`));
|
|
90
|
+
if (match) {
|
|
91
|
+
paramNames.forEach((param, index) => {
|
|
92
|
+
const value = match[index + 1];
|
|
93
|
+
routeParams[param.name] = param.catch ? value.split('/') : value;
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
// Create a proper Request object for SSR loaders
|
|
99
|
+
const request = new Request(url.toString(), {
|
|
100
|
+
method: req.method || 'GET',
|
|
101
|
+
headers: new Headers(req.headers || {}),
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
// Reconstruct the original path by replacing :param placeholders with actual values
|
|
105
|
+
// The pathname might be the rewritten path (e.g., /dynamic/:id instead of /dynamic/123)
|
|
106
|
+
let originalPath = url.pathname;
|
|
107
|
+
for (const [key, value] of Object.entries(routeParams)) {
|
|
108
|
+
originalPath = originalPath.replace(\`:\${key}\`, String(value));
|
|
109
|
+
}
|
|
110
|
+
|
|
65
111
|
const loaderProps = {
|
|
66
|
-
path:
|
|
67
|
-
params:
|
|
112
|
+
path: originalPath,
|
|
113
|
+
params: routeParams,
|
|
114
|
+
request,
|
|
68
115
|
}
|
|
116
|
+
|
|
69
117
|
const postfix = url.pathname.endsWith('/') ? 'index.tsx' : '+ssr.tsx';
|
|
70
118
|
// const routeFile = \`.\${url.pathname}\${postfix}\`;
|
|
71
119
|
let route = buildInfoConfig.default.routeToBuildInfo[routeFile];
|
|
@@ -78,16 +126,28 @@ async function createSsrServerlessFunction(route, buildInfo, oneOptionsRoot, pos
|
|
|
78
126
|
route = buildInfoConfig.default.routeToBuildInfo[routeName];
|
|
79
127
|
}
|
|
80
128
|
|
|
81
|
-
const render = entry.default.render;
|
|
82
129
|
const exported = await import(route.serverJsPath.replace('dist/','../'))
|
|
83
130
|
const loaderData = await exported.loader?.(loaderProps)
|
|
131
|
+
|
|
132
|
+
// For loader requests, return the loader data as a JavaScript module
|
|
133
|
+
if (isLoaderRequest) {
|
|
134
|
+
res.setHeader('Content-Type', 'application/javascript; charset=utf-8')
|
|
135
|
+
res.setHeader('Cache-Control', 'no-store')
|
|
136
|
+
res.end(\`export function loader() { return \${JSON.stringify(loaderData)} }\`)
|
|
137
|
+
return
|
|
138
|
+
}
|
|
139
|
+
|
|
140
|
+
// For page requests, render the full HTML
|
|
141
|
+
const render = entry.default.render;
|
|
84
142
|
const preloads = route.preloads
|
|
143
|
+
const css = route.css || []
|
|
85
144
|
const rendered = await render({
|
|
86
145
|
mode: route.type,
|
|
87
146
|
loaderData,
|
|
88
147
|
loaderProps,
|
|
89
148
|
path: loaderProps?.path || '/',
|
|
90
149
|
preloads,
|
|
150
|
+
css,
|
|
91
151
|
})
|
|
92
152
|
res.setHeader('Content-Type', 'text/html; charset=utf-8')
|
|
93
153
|
// https://vercel.com/docs/deployments/skew-protection#supported-frameworks__
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createSsrServerlessFunction_exports","__export","createSsrServerlessFunction","module","exports","import_path","require","import_fs_extra","__toESM","import_vc_config_base","import_vc_package_base","import_getPathFromRoute","route","buildInfo","oneOptionsRoot","postBuildLogs","path","getPathFromRoute","includeIndex","push","buildInfoAsString","JSON","stringify","funcFolder","resolve","join","default","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","packageJsonFilePath","writeJSON","serverlessVercelPackageJson","vcConfigFilePath","writeJson","serverlessVercelNodeJsConfig","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAAA;EAAAA,YAAA,GAAAC,GAAA,IAAAC,WAAA,CAAAC,SAAA;IAAAC,KAAA;EAAA,IAAAH,GAAA;AAAA,IAAAI,mCAAA;AAAAC,QAAA,CAAAD,mCAAA;EAAAE,2BAAA,EAAAA,CAAA,KAAAA;AAAA;AAAAC,MAAA,CAAAC,OAAA,GAAAT,YAA8B,CAAAK,mCACf;AAQf,IAAAK,WAAsB,GAAAC,OAAA;EAAAC,eAEpB,GAAAC,OAAA,CACAF,OAAA,WACA;EAAAG,qBACA,GAAAH,OAAA;EAAAI,sBAAA,GAAAJ,OAAA;EAAAK,uBAAA,GAAAL,OAAA;AACA,eAAIJ,4BAAAU,KAAA,EAAAC,SAAA,EAAAC,cAAA,EAAAC,aAAA;EACF;IACA,IAAAC,IAAA,OAAcL,uBAAK,CAAAM,gBAAA,EAAAL,KAAA;MAEnBM,YAAM;IAEN;IAEAH,aAAM,CAAAI,IAAA,0DAAyBH,IAAK;IAEpC,IAAAI,iBAAM,GAAAC,IAAA,CAAAC,SAAG,CAAAT,SAAU;MAAAU,UACnB,OAAAlB,WAAc,CAAAmB,OAAA,MAAAnB,WAAA,CAAAoB,IAAA,EAAAX,cAAA,8BAAAE,IAAA;IAAA,MACZT,eAAA,CAAAmB,OAAA,CAAAC,SAAA,CAAAJ,UAAA;IACF,IACAK,cAAM,OAAAvB,WAAG,CAAAmB,OAAK,MAAAnB,WAAgB,CAAAoB,IAAY,EAAAX,cAE1C,EAAc,MAAK;MAAAe,YAAA,OAAAxB,WAAA,CAAAmB,OAAA,MAAAnB,WAAA,CAAwEoB,IAC3F,EAAAF,UAAM;IAGN,MAAMhB,eAAA,CAAAmB,OAAA,CAAAC,SAAqB,CAAAE,YAAA,GAAAd,aAAQ,CAAAI,IAAA,gFAA0CS,cAAA,OAAAC,YAAA,WAAAtB,eAAA,CAAAmB,OAAA,CAAAI,IAAA,CAAAF,cAAA,EAAAC,YAAA,GAAAd,aAAA,CAAAI,IAAA,kFAAAZ,eAAA,CAAAmB,OAAA,CAAAK,SAAA,KAAA1B,WAAA,CAAAoB,IAAA,EAAAF,UAAA,qCAAAH,iBAAA,WAAAb,eAAA,CAAAmB,OAAA,CAAAC,SAAA,KAAAtB,WAAA,CAAAoB,IAAA,EAAAF,UAAA;IAC7E,IAAAS,kBAAc,OAAA3B,WAAA,CAAAmB,OAAA,MAAAnB,WAAA,CAAAoB,IAAA,EAAAF,UAAA;IAAAR,aACZ,CAAAI,IAAA,0EAAyEa,kBAAkB,WAAAzB,eAAA,CAAAmB,OAAA,CAAAK,SAAA,CAAAC,kBAAA;AAAA;AAEpF;AACP,sBACAX,IAAA,CAAAC,SAAA,CAAAV,KAAA,CAAAqB,IAAA;AAAA;AAAA;AAAA;AAG0C;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IAAA,IAAAC,mBAAA,
|
|
1
|
+
{"version":3,"names":["__toCommonJS","mod","__copyProps","__defProp","value","createSsrServerlessFunction_exports","__export","createSsrServerlessFunction","module","exports","import_path","require","import_fs_extra","__toESM","import_vc_config_base","import_vc_package_base","import_getPathFromRoute","route","buildInfo","oneOptionsRoot","postBuildLogs","path","getPathFromRoute","includeIndex","push","buildInfoAsString","JSON","stringify","funcFolder","resolve","join","default","ensureDir","distServerFrom","distServerTo","copy","writeFile","entrypointFilePath","file","page","packageJsonFilePath","writeJSON","serverlessVercelPackageJson","vcConfigFilePath","writeJson","serverlessVercelNodeJsConfig","handler","environment","ONE_DEFAULT_RENDER_MODE","e","console","error"],"sources":["../../../../../src/vercel/build/generate/createSsrServerlessFunction.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -68,14 +68,18 @@ function mergeHeaders(onto, from) {
|
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
const globalId = {
|
|
71
|
-
|
|
72
|
-
}
|
|
71
|
+
_id: Math.random()
|
|
72
|
+
},
|
|
73
|
+
GLOBAL_ID_KEY = "__oneGlobalContextId";
|
|
74
|
+
globalThis[GLOBAL_ID_KEY] || (globalThis[GLOBAL_ID_KEY] = globalId);
|
|
73
75
|
function ensureAsyncLocalID() {
|
|
74
|
-
const id = process.env.VERCEL ?
|
|
76
|
+
const id = process.env.VERCEL ? globalThis[GLOBAL_ID_KEY] : requestAsyncLocalStore?.getStore();
|
|
75
77
|
if (!id) throw new Error("Internal One error, no AsyncLocalStorage id!");
|
|
76
78
|
return id;
|
|
77
79
|
}
|
|
78
|
-
const
|
|
80
|
+
const SERVER_CONTEXTS_KEY = "__oneServerContexts";
|
|
81
|
+
globalThis[SERVER_CONTEXTS_KEY] || (globalThis[SERVER_CONTEXTS_KEY] = /* @__PURE__ */new WeakMap());
|
|
82
|
+
const serverContexts = globalThis[SERVER_CONTEXTS_KEY];
|
|
79
83
|
function setServerContext(data) {
|
|
80
84
|
if (process.env.VITE_ENVIRONMENT === "ssr") {
|
|
81
85
|
const id = ensureAsyncLocalID();
|