@batijs/cli 0.0.177 → 0.0.178
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/boilerplates/@batijs/compiled/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/edgedb/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/eslint/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/express/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/firebase-auth/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/firebase-auth/files/libs/firebaseAdmin.ts +6 -6
- package/dist/boilerplates/@batijs/firebase-auth/files/libs/firebaseUI.ts +26 -26
- package/dist/boilerplates/@batijs/firebase-auth/files/pages/login/+guard.ts +5 -5
- package/dist/boilerplates/@batijs/firebase-auth/types/pages/login/+guard.d.ts +1 -1
- package/dist/boilerplates/@batijs/h3/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/hattip/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/prettier/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/prisma/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/react/files/$package.json.js +2 -2
- package/dist/boilerplates/@batijs/react/files/layouts/LayoutDefault.tsx +1 -1
- package/dist/boilerplates/@batijs/react/files/pages/+config.ts +2 -2
- package/dist/boilerplates/@batijs/react/files/pages/_error/+Page.tsx +1 -1
- package/dist/boilerplates/@batijs/react/files/pages/index/+Page.tsx +1 -1
- package/dist/boilerplates/@batijs/react/files/pages/star-wars/@id/+Page.tsx +1 -1
- package/dist/boilerplates/@batijs/react/files/pages/star-wars/@id/+data.ts +1 -1
- package/dist/boilerplates/@batijs/react/files/pages/star-wars/@id/+title.ts +1 -1
- package/dist/boilerplates/@batijs/react/files/pages/star-wars/index/+Page.tsx +1 -1
- package/dist/boilerplates/@batijs/react/files/pages/star-wars/index/+data.ts +1 -1
- package/dist/boilerplates/@batijs/react/files/pages/star-wars/index/+title.ts +1 -1
- package/dist/boilerplates/@batijs/react/types/pages/+config.d.ts +3 -3
- package/dist/boilerplates/@batijs/react/types/pages/star-wars/@id/+data.d.ts +1 -1
- package/dist/boilerplates/@batijs/react/types/pages/star-wars/@id/+title.d.ts +1 -1
- package/dist/boilerplates/@batijs/react/types/pages/star-wars/index/+data.d.ts +1 -1
- package/dist/boilerplates/@batijs/react/types/pages/star-wars/index/+title.d.ts +1 -1
- package/dist/boilerplates/@batijs/react-firebase-auth/files/pages/login/+Page.tsx +44 -44
- package/dist/boilerplates/@batijs/react-telefunc/files/pages/todo/+Page.tsx +2 -2
- package/dist/boilerplates/@batijs/react-telefunc/types/pages/todo/TodoList.d.ts +1 -1
- package/dist/boilerplates/@batijs/react-trpc/files/pages/todo-trpc/+Page.tsx +2 -2
- package/dist/boilerplates/@batijs/shared/files/tsconfig.json +2 -2
- package/dist/boilerplates/@batijs/solid/files/$package.json.js +3 -3
- package/dist/boilerplates/@batijs/solid/files/components/Link.tsx +1 -1
- package/dist/boilerplates/@batijs/solid/files/layouts/LayoutDefault.tsx +1 -1
- package/dist/boilerplates/@batijs/solid/files/pages/+config.ts +2 -2
- package/dist/boilerplates/@batijs/solid/files/pages/index/+Page.tsx +1 -1
- package/dist/boilerplates/@batijs/solid/files/pages/star-wars/@id/+Page.tsx +1 -1
- package/dist/boilerplates/@batijs/solid/files/pages/star-wars/@id/+data.ts +1 -1
- package/dist/boilerplates/@batijs/solid/files/pages/star-wars/@id/+title.ts +1 -1
- package/dist/boilerplates/@batijs/solid/files/pages/star-wars/index/+Page.tsx +1 -1
- package/dist/boilerplates/@batijs/solid/files/pages/star-wars/index/+data.ts +1 -1
- package/dist/boilerplates/@batijs/solid/files/pages/star-wars/index/+title.ts +1 -1
- package/dist/boilerplates/@batijs/solid/types/pages/+config.d.ts +2 -2
- package/dist/boilerplates/@batijs/solid/types/pages/star-wars/@id/+data.d.ts +1 -1
- package/dist/boilerplates/@batijs/solid/types/pages/star-wars/@id/+title.d.ts +1 -1
- package/dist/boilerplates/@batijs/solid/types/pages/star-wars/index/+data.d.ts +1 -1
- package/dist/boilerplates/@batijs/solid/types/pages/star-wars/index/+title.d.ts +1 -1
- package/dist/boilerplates/@batijs/solid-firebase-auth/files/pages/login/+Page.tsx +43 -43
- package/dist/boilerplates/@batijs/solid-telefunc/files/pages/todo/+Page.tsx +1 -1
- package/dist/boilerplates/@batijs/solid-trpc/files/pages/todo-trpc/+Page.tsx +1 -1
- package/dist/boilerplates/@batijs/tailwindcss/files/$package.json.js +7 -2
- package/dist/boilerplates/@batijs/tailwindcss/files/postcss.config.js +1 -1
- package/dist/boilerplates/@batijs/telefunc/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/trpc/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/trpc/files/trpc/client.ts +1 -1
- package/dist/boilerplates/@batijs/trpc/files/trpc/vite-plugin.ts +1 -1
- package/dist/boilerplates/@batijs/vercel/files/$package.json.js +1 -1
- package/dist/boilerplates/@batijs/vue/files/$package.json.js +4 -4
- package/dist/boilerplates/@batijs/vue/files/pages/index/+Page.vue +5 -11
- package/dist/boilerplates/@batijs/vue/files/pages/star-wars/@id/+Page.vue +1 -1
- package/dist/boilerplates/@batijs/vue/files/pages/star-wars/@id/+data.ts +1 -1
- package/dist/boilerplates/@batijs/vue/files/pages/star-wars/@id/+title.ts +1 -1
- package/dist/boilerplates/@batijs/vue/files/pages/star-wars/index/+Page.vue +1 -1
- package/dist/boilerplates/@batijs/vue/files/pages/star-wars/index/+data.ts +1 -1
- package/dist/boilerplates/@batijs/vue/files/pages/star-wars/index/+title.ts +1 -1
- package/dist/boilerplates/@batijs/vue/types/pages/star-wars/@id/+data.d.ts +1 -1
- package/dist/boilerplates/@batijs/vue/types/pages/star-wars/@id/+title.d.ts +1 -1
- package/dist/boilerplates/@batijs/vue/types/pages/star-wars/index/+data.d.ts +1 -1
- package/dist/boilerplates/@batijs/vue/types/pages/star-wars/index/+title.d.ts +1 -1
- package/dist/boilerplates/@batijs/vue-telefunc/files/pages/todo/+Page.vue +1 -1
- package/dist/boilerplates/@batijs/vue-trpc/files/pages/todo-trpc/+Page.vue +1 -1
- package/dist/index.js +256 -256
- package/package.json +5 -5
|
@@ -66,7 +66,7 @@ var require_package = __commonJS({
|
|
|
66
66
|
import { addDependency, loadAsJson } from "@batijs/core";
|
|
67
67
|
async function getPackageJson(props) {
|
|
68
68
|
const packageJson = await loadAsJson(props);
|
|
69
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
69
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
70
70
|
devDependencies: ["vite-plugin-compiled-react"],
|
|
71
71
|
dependencies: ["@compiled/react"]
|
|
72
72
|
});
|
|
@@ -73,7 +73,7 @@ async function getPackageJson(props) {
|
|
|
73
73
|
const packageJson = await loadAsJson(props);
|
|
74
74
|
packageJson.scripts["edgedb:generate-queries"] = "@edgedb/generate queries";
|
|
75
75
|
packageJson.scripts["edgedb:generate-edgeql-js"] = "@edgedb/generate edgeql-js";
|
|
76
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
76
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
77
77
|
devDependencies: ["@edgedb/generate"],
|
|
78
78
|
dependencies: ["edgedb"]
|
|
79
79
|
});
|
|
@@ -75,7 +75,7 @@ async function getPackageJson(props) {
|
|
|
75
75
|
precedence: 0
|
|
76
76
|
}
|
|
77
77
|
});
|
|
78
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
78
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
79
79
|
devDependencies: ["eslint", "@typescript-eslint/parser", "@typescript-eslint/eslint-plugin"]
|
|
80
80
|
});
|
|
81
81
|
}
|
|
@@ -108,7 +108,7 @@ async function getPackageJson(props) {
|
|
|
108
108
|
precedence: 20
|
|
109
109
|
}
|
|
110
110
|
});
|
|
111
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
111
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
112
112
|
devDependencies: [
|
|
113
113
|
"@types/express",
|
|
114
114
|
...props.meta.BATI.has("firebase-auth") ? ["@types/cookie-parser"] : [],
|
|
@@ -105,7 +105,7 @@ var require_package = __commonJS({
|
|
|
105
105
|
import { addDependency, loadAsJson } from "@batijs/core";
|
|
106
106
|
async function getPackageJson(props) {
|
|
107
107
|
const packageJson = await loadAsJson(props);
|
|
108
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
108
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
109
109
|
devDependencies: ["dotenv"],
|
|
110
110
|
dependencies: ["firebase", "firebase-admin", "firebaseui"]
|
|
111
111
|
});
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import "dotenv/config";
|
|
2
|
-
import {
|
|
2
|
+
import { applicationDefault, getApp, getApps, initializeApp, type App } from "firebase-admin/app";
|
|
3
3
|
|
|
4
4
|
let firebaseAdmin: App | undefined;
|
|
5
5
|
|
|
6
6
|
if (!getApps().length) {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
firebaseAdmin = initializeApp({
|
|
8
|
+
credential: applicationDefault(),
|
|
9
|
+
});
|
|
10
10
|
} else {
|
|
11
|
-
|
|
11
|
+
firebaseAdmin = getApp();
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
-
export { firebaseAdmin }
|
|
14
|
+
export { firebaseAdmin };
|
|
@@ -1,31 +1,31 @@
|
|
|
1
|
-
import
|
|
2
|
-
import
|
|
3
|
-
import * as firebaseui from "firebaseui"
|
|
1
|
+
import type { UserCredential } from "firebase/auth";
|
|
2
|
+
import firebase from "firebase/compat/app";
|
|
3
|
+
import * as firebaseui from "firebaseui";
|
|
4
4
|
|
|
5
|
-
type SessionLogin = (authResult: UserCredential) => Promise<void
|
|
5
|
+
type SessionLogin = (authResult: UserCredential) => Promise<void>;
|
|
6
6
|
|
|
7
7
|
function startFirebaseUI(ui: firebaseui.auth.AuthUI, sessionLogin?: SessionLogin) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
8
|
+
// Please read firebaseui docs at https://github.com/firebase/firebaseui-web
|
|
9
|
+
const uiCOnfig = {
|
|
10
|
+
callbacks: {
|
|
11
|
+
signInSuccessWithAuthResult(authResult: UserCredential) {
|
|
12
|
+
if (sessionLogin) {
|
|
13
|
+
sessionLogin(authResult);
|
|
14
|
+
// Don't redirect after firebase client successfully sign-in, let vike handle the rest.
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
return true;
|
|
18
|
+
},
|
|
19
|
+
},
|
|
20
|
+
signInFlow: "popup",
|
|
21
|
+
signInOptions: [
|
|
22
|
+
// Disable "Email enumeration protection" to be able to login with registered email address
|
|
23
|
+
// https://console.firebase.google.com/u/1/project/{project-id}/authentication/settings
|
|
24
|
+
firebase.auth.EmailAuthProvider.PROVIDER_ID,
|
|
25
|
+
firebase.auth.GoogleAuthProvider.PROVIDER_ID,
|
|
26
|
+
],
|
|
27
|
+
};
|
|
28
|
+
return ui.start("#firebaseui-auth-container", uiCOnfig);
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
export { startFirebaseUI }
|
|
31
|
+
export { startFirebaseUI };
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
// https://vike.dev/guard
|
|
2
|
-
import { redirect } from
|
|
3
|
-
import type { GuardAsync } from
|
|
2
|
+
import { redirect } from "vike/abort";
|
|
3
|
+
import type { GuardAsync } from "vike/types";
|
|
4
4
|
|
|
5
5
|
const guard: GuardAsync = async (pageContext): ReturnType<GuardAsync> => {
|
|
6
6
|
if (pageContext.user) {
|
|
7
|
-
throw redirect(
|
|
7
|
+
throw redirect("/");
|
|
8
8
|
}
|
|
9
|
-
}
|
|
9
|
+
};
|
|
10
10
|
|
|
11
|
-
export { guard }
|
|
11
|
+
export { guard };
|
|
@@ -109,7 +109,7 @@ async function getPackageJson(props) {
|
|
|
109
109
|
precedence: 20
|
|
110
110
|
}
|
|
111
111
|
});
|
|
112
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
112
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
113
113
|
devDependencies: [
|
|
114
114
|
"@types/serve-static",
|
|
115
115
|
...props.meta.BATI.has("auth0") ? ["@types/express", "dotenv"] : []
|
|
@@ -102,7 +102,7 @@ async function getPackageJson(props) {
|
|
|
102
102
|
if (packageJson.scripts.preview) {
|
|
103
103
|
delete packageJson.scripts.preview;
|
|
104
104
|
}
|
|
105
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
105
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
106
106
|
devDependencies: ["@hattip/vite", "@hattip/adapter-node"],
|
|
107
107
|
dependencies: [
|
|
108
108
|
"@hattip/core",
|
|
@@ -65,7 +65,7 @@ var require_package = __commonJS({
|
|
|
65
65
|
import { addDependency, loadAsJson } from "@batijs/core";
|
|
66
66
|
async function getPackageJson(props) {
|
|
67
67
|
const packageJson = await loadAsJson(props);
|
|
68
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
68
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
69
69
|
devDependencies: ["prettier", "eslint-config-prettier"]
|
|
70
70
|
});
|
|
71
71
|
}
|
|
@@ -68,7 +68,7 @@ async function getPackageJson(props) {
|
|
|
68
68
|
const packageJson = await loadAsJson(props);
|
|
69
69
|
packageJson.scripts["prisma:studio"] = "prisma studio";
|
|
70
70
|
packageJson.scripts["prisma:generate"] = "prisma generate";
|
|
71
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
71
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
72
72
|
devDependencies: ["prisma"],
|
|
73
73
|
dependencies: ["@prisma/client"]
|
|
74
74
|
});
|
|
@@ -181,11 +181,11 @@ import { addDependency, loadAsJson } from "@batijs/core";
|
|
|
181
181
|
async function getPackageJson(props) {
|
|
182
182
|
const packageJson = await loadAsJson(props);
|
|
183
183
|
if (props.meta.BATI.has("eslint")) {
|
|
184
|
-
addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
184
|
+
addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
185
185
|
devDependencies: ["eslint-plugin-react"]
|
|
186
186
|
});
|
|
187
187
|
}
|
|
188
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
188
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
189
189
|
devDependencies: ["vite", "@types/react", "@types/react-dom"],
|
|
190
190
|
dependencies: ["@vitejs/plugin-react", "cross-fetch", "react", "react-dom", "vike", "vike-react"]
|
|
191
191
|
});
|
|
@@ -3,7 +3,7 @@ import "./style.css";
|
|
|
3
3
|
import "./tailwind.css";
|
|
4
4
|
import React from "react";
|
|
5
5
|
import logoUrl from "../assets/logo.svg";
|
|
6
|
-
import { Link } from "../components/Link";
|
|
6
|
+
import { Link } from "../components/Link.js";
|
|
7
7
|
|
|
8
8
|
export default function LayoutDefault({ children }: { children: React.ReactNode }) {
|
|
9
9
|
return (
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import vikeReact from "vike-react/config";
|
|
2
2
|
import type { Config } from "vike/types";
|
|
3
|
-
import Head from "../layouts/HeadDefault";
|
|
4
|
-
import Layout from "../layouts/LayoutDefault";
|
|
3
|
+
import Head from "../layouts/HeadDefault.js";
|
|
4
|
+
import Layout from "../layouts/LayoutDefault.js";
|
|
5
5
|
|
|
6
6
|
// Default config (can be overridden by pages)
|
|
7
7
|
export default {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import Head from "../layouts/HeadDefault";
|
|
2
|
-
import Layout from "../layouts/LayoutDefault";
|
|
1
|
+
import Head from "../layouts/HeadDefault.js";
|
|
2
|
+
import Layout from "../layouts/LayoutDefault.js";
|
|
3
3
|
declare const _default: {
|
|
4
4
|
Layout: typeof Layout;
|
|
5
5
|
Head: typeof Head;
|
|
@@ -46,7 +46,7 @@ declare const _default: {
|
|
|
46
46
|
env: {
|
|
47
47
|
config: true;
|
|
48
48
|
};
|
|
49
|
-
effect: typeof import("vike-react/dist/renderer/ssrEffect").ssrEffect;
|
|
49
|
+
effect: typeof import("node_modules/vike-react/dist/renderer/ssrEffect.js").ssrEffect;
|
|
50
50
|
};
|
|
51
51
|
stream: {
|
|
52
52
|
env: {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { PageContextServer } from "vike/types";
|
|
2
|
-
import type { MovieDetails } from "../types";
|
|
2
|
+
import type { MovieDetails } from "../types.js";
|
|
3
3
|
export type Data = Awaited<ReturnType<typeof data>>;
|
|
4
4
|
export declare const data: (pageContext: PageContextServer) => Promise<MovieDetails>;
|
|
@@ -1,52 +1,52 @@
|
|
|
1
|
-
import "firebaseui/dist/firebaseui.css"
|
|
2
|
-
import
|
|
3
|
-
import {
|
|
4
|
-
import * as firebaseui from "firebaseui"
|
|
5
|
-
import {
|
|
6
|
-
import { reload } from "vike/client/router"
|
|
1
|
+
import "firebaseui/dist/firebaseui.css";
|
|
2
|
+
import { startFirebaseUI } from "@batijs/firebase-auth/libs/firebaseUI";
|
|
3
|
+
import { getAuth, type UserCredential } from "firebase/auth";
|
|
4
|
+
import * as firebaseui from "firebaseui";
|
|
5
|
+
import React, { useEffect, useState } from "react";
|
|
6
|
+
import { reload } from "vike/client/router";
|
|
7
7
|
|
|
8
|
-
export default Page
|
|
8
|
+
export default Page;
|
|
9
9
|
|
|
10
10
|
function Page() {
|
|
11
|
-
|
|
11
|
+
const [error, setError] = useState("");
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
13
|
+
async function sessionLogin(authResult: UserCredential) {
|
|
14
|
+
const idToken = (await authResult.user.getIdToken()) || "";
|
|
15
|
+
try {
|
|
16
|
+
const response = await fetch("/api/sessionLogin", {
|
|
17
|
+
method: "POST",
|
|
18
|
+
body: JSON.stringify({ idToken }),
|
|
19
|
+
headers: {
|
|
20
|
+
"Content-Type": "application/json",
|
|
21
|
+
},
|
|
22
|
+
});
|
|
23
|
+
if (response.ok) {
|
|
24
|
+
await reload();
|
|
25
|
+
} else {
|
|
26
|
+
setError(response.statusText);
|
|
27
|
+
}
|
|
28
|
+
await getAuth().signOut();
|
|
29
|
+
} catch (err) {
|
|
30
|
+
console.log("error :", err);
|
|
32
31
|
}
|
|
33
|
-
|
|
34
|
-
useEffect(() => {
|
|
35
|
-
const ui = firebaseui.auth.AuthUI.getInstance() || new firebaseui.auth.AuthUI(getAuth())
|
|
36
|
-
if (!error) {
|
|
37
|
-
startFirebaseUI(ui, sessionLogin)
|
|
38
|
-
}
|
|
39
|
-
}, [error])
|
|
32
|
+
}
|
|
40
33
|
|
|
41
|
-
|
|
34
|
+
useEffect(() => {
|
|
35
|
+
const ui = firebaseui.auth.AuthUI.getInstance() || new firebaseui.auth.AuthUI(getAuth());
|
|
36
|
+
if (!error) {
|
|
37
|
+
startFirebaseUI(ui, sessionLogin);
|
|
38
|
+
}
|
|
39
|
+
}, [error]);
|
|
40
|
+
|
|
41
|
+
return (
|
|
42
|
+
<>
|
|
43
|
+
<div id="firebaseui-auth-container"></div>
|
|
44
|
+
{error && (
|
|
42
45
|
<>
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
<>
|
|
46
|
-
<div style={{ color: "red" }}>There is an error occured : {error}</div>
|
|
47
|
-
<button onClick={() => setError("")}>Try Again</button>
|
|
48
|
-
</>
|
|
49
|
-
)}
|
|
46
|
+
<div style={{ color: "red" }}>There is an error occured : {error}</div>
|
|
47
|
+
<button onClick={() => setError("")}>Try Again</button>
|
|
50
48
|
</>
|
|
51
|
-
|
|
52
|
-
|
|
49
|
+
)}
|
|
50
|
+
</>
|
|
51
|
+
);
|
|
52
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useState } from "react";
|
|
2
2
|
import { useData } from "vike-react/useData";
|
|
3
|
-
import type { Data } from "./+data";
|
|
4
|
-
import { TodoList } from "./TodoList";
|
|
3
|
+
import type { Data } from "./+data.js";
|
|
4
|
+
import { TodoList } from "./TodoList.js";
|
|
5
5
|
|
|
6
6
|
export default function Page() {
|
|
7
7
|
const todoItemsInitial = useData<Data>();
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import React, { useState } from "react";
|
|
2
2
|
import { useData } from "vike-react/useData";
|
|
3
|
-
import type { Data } from "./+data";
|
|
4
|
-
import { TodoList } from "./TodoList";
|
|
3
|
+
import type { Data } from "./+data.js";
|
|
4
|
+
import { TodoList } from "./TodoList.js";
|
|
5
5
|
|
|
6
6
|
export default function Page() {
|
|
7
7
|
const todoItemsInitial = useData<Data>();
|
|
@@ -49,7 +49,7 @@ var require_package = __commonJS({
|
|
|
49
49
|
tailwindcss: "^3.4.3",
|
|
50
50
|
typescript: "^5.4.5",
|
|
51
51
|
vike: "^0.4.168",
|
|
52
|
-
"vike-solid": "^0.4.
|
|
52
|
+
"vike-solid": "^0.4.5",
|
|
53
53
|
vite: "^5.2.8",
|
|
54
54
|
"vite-plugin-solid": "^2.10.2"
|
|
55
55
|
},
|
|
@@ -175,11 +175,11 @@ import { addDependency, loadAsJson } from "@batijs/core";
|
|
|
175
175
|
async function getPackageJson(props) {
|
|
176
176
|
const packageJson = await loadAsJson(props);
|
|
177
177
|
if (props.meta.BATI.has("eslint")) {
|
|
178
|
-
addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
178
|
+
addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
179
179
|
devDependencies: ["eslint-plugin-solid"]
|
|
180
180
|
});
|
|
181
181
|
}
|
|
182
|
-
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)), {
|
|
182
|
+
return addDependency(packageJson, await Promise.resolve().then(() => __toESM(require_package(), 1)).then((x) => x.default), {
|
|
183
183
|
devDependencies: ["vite"],
|
|
184
184
|
dependencies: ["cross-fetch", "solid-js", "vike-solid", "vike"]
|
|
185
185
|
});
|
|
@@ -4,7 +4,7 @@ import { usePageContext } from "vike-solid/usePageContext";
|
|
|
4
4
|
export function Link(props: { href: string; children: string }) {
|
|
5
5
|
const pageContext = usePageContext();
|
|
6
6
|
const isActive = createMemo(() =>
|
|
7
|
-
props.href === "/" ? pageContext.urlPathname === props.href : pageContext.urlPathname.startsWith(props.href)
|
|
7
|
+
props.href === "/" ? pageContext.urlPathname === props.href : pageContext.urlPathname.startsWith(props.href),
|
|
8
8
|
);
|
|
9
9
|
return (
|
|
10
10
|
<a href={props.href} class={isActive() ? "is-active" : undefined}>
|
|
@@ -3,7 +3,7 @@ import "./style.css";
|
|
|
3
3
|
import "./tailwind.css";
|
|
4
4
|
import type { JSX } from "solid-js";
|
|
5
5
|
import logoUrl from "../assets/logo.svg";
|
|
6
|
-
import { Link } from "../components/Link";
|
|
6
|
+
import { Link } from "../components/Link.js";
|
|
7
7
|
|
|
8
8
|
export default function LayoutDefault(props: { children?: JSX.Element }) {
|
|
9
9
|
return (
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import vikeSolid from "vike-solid/config";
|
|
2
2
|
import type { Config } from "vike/types";
|
|
3
|
-
import Head from "../layouts/HeadDefault";
|
|
4
|
-
import Layout from "../layouts/LayoutDefault";
|
|
3
|
+
import Head from "../layouts/HeadDefault.js";
|
|
4
|
+
import Layout from "../layouts/LayoutDefault.js";
|
|
5
5
|
|
|
6
6
|
// Default config (can be overridden by pages)
|
|
7
7
|
export default {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import vikeSolid from "vike-solid/config";
|
|
2
|
-
import Head from "../layouts/HeadDefault";
|
|
3
|
-
import Layout from "../layouts/LayoutDefault";
|
|
2
|
+
import Head from "../layouts/HeadDefault.js";
|
|
3
|
+
import Layout from "../layouts/LayoutDefault.js";
|
|
4
4
|
declare const _default: {
|
|
5
5
|
Layout: typeof Layout;
|
|
6
6
|
Head: typeof Head;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { PageContextServer } from "vike/types";
|
|
2
|
-
import type { MovieDetails } from "../types";
|
|
2
|
+
import type { MovieDetails } from "../types.js";
|
|
3
3
|
export type Data = Awaited<ReturnType<typeof data>>;
|
|
4
4
|
export declare const data: (pageContext: PageContextServer) => Promise<MovieDetails>;
|