create-plasmic-app 0.0.64 → 0.0.66

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.
Files changed (66) hide show
  1. package/cpa-out/gatsby-codegen-js/package.json +4 -5
  2. package/cpa-out/gatsby-codegen-js/plasmic.json +2 -2
  3. package/cpa-out/gatsby-codegen-js/src/components/plasmic/create_plasmic_app/PlasmicHomepage.jsx +3 -1
  4. package/cpa-out/gatsby-codegen-js/src/pages/index.jsx +1 -1
  5. package/cpa-out/gatsby-codegen-ts/package.json +8 -9
  6. package/cpa-out/gatsby-codegen-ts/plasmic.json +2 -2
  7. package/cpa-out/gatsby-codegen-ts/src/components/plasmic/create_plasmic_app/PlasmicHomepage.tsx +8 -3
  8. package/cpa-out/gatsby-codegen-ts/src/pages/index.tsx +1 -1
  9. package/cpa-out/nextjs-app-loader-js/app/[[...catchall]]/page.jsx +2 -2
  10. package/cpa-out/nextjs-app-loader-js/app/api/hello/route.js +3 -0
  11. package/cpa-out/nextjs-app-loader-js/app/layout.js +5 -5
  12. package/cpa-out/nextjs-app-loader-js/app/plasmic-host/page.jsx +1 -1
  13. package/cpa-out/nextjs-app-loader-js/package.json +4 -5
  14. package/cpa-out/nextjs-app-loader-js/plasmic-init-client.jsx +4 -4
  15. package/cpa-out/nextjs-app-loader-ts/app/[[...catchall]]/page.tsx +2 -2
  16. package/cpa-out/nextjs-app-loader-ts/app/api/hello/route.ts +3 -0
  17. package/cpa-out/nextjs-app-loader-ts/app/layout.tsx +5 -5
  18. package/cpa-out/nextjs-app-loader-ts/app/plasmic-host/page.tsx +1 -1
  19. package/cpa-out/nextjs-app-loader-ts/package.json +7 -8
  20. package/cpa-out/nextjs-app-loader-ts/plasmic-init-client.tsx +4 -4
  21. package/cpa-out/nextjs-app-loader-ts/tsconfig.json +0 -1
  22. package/cpa-out/nextjs-pages-codegen-js/components/plasmic/create_plasmic_app/PlasmicHomepage.jsx +12 -1
  23. package/cpa-out/nextjs-pages-codegen-js/package.json +5 -7
  24. package/cpa-out/nextjs-pages-codegen-js/pages/index.jsx +1 -1
  25. package/cpa-out/nextjs-pages-codegen-js/pages/plasmic-host.jsx +1 -1
  26. package/cpa-out/nextjs-pages-codegen-js/plasmic.json +2 -2
  27. package/cpa-out/nextjs-pages-codegen-ts/components/plasmic/create_plasmic_app/PlasmicHomepage.tsx +12 -2
  28. package/cpa-out/nextjs-pages-codegen-ts/package.json +8 -10
  29. package/cpa-out/nextjs-pages-codegen-ts/pages/index.tsx +1 -1
  30. package/cpa-out/nextjs-pages-codegen-ts/pages/plasmic-host.tsx +1 -1
  31. package/cpa-out/nextjs-pages-codegen-ts/plasmic.json +2 -2
  32. package/cpa-out/nextjs-pages-codegen-ts/tsconfig.json +0 -1
  33. package/cpa-out/nextjs-pages-loader-js/package.json +4 -5
  34. package/cpa-out/nextjs-pages-loader-js/pages/[[...catchall]].jsx +1 -1
  35. package/cpa-out/nextjs-pages-loader-js/pages/plasmic-host.jsx +1 -1
  36. package/cpa-out/nextjs-pages-loader-ts/package.json +7 -8
  37. package/cpa-out/nextjs-pages-loader-ts/pages/[[...catchall]].tsx +1 -1
  38. package/cpa-out/nextjs-pages-loader-ts/pages/plasmic-host.tsx +1 -1
  39. package/cpa-out/nextjs-pages-loader-ts/tsconfig.json +0 -1
  40. package/cpa-out/react-codegen-js/package.json +2 -3
  41. package/cpa-out/react-codegen-js/plasmic.json +2 -2
  42. package/cpa-out/react-codegen-js/src/components/plasmic/create_plasmic_app/PlasmicHomepage.jsx +3 -1
  43. package/cpa-out/react-codegen-ts/package.json +2 -3
  44. package/cpa-out/react-codegen-ts/plasmic.json +2 -2
  45. package/cpa-out/react-codegen-ts/src/components/plasmic/create_plasmic_app/PlasmicHomepage.tsx +3 -2
  46. package/dist/gatsby/template.js +1 -1
  47. package/dist/nextjs/templates/app-loader/catchall-page.js +2 -2
  48. package/dist/nextjs/templates/app-loader/plasmic-host.js +1 -1
  49. package/dist/nextjs/templates/app-loader/plasmic-init-client.js +4 -4
  50. package/dist/nextjs/templates/pages-codegen/plasmic-host.js +1 -1
  51. package/dist/nextjs/templates/pages-loader/catchall-page.js +1 -1
  52. package/dist/nextjs/templates/pages-loader/plasmic-host.js +1 -1
  53. package/dist/utils/codegen.js +1 -2
  54. package/package.json +2 -2
  55. package/src/gatsby/template.ts +1 -1
  56. package/src/nextjs/templates/app-loader/catchall-page.ts +2 -2
  57. package/src/nextjs/templates/app-loader/plasmic-host.ts +1 -1
  58. package/src/nextjs/templates/app-loader/plasmic-init-client.ts +4 -4
  59. package/src/nextjs/templates/pages-codegen/plasmic-host.ts +1 -1
  60. package/src/nextjs/templates/pages-loader/catchall-page.ts +1 -1
  61. package/src/nextjs/templates/pages-loader/plasmic-host.ts +1 -1
  62. package/src/utils/codegen.ts +1 -4
  63. package/cpa-out/nextjs-app-loader-js/app/head.js +0 -10
  64. package/cpa-out/nextjs-app-loader-js/pages/api/hello.js +0 -5
  65. package/cpa-out/nextjs-app-loader-ts/app/head.tsx +0 -10
  66. package/cpa-out/nextjs-app-loader-ts/pages/api/hello.ts +0 -13
@@ -14,11 +14,10 @@
14
14
  "clean": "gatsby clean"
15
15
  },
16
16
  "dependencies": {
17
- "@plasmicapp/cli": "^0.1.205",
18
- "@plasmicapp/host": "^1.0.100",
19
- "@plasmicapp/react-web": "^0.2.150",
20
- "gatsby": "^5.5.0",
21
- "gatsby-plugin-react-helmet": "^6.5.0",
17
+ "@plasmicapp/cli": "^0.1.222",
18
+ "@plasmicapp/react-web": "^0.2.167",
19
+ "gatsby": "^5.7.0",
20
+ "gatsby-plugin-react-helmet": "^6.7.0",
22
21
  "react": "^18.2.0",
23
22
  "react-dom": "^18.2.0",
24
23
  "react-helmet": "^6.1.0"
@@ -74,6 +74,6 @@
74
74
  "gatsbyConfig": {
75
75
  "pagesDir": "../pages"
76
76
  },
77
- "cliVersion": "0.1.205",
78
- "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.205/dist/plasmic.schema.json"
77
+ "cliVersion": "0.1.222",
78
+ "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.222/dist/plasmic.schema.json"
79
79
  }
@@ -10,7 +10,7 @@
10
10
  // Component: 6uuAAE1jiCew
11
11
  import * as React from "react";
12
12
  import * as p from "@plasmicapp/react-web";
13
- import * as ph from "@plasmicapp/host";
13
+ import * as ph from "@plasmicapp/react-web/lib/host";
14
14
  import {
15
15
  hasVariant,
16
16
  classNames,
@@ -48,6 +48,8 @@ function PlasmicHomepage__RenderFunc(props) {
48
48
  ...args,
49
49
  ...variants
50
50
  };
51
+ const refsRef = React.useRef({});
52
+ const $refs = refsRef.current;
51
53
  const currentUser = p.useCurrentUser?.() || {};
52
54
  const [$queries, setDollarQueries] = React.useState({});
53
55
  const globalVariants = ensureGlobalVariants({
@@ -1,7 +1,7 @@
1
1
  // This is a skeleton starter React page generated by Plasmic.
2
2
  // This file is owned by you, feel free to edit as you see fit.
3
3
  import * as React from "react";
4
- import * as ph from "@plasmicapp/host";
4
+ import * as ph from "@plasmicapp/react-web/lib/host";
5
5
  import {
6
6
  PlasmicHomepage,
7
7
  Head
@@ -15,20 +15,19 @@
15
15
  "typecheck": "tsc --noEmit"
16
16
  },
17
17
  "dependencies": {
18
- "@plasmicapp/cli": "^0.1.205",
19
- "@plasmicapp/host": "^1.0.100",
20
- "@plasmicapp/react-web": "^0.2.150",
21
- "gatsby": "^5.5.0",
22
- "gatsby-plugin-react-helmet": "^6.5.0",
18
+ "@plasmicapp/cli": "^0.1.222",
19
+ "@plasmicapp/react-web": "^0.2.167",
20
+ "gatsby": "^5.7.0",
21
+ "gatsby-plugin-react-helmet": "^6.7.0",
23
22
  "react": "^18.2.0",
24
23
  "react-dom": "^18.2.0",
25
24
  "react-helmet": "^6.1.0"
26
25
  },
27
26
  "devDependencies": {
28
- "@types/node": "^18.11.18",
29
- "@types/react": "^18.0.27",
30
- "@types/react-dom": "^18.0.10",
27
+ "@types/node": "^18.15.0",
28
+ "@types/react": "^18.0.28",
29
+ "@types/react-dom": "^18.0.11",
31
30
  "@types/react-helmet": "^6.1.6",
32
- "typescript": "^4.9.4"
31
+ "typescript": "^4.9.5"
33
32
  }
34
33
  }
@@ -74,6 +74,6 @@
74
74
  "gatsbyConfig": {
75
75
  "pagesDir": "../pages"
76
76
  },
77
- "cliVersion": "0.1.205",
78
- "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.205/dist/plasmic.schema.json"
77
+ "cliVersion": "0.1.222",
78
+ "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.222/dist/plasmic.schema.json"
79
79
  }
@@ -12,10 +12,14 @@
12
12
  // Component: 6uuAAE1jiCew
13
13
  import * as React from "react";
14
14
 
15
- import { Link, GatsbyLinkProps as LinkProps } from "gatsby";
15
+ import {
16
+ Link,
17
+ GatsbyLinkProps as LinkProps,
18
+ navigate as __gatsbyNavigate
19
+ } from "gatsby";
16
20
 
17
21
  import * as p from "@plasmicapp/react-web";
18
- import * as ph from "@plasmicapp/host";
22
+ import * as ph from "@plasmicapp/react-web/lib/host";
19
23
 
20
24
  import {
21
25
  hasVariant,
@@ -89,9 +93,10 @@ function PlasmicHomepage__RenderFunc(props: {
89
93
  ...args,
90
94
  ...variants
91
95
  };
96
+ const refsRef = React.useRef({});
97
+ const $refs = refsRef.current;
92
98
 
93
99
  const currentUser = p.useCurrentUser?.() || {};
94
-
95
100
  const [$queries, setDollarQueries] = React.useState({});
96
101
 
97
102
  const globalVariants = ensureGlobalVariants({
@@ -1,7 +1,7 @@
1
1
  // This is a skeleton starter React page generated by Plasmic.
2
2
  // This file is owned by you, feel free to edit as you see fit.
3
3
  import * as React from "react";
4
- import * as ph from "@plasmicapp/host";
4
+ import * as ph from "@plasmicapp/react-web/lib/host";
5
5
 
6
6
  import { ScreenVariantProvider } from "../components/plasmic/create_plasmic_app/PlasmicGlobalVariant__Screen";
7
7
  import {
@@ -1,7 +1,7 @@
1
1
  import { PlasmicComponent } from "@plasmicapp/loader-nextjs";
2
2
  import { notFound } from "next/navigation";
3
- import { PLASMIC } from "plasmic-init";
4
- import { ClientPlasmicRootProvider } from "plasmic-init-client";
3
+ import { PLASMIC } from "@/plasmic-init";
4
+ import { ClientPlasmicRootProvider } from "@/plasmic-init-client";
5
5
 
6
6
  // Use revalidate if you want incremental static regeneration
7
7
  export const revalidate = 60;
@@ -0,0 +1,3 @@
1
+ export async function GET(request) {
2
+ return new Response('Hello, Next.js!')
3
+ }
@@ -1,13 +1,13 @@
1
1
  import './globals.css'
2
2
 
3
+ export const metadata = {
4
+ title: 'Create Next App',
5
+ description: 'Generated by create next app',
6
+ }
7
+
3
8
  export default function RootLayout({ children }) {
4
9
  return (
5
10
  <html lang="en">
6
- {/*
7
- <head /> will contain the components returned by the nearest parent
8
- head.js. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
9
- */}
10
- <head />
11
11
  <body>{children}</body>
12
12
  </html>
13
13
  )
@@ -1,5 +1,5 @@
1
1
  import { PlasmicCanvasHost } from "@plasmicapp/loader-nextjs";
2
- import "plasmic-init-client";
2
+ import "@/plasmic-init-client";
3
3
 
4
4
  export default function PlasmicHost() {
5
5
  return <PlasmicCanvasHost />;
@@ -9,11 +9,10 @@
9
9
  "lint": "next lint"
10
10
  },
11
11
  "dependencies": {
12
- "@next/font": "13.1.6",
13
- "@plasmicapp/loader-nextjs": "^1.0.224",
14
- "eslint": "8.33.0",
15
- "eslint-config-next": "13.1.6",
16
- "next": "13.1.6",
12
+ "@plasmicapp/loader-nextjs": "^1.0.233",
13
+ "eslint": "8.35.0",
14
+ "eslint-config-next": "13.2.3",
15
+ "next": "13.2.3",
17
16
  "react": "18.2.0",
18
17
  "react-dom": "18.2.0"
19
18
  }
@@ -1,7 +1,7 @@
1
1
  "use client";
2
2
 
3
3
  import { PlasmicRootProvider } from "@plasmicapp/loader-nextjs";
4
- import { PLASMIC } from "plasmic-init";
4
+ import { PLASMIC } from "@/plasmic-init";
5
5
 
6
6
  // You can register any code components that you want to use here; see
7
7
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -22,7 +22,7 @@ import { PLASMIC } from "plasmic-init";
22
22
  * In a Server Component like app/<your-path>/path.tsx, rendering the following would not work:
23
23
  *
24
24
  * ```tsx
25
- * import { PLASMIC } from "plasmic-init";
25
+ * import { PLASMIC } from "@/plasmic-init";
26
26
  * import { PlasmicRootProvider } from "plasmicapp/loader-nextjs";
27
27
  * export default function MyPage() {
28
28
  * const prefetchedData = await PLASMIC.fetchComponentData("YourPage");
@@ -42,8 +42,8 @@ import { PLASMIC } from "plasmic-init";
42
42
  * while allowing your Server Component to pass in prefetched data and other serializable props:
43
43
  *
44
44
  * ```tsx
45
- * import { PLASMIC } from "plasmic-init";
46
- * import { ClientPlasmicRootProvider } from "plasmic-init-client"; // changed
45
+ * import { PLASMIC } from "@/plasmic-init";
46
+ * import { ClientPlasmicRootProvider } from "@/plasmic-init-client"; // changed
47
47
  * export default function MyPage() {
48
48
  * const prefetchedData = await PLASMIC.fetchComponentData("YourPage");
49
49
  * return (
@@ -1,7 +1,7 @@
1
1
  import { PlasmicComponent } from "@plasmicapp/loader-nextjs";
2
2
  import { notFound } from "next/navigation";
3
- import { PLASMIC } from "plasmic-init";
4
- import { ClientPlasmicRootProvider } from "plasmic-init-client";
3
+ import { PLASMIC } from "@/plasmic-init";
4
+ import { ClientPlasmicRootProvider } from "@/plasmic-init-client";
5
5
 
6
6
  // Use revalidate if you want incremental static regeneration
7
7
  export const revalidate = 60;
@@ -0,0 +1,3 @@
1
+ export async function GET(request: Request) {
2
+ return new Response('Hello, Next.js!')
3
+ }
@@ -1,5 +1,10 @@
1
1
  import './globals.css'
2
2
 
3
+ export const metadata = {
4
+ title: 'Create Next App',
5
+ description: 'Generated by create next app',
6
+ }
7
+
3
8
  export default function RootLayout({
4
9
  children,
5
10
  }: {
@@ -7,11 +12,6 @@ export default function RootLayout({
7
12
  }) {
8
13
  return (
9
14
  <html lang="en">
10
- {/*
11
- <head /> will contain the components returned by the nearest parent
12
- head.tsx. Find out more at https://beta.nextjs.org/docs/api-reference/file-conventions/head
13
- */}
14
- <head />
15
15
  <body>{children}</body>
16
16
  </html>
17
17
  )
@@ -1,5 +1,5 @@
1
1
  import { PlasmicCanvasHost } from "@plasmicapp/loader-nextjs";
2
- import "plasmic-init-client";
2
+ import "@/plasmic-init-client";
3
3
 
4
4
  export default function PlasmicHost() {
5
5
  return <PlasmicCanvasHost />;
@@ -9,14 +9,13 @@
9
9
  "lint": "next lint"
10
10
  },
11
11
  "dependencies": {
12
- "@next/font": "13.1.6",
13
- "@plasmicapp/loader-nextjs": "^1.0.224",
14
- "@types/node": "18.11.18",
15
- "@types/react": "18.0.27",
16
- "@types/react-dom": "18.0.10",
17
- "eslint": "8.33.0",
18
- "eslint-config-next": "13.1.6",
19
- "next": "13.1.6",
12
+ "@plasmicapp/loader-nextjs": "^1.0.233",
13
+ "@types/node": "18.14.2",
14
+ "@types/react": "18.0.28",
15
+ "@types/react-dom": "18.0.11",
16
+ "eslint": "8.35.0",
17
+ "eslint-config-next": "13.2.3",
18
+ "next": "13.2.3",
20
19
  "react": "18.2.0",
21
20
  "react-dom": "18.2.0",
22
21
  "typescript": "4.9.5"
@@ -1,7 +1,7 @@
1
1
  "use client";
2
2
 
3
3
  import { PlasmicRootProvider } from "@plasmicapp/loader-nextjs";
4
- import { PLASMIC } from "plasmic-init";
4
+ import { PLASMIC } from "@/plasmic-init";
5
5
 
6
6
  // You can register any code components that you want to use here; see
7
7
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -22,7 +22,7 @@ import { PLASMIC } from "plasmic-init";
22
22
  * In a Server Component like app/<your-path>/path.tsx, rendering the following would not work:
23
23
  *
24
24
  * ```tsx
25
- * import { PLASMIC } from "plasmic-init";
25
+ * import { PLASMIC } from "@/plasmic-init";
26
26
  * import { PlasmicRootProvider } from "plasmicapp/loader-nextjs";
27
27
  * export default function MyPage() {
28
28
  * const prefetchedData = await PLASMIC.fetchComponentData("YourPage");
@@ -42,8 +42,8 @@ import { PLASMIC } from "plasmic-init";
42
42
  * while allowing your Server Component to pass in prefetched data and other serializable props:
43
43
  *
44
44
  * ```tsx
45
- * import { PLASMIC } from "plasmic-init";
46
- * import { ClientPlasmicRootProvider } from "plasmic-init-client"; // changed
45
+ * import { PLASMIC } from "@/plasmic-init";
46
+ * import { ClientPlasmicRootProvider } from "@/plasmic-init-client"; // changed
47
47
  * export default function MyPage() {
48
48
  * const prefetchedData = await PLASMIC.fetchComponentData("YourPage");
49
49
  * return (
@@ -19,7 +19,6 @@
19
19
  "name": "next"
20
20
  }
21
21
  ],
22
- "baseUrl": ".",
23
22
  "paths": {
24
23
  "@/*": ["./*"]
25
24
  }
@@ -10,8 +10,9 @@
10
10
  // Component: 6uuAAE1jiCew
11
11
  import * as React from "react";
12
12
  import Head from "next/head";
13
+ import { useRouter } from "next/router";
13
14
  import * as p from "@plasmicapp/react-web";
14
- import * as ph from "@plasmicapp/host";
15
+ import * as ph from "@plasmicapp/react-web/lib/host";
15
16
  import {
16
17
  hasVariant,
17
18
  classNames,
@@ -37,14 +38,24 @@ const __wrapUserPromise =
37
38
  return await promise;
38
39
  });
39
40
 
41
+ function useNextRouter() {
42
+ try {
43
+ return useRouter();
44
+ } catch {}
45
+ return undefined;
46
+ }
47
+
40
48
  function PlasmicHomepage__RenderFunc(props) {
41
49
  const { variants, overrides, forNode } = props;
50
+ const __nextRouter = useNextRouter();
42
51
  const $ctx = ph.useDataEnv?.() || {};
43
52
  const args = React.useMemo(() => Object.assign({}, props.args), [props.args]);
44
53
  const $props = {
45
54
  ...args,
46
55
  ...variants
47
56
  };
57
+ const refsRef = React.useRef({});
58
+ const $refs = refsRef.current;
48
59
  const currentUser = p.useCurrentUser?.() || {};
49
60
  const [$queries, setDollarQueries] = React.useState({});
50
61
  const globalVariants = ensureGlobalVariants({
@@ -9,13 +9,11 @@
9
9
  "lint": "next lint"
10
10
  },
11
11
  "dependencies": {
12
- "@next/font": "13.1.6",
13
- "@plasmicapp/cli": "^0.1.205",
14
- "@plasmicapp/host": "^1.0.100",
15
- "@plasmicapp/react-web": "^0.2.150",
16
- "eslint": "8.33.0",
17
- "eslint-config-next": "13.1.6",
18
- "next": "13.1.6",
12
+ "@plasmicapp/cli": "^0.1.222",
13
+ "@plasmicapp/react-web": "^0.2.167",
14
+ "eslint": "8.36.0",
15
+ "eslint-config-next": "13.2.4",
16
+ "next": "13.2.4",
19
17
  "react": "18.2.0",
20
18
  "react-dom": "18.2.0"
21
19
  }
@@ -1,7 +1,7 @@
1
1
  // This is a skeleton starter React page generated by Plasmic.
2
2
  // This file is owned by you, feel free to edit as you see fit.
3
3
  import * as React from "react";
4
- import * as ph from "@plasmicapp/host";
4
+ import * as ph from "@plasmicapp/react-web/lib/host";
5
5
  import { PlasmicHomepage } from "../components/plasmic/create_plasmic_app/PlasmicHomepage";
6
6
  import { useRouter } from "next/router";
7
7
 
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import { PlasmicCanvasHost, registerComponent } from '@plasmicapp/host';
2
+ import { PlasmicCanvasHost, registerComponent } from '@plasmicapp/react-web/lib/host';
3
3
 
4
4
  // You can register any code components that you want to use here; see
5
5
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -74,6 +74,6 @@
74
74
  "nextjsConfig": {
75
75
  "pagesDir": "../pages"
76
76
  },
77
- "cliVersion": "0.1.205",
78
- "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.205/dist/plasmic.schema.json"
77
+ "cliVersion": "0.1.222",
78
+ "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.222/dist/plasmic.schema.json"
79
79
  }
@@ -14,9 +14,10 @@ import * as React from "react";
14
14
 
15
15
  import Head from "next/head";
16
16
  import Link, { LinkProps } from "next/link";
17
+ import { useRouter } from "next/router";
17
18
 
18
19
  import * as p from "@plasmicapp/react-web";
19
- import * as ph from "@plasmicapp/host";
20
+ import * as ph from "@plasmicapp/react-web/lib/host";
20
21
 
21
22
  import {
22
23
  hasVariant,
@@ -68,6 +69,13 @@ const __wrapUserPromise =
68
69
  return await promise;
69
70
  });
70
71
 
72
+ function useNextRouter() {
73
+ try {
74
+ return useRouter();
75
+ } catch {}
76
+ return undefined;
77
+ }
78
+
71
79
  function PlasmicHomepage__RenderFunc(props: {
72
80
  variants: PlasmicHomepage__VariantsArgs;
73
81
  args: PlasmicHomepage__ArgsType;
@@ -76,6 +84,7 @@ function PlasmicHomepage__RenderFunc(props: {
76
84
  forNode?: string;
77
85
  }) {
78
86
  const { variants, overrides, forNode } = props;
87
+ const __nextRouter = useNextRouter();
79
88
 
80
89
  const $ctx = ph.useDataEnv?.() || {};
81
90
  const args = React.useMemo(() => Object.assign({}, props.args), [props.args]);
@@ -84,9 +93,10 @@ function PlasmicHomepage__RenderFunc(props: {
84
93
  ...args,
85
94
  ...variants
86
95
  };
96
+ const refsRef = React.useRef({});
97
+ const $refs = refsRef.current;
87
98
 
88
99
  const currentUser = p.useCurrentUser?.() || {};
89
-
90
100
  const [$queries, setDollarQueries] = React.useState({});
91
101
 
92
102
  const globalVariants = ensureGlobalVariants({
@@ -9,16 +9,14 @@
9
9
  "lint": "next lint"
10
10
  },
11
11
  "dependencies": {
12
- "@next/font": "13.1.6",
13
- "@plasmicapp/cli": "^0.1.205",
14
- "@plasmicapp/host": "^1.0.100",
15
- "@plasmicapp/react-web": "^0.2.150",
16
- "@types/node": "18.11.18",
17
- "@types/react": "18.0.27",
18
- "@types/react-dom": "18.0.10",
19
- "eslint": "8.33.0",
20
- "eslint-config-next": "13.1.6",
21
- "next": "13.1.6",
12
+ "@plasmicapp/cli": "^0.1.222",
13
+ "@plasmicapp/react-web": "^0.2.167",
14
+ "@types/node": "18.15.2",
15
+ "@types/react": "18.0.28",
16
+ "@types/react-dom": "18.0.11",
17
+ "eslint": "8.36.0",
18
+ "eslint-config-next": "13.2.4",
19
+ "next": "13.2.4",
22
20
  "react": "18.2.0",
23
21
  "react-dom": "18.2.0",
24
22
  "typescript": "4.9.5"
@@ -1,7 +1,7 @@
1
1
  // This is a skeleton starter React page generated by Plasmic.
2
2
  // This file is owned by you, feel free to edit as you see fit.
3
3
  import * as React from "react";
4
- import * as ph from "@plasmicapp/host";
4
+ import * as ph from "@plasmicapp/react-web/lib/host";
5
5
 
6
6
  import { ScreenVariantProvider } from "../components/plasmic/create_plasmic_app/PlasmicGlobalVariant__Screen";
7
7
  import { PlasmicHomepage } from "../components/plasmic/create_plasmic_app/PlasmicHomepage";
@@ -1,5 +1,5 @@
1
1
  import * as React from 'react';
2
- import { PlasmicCanvasHost, registerComponent } from '@plasmicapp/host';
2
+ import { PlasmicCanvasHost, registerComponent } from '@plasmicapp/react-web/lib/host';
3
3
 
4
4
  // You can register any code components that you want to use here; see
5
5
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -74,6 +74,6 @@
74
74
  "nextjsConfig": {
75
75
  "pagesDir": "../pages"
76
76
  },
77
- "cliVersion": "0.1.205",
78
- "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.205/dist/plasmic.schema.json"
77
+ "cliVersion": "0.1.222",
78
+ "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.222/dist/plasmic.schema.json"
79
79
  }
@@ -14,7 +14,6 @@
14
14
  "isolatedModules": true,
15
15
  "jsx": "preserve",
16
16
  "incremental": true,
17
- "baseUrl": ".",
18
17
  "paths": {
19
18
  "@/*": ["./*"]
20
19
  }
@@ -9,11 +9,10 @@
9
9
  "lint": "next lint"
10
10
  },
11
11
  "dependencies": {
12
- "@next/font": "13.1.6",
13
- "@plasmicapp/loader-nextjs": "^1.0.224",
14
- "eslint": "8.33.0",
15
- "eslint-config-next": "13.1.6",
16
- "next": "13.1.6",
12
+ "@plasmicapp/loader-nextjs": "^1.0.233",
13
+ "eslint": "8.35.0",
14
+ "eslint-config-next": "13.2.3",
15
+ "next": "13.2.3",
17
16
  "react": "18.2.0",
18
17
  "react-dom": "18.2.0"
19
18
  }
@@ -8,7 +8,7 @@ import {
8
8
 
9
9
  import Error from "next/error";
10
10
  import { useRouter } from "next/router";
11
- import { PLASMIC } from "plasmic-init";
11
+ import { PLASMIC } from "@/plasmic-init";
12
12
 
13
13
  export default function PlasmicLoaderPage(props) {
14
14
  const { plasmicData, queryCache } = props;
@@ -1,6 +1,6 @@
1
1
  import * as React from 'react';
2
2
  import { PlasmicCanvasHost } from '@plasmicapp/loader-nextjs';
3
- import { PLASMIC } from 'plasmic-init';
3
+ import { PLASMIC } from '@/plasmic-init';
4
4
 
5
5
  export default function PlasmicHost() {
6
6
  return PLASMIC && <PlasmicCanvasHost />;
@@ -9,14 +9,13 @@
9
9
  "lint": "next lint"
10
10
  },
11
11
  "dependencies": {
12
- "@next/font": "13.1.6",
13
- "@plasmicapp/loader-nextjs": "^1.0.224",
14
- "@types/node": "18.11.18",
15
- "@types/react": "18.0.27",
16
- "@types/react-dom": "18.0.10",
17
- "eslint": "8.33.0",
18
- "eslint-config-next": "13.1.6",
19
- "next": "13.1.6",
12
+ "@plasmicapp/loader-nextjs": "^1.0.233",
13
+ "@types/node": "18.14.2",
14
+ "@types/react": "18.0.28",
15
+ "@types/react-dom": "18.0.11",
16
+ "eslint": "8.35.0",
17
+ "eslint-config-next": "13.2.3",
18
+ "next": "13.2.3",
20
19
  "react": "18.2.0",
21
20
  "react-dom": "18.2.0",
22
21
  "typescript": "4.9.5"
@@ -9,7 +9,7 @@ import type { GetStaticPaths, GetStaticProps } from "next";
9
9
 
10
10
  import Error from "next/error";
11
11
  import { useRouter } from "next/router";
12
- import { PLASMIC } from "plasmic-init";
12
+ import { PLASMIC } from "@/plasmic-init";
13
13
 
14
14
  export default function PlasmicLoaderPage(props: {
15
15
  plasmicData?: ComponentRenderData;
@@ -1,6 +1,6 @@
1
1
  import * as React from 'react';
2
2
  import { PlasmicCanvasHost } from '@plasmicapp/loader-nextjs';
3
- import { PLASMIC } from 'plasmic-init';
3
+ import { PLASMIC } from '@/plasmic-init';
4
4
 
5
5
  export default function PlasmicHost() {
6
6
  return PLASMIC && <PlasmicCanvasHost />;
@@ -14,7 +14,6 @@
14
14
  "isolatedModules": true,
15
15
  "jsx": "preserve",
16
16
  "incremental": true,
17
- "baseUrl": ".",
18
17
  "paths": {
19
18
  "@/*": ["./*"]
20
19
  }
@@ -3,9 +3,8 @@
3
3
  "version": "0.1.0",
4
4
  "private": true,
5
5
  "dependencies": {
6
- "@plasmicapp/cli": "^0.1.205",
7
- "@plasmicapp/host": "^1.0.100",
8
- "@plasmicapp/react-web": "^0.2.150",
6
+ "@plasmicapp/cli": "^0.1.222",
7
+ "@plasmicapp/react-web": "^0.2.167",
9
8
  "@testing-library/jest-dom": "^5.14.1",
10
9
  "@testing-library/react": "^13.0.0",
11
10
  "@testing-library/user-event": "^13.2.1",
@@ -71,6 +71,6 @@
71
71
  ]
72
72
  },
73
73
  "wrapPagesWithGlobalContexts": true,
74
- "cliVersion": "0.1.205",
75
- "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.205/dist/plasmic.schema.json"
74
+ "cliVersion": "0.1.222",
75
+ "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.222/dist/plasmic.schema.json"
76
76
  }
@@ -10,7 +10,7 @@
10
10
  // Component: 6uuAAE1jiCew
11
11
  import * as React from "react";
12
12
  import * as p from "@plasmicapp/react-web";
13
- import * as ph from "@plasmicapp/host";
13
+ import * as ph from "@plasmicapp/react-web/lib/host";
14
14
  import {
15
15
  hasVariant,
16
16
  classNames,
@@ -44,6 +44,8 @@ function PlasmicHomepage__RenderFunc(props) {
44
44
  ...args,
45
45
  ...variants
46
46
  };
47
+ const refsRef = React.useRef({});
48
+ const $refs = refsRef.current;
47
49
  const currentUser = p.useCurrentUser?.() || {};
48
50
  const [$queries, setDollarQueries] = React.useState({});
49
51
  const globalVariants = ensureGlobalVariants({
@@ -3,9 +3,8 @@
3
3
  "version": "0.1.0",
4
4
  "private": true,
5
5
  "dependencies": {
6
- "@plasmicapp/cli": "^0.1.205",
7
- "@plasmicapp/host": "^1.0.100",
8
- "@plasmicapp/react-web": "^0.2.150",
6
+ "@plasmicapp/cli": "^0.1.222",
7
+ "@plasmicapp/react-web": "^0.2.167",
9
8
  "@testing-library/jest-dom": "^5.14.1",
10
9
  "@testing-library/react": "^13.0.0",
11
10
  "@testing-library/user-event": "^13.2.1",
@@ -71,6 +71,6 @@
71
71
  ]
72
72
  },
73
73
  "wrapPagesWithGlobalContexts": true,
74
- "cliVersion": "0.1.205",
75
- "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.205/dist/plasmic.schema.json"
74
+ "cliVersion": "0.1.222",
75
+ "$schema": "https://unpkg.com/@plasmicapp/cli@0.1.222/dist/plasmic.schema.json"
76
76
  }
@@ -13,7 +13,7 @@
13
13
  import * as React from "react";
14
14
 
15
15
  import * as p from "@plasmicapp/react-web";
16
- import * as ph from "@plasmicapp/host";
16
+ import * as ph from "@plasmicapp/react-web/lib/host";
17
17
 
18
18
  import {
19
19
  hasVariant,
@@ -83,9 +83,10 @@ function PlasmicHomepage__RenderFunc(props: {
83
83
  ...args,
84
84
  ...variants
85
85
  };
86
+ const refsRef = React.useRef({});
87
+ const $refs = refsRef.current;
86
88
 
87
89
  const currentUser = p.useCurrentUser?.() || {};
88
-
89
90
  const [$queries, setDollarQueries] = React.useState({});
90
91
 
91
92
  const globalVariants = ensureGlobalVariants({
@@ -114,7 +114,7 @@ export default function Host({ data }${(0, file_utils_1.ifTs)(jsOrTs, ": HostPro
114
114
  }
115
115
  else {
116
116
  return `import * as React from "react"
117
- import { PlasmicCanvasHost, registerComponent } from "@plasmicapp/host";
117
+ import { PlasmicCanvasHost, registerComponent } from "@plasmicapp/react-web/lib/host";
118
118
 
119
119
  // You can register any code components that you want to use here; see
120
120
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -5,8 +5,8 @@ const file_utils_1 = require("../../../utils/file-utils");
5
5
  function makeCatchallPage_app_loader(jsOrTs) {
6
6
  return `import { PlasmicComponent } from "@plasmicapp/loader-nextjs";
7
7
  import { notFound } from "next/navigation";
8
- import { PLASMIC } from "plasmic-init";
9
- import { ClientPlasmicRootProvider } from "plasmic-init-client";
8
+ import { PLASMIC } from "@/plasmic-init";
9
+ import { ClientPlasmicRootProvider } from "@/plasmic-init-client";
10
10
 
11
11
  // Use revalidate if you want incremental static regeneration
12
12
  export const revalidate = 60;
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makePlasmicHostPage_app_loader = void 0;
4
4
  function makePlasmicHostPage_app_loader() {
5
5
  return `import { PlasmicCanvasHost } from "@plasmicapp/loader-nextjs";
6
- import "plasmic-init-client";
6
+ import "@/plasmic-init-client";
7
7
 
8
8
  export default function PlasmicHost() {
9
9
  return <PlasmicCanvasHost />;
@@ -6,7 +6,7 @@ function makePlasmicInitClient_app_loader(jsOrTs) {
6
6
  return `"use client";
7
7
 
8
8
  import { PlasmicRootProvider } from "@plasmicapp/loader-nextjs";
9
- import { PLASMIC } from "plasmic-init";
9
+ import { PLASMIC } from "@/plasmic-init";
10
10
 
11
11
  // You can register any code components that you want to use here; see
12
12
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -27,7 +27,7 @@ import { PLASMIC } from "plasmic-init";
27
27
  * In a Server Component like app/<your-path>/path.tsx, rendering the following would not work:
28
28
  *
29
29
  * \`\`\`tsx
30
- * import { PLASMIC } from "plasmic-init";
30
+ * import { PLASMIC } from "@/plasmic-init";
31
31
  * import { PlasmicRootProvider } from "plasmicapp/loader-nextjs";
32
32
  * export default function MyPage() {
33
33
  * const prefetchedData = await PLASMIC.fetchComponentData("YourPage");
@@ -47,8 +47,8 @@ import { PLASMIC } from "plasmic-init";
47
47
  * while allowing your Server Component to pass in prefetched data and other serializable props:
48
48
  *
49
49
  * \`\`\`tsx
50
- * import { PLASMIC } from "plasmic-init";
51
- * import { ClientPlasmicRootProvider } from "plasmic-init-client"; // changed
50
+ * import { PLASMIC } from "@/plasmic-init";
51
+ * import { ClientPlasmicRootProvider } from "@/plasmic-init-client"; // changed
52
52
  * export default function MyPage() {
53
53
  * const prefetchedData = await PLASMIC.fetchComponentData("YourPage");
54
54
  * return (
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.makePlasmicHostPage_pages_codegen = void 0;
4
4
  function makePlasmicHostPage_pages_codegen() {
5
5
  return `import * as React from 'react';
6
- import { PlasmicCanvasHost, registerComponent } from '@plasmicapp/host';
6
+ import { PlasmicCanvasHost, registerComponent } from '@plasmicapp/react-web/lib/host';
7
7
 
8
8
  // You can register any code components that you want to use here; see
9
9
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -13,7 +13,7 @@ import {
13
13
  ${(0, file_utils_1.ifTs)(jsOrTs, `import type { GetStaticPaths, GetStaticProps } from "next";\n`)}
14
14
  import Error from "next/error";
15
15
  import { useRouter } from "next/router";
16
- import { PLASMIC } from "plasmic-init";
16
+ import { PLASMIC } from "@/plasmic-init";
17
17
 
18
18
  export default function PlasmicLoaderPage(props${(0, file_utils_1.ifTs)(jsOrTs, `: {
19
19
  plasmicData?: ComponentRenderData;
@@ -4,7 +4,7 @@ exports.makePlasmicHostPage_pages_loader = void 0;
4
4
  function makePlasmicHostPage_pages_loader() {
5
5
  return `import * as React from 'react';
6
6
  import { PlasmicCanvasHost } from '@plasmicapp/loader-nextjs';
7
- import { PLASMIC } from 'plasmic-init';
7
+ import { PLASMIC } from '@/plasmic-init';
8
8
 
9
9
  export default function PlasmicHost() {
10
10
  return PLASMIC && <PlasmicCanvasHost />;
@@ -16,8 +16,7 @@ const npm_utils_1 = require("../utils/npm-utils");
16
16
  function installCodegenDeps(opts) {
17
17
  return __awaiter(this, void 0, void 0, function* () {
18
18
  const { projectPath } = opts;
19
- return ((yield (0, npm_utils_1.installUpgrade)("@plasmicapp/cli", { workingDir: projectPath })) &&
20
- (yield (0, npm_utils_1.installUpgrade)("@plasmicapp/host", { workingDir: projectPath })));
19
+ return yield (0, npm_utils_1.installUpgrade)("@plasmicapp/cli", { workingDir: projectPath });
21
20
  });
22
21
  }
23
22
  exports.installCodegenDeps = installCodegenDeps;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "create-plasmic-app",
3
- "version": "0.0.64",
3
+ "version": "0.0.66",
4
4
  "description": "Create Plasmic-powered React apps",
5
5
  "main": "./dist/lib.js",
6
6
  "types": "./dist/lib.d.ts",
@@ -55,5 +55,5 @@
55
55
  "validate-npm-package-name": "^3.0.0",
56
56
  "yargs": "^16.2.0"
57
57
  },
58
- "gitHead": "56c15e54ed33294aaef992171bbb1b3ab1aa6c3a"
58
+ "gitHead": "67e119ae46c42a2b4440cd98b4d168d0b69ca229"
59
59
  }
@@ -134,7 +134,7 @@ export default function Host({ data }${ifTs(jsOrTs, ": HostProps")}) {
134
134
  `;
135
135
  } else {
136
136
  return `import * as React from "react"
137
- import { PlasmicCanvasHost, registerComponent } from "@plasmicapp/host";
137
+ import { PlasmicCanvasHost, registerComponent } from "@plasmicapp/react-web/lib/host";
138
138
 
139
139
  // You can register any code components that you want to use here; see
140
140
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -4,8 +4,8 @@ import { JsOrTs } from "../../../utils/types";
4
4
  export function makeCatchallPage_app_loader(jsOrTs: JsOrTs): string {
5
5
  return `import { PlasmicComponent } from "@plasmicapp/loader-nextjs";
6
6
  import { notFound } from "next/navigation";
7
- import { PLASMIC } from "plasmic-init";
8
- import { ClientPlasmicRootProvider } from "plasmic-init-client";
7
+ import { PLASMIC } from "@/plasmic-init";
8
+ import { ClientPlasmicRootProvider } from "@/plasmic-init-client";
9
9
 
10
10
  // Use revalidate if you want incremental static regeneration
11
11
  export const revalidate = 60;
@@ -1,6 +1,6 @@
1
1
  export function makePlasmicHostPage_app_loader(): string {
2
2
  return `import { PlasmicCanvasHost } from "@plasmicapp/loader-nextjs";
3
- import "plasmic-init-client";
3
+ import "@/plasmic-init-client";
4
4
 
5
5
  export default function PlasmicHost() {
6
6
  return <PlasmicCanvasHost />;
@@ -5,7 +5,7 @@ export function makePlasmicInitClient_app_loader(jsOrTs: JsOrTs): string {
5
5
  return `"use client";
6
6
 
7
7
  import { PlasmicRootProvider } from "@plasmicapp/loader-nextjs";
8
- import { PLASMIC } from "plasmic-init";
8
+ import { PLASMIC } from "@/plasmic-init";
9
9
 
10
10
  // You can register any code components that you want to use here; see
11
11
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -26,7 +26,7 @@ import { PLASMIC } from "plasmic-init";
26
26
  * In a Server Component like app/<your-path>/path.tsx, rendering the following would not work:
27
27
  *
28
28
  * \`\`\`tsx
29
- * import { PLASMIC } from "plasmic-init";
29
+ * import { PLASMIC } from "@/plasmic-init";
30
30
  * import { PlasmicRootProvider } from "plasmicapp/loader-nextjs";
31
31
  * export default function MyPage() {
32
32
  * const prefetchedData = await PLASMIC.fetchComponentData("YourPage");
@@ -46,8 +46,8 @@ import { PLASMIC } from "plasmic-init";
46
46
  * while allowing your Server Component to pass in prefetched data and other serializable props:
47
47
  *
48
48
  * \`\`\`tsx
49
- * import { PLASMIC } from "plasmic-init";
50
- * import { ClientPlasmicRootProvider } from "plasmic-init-client"; // changed
49
+ * import { PLASMIC } from "@/plasmic-init";
50
+ * import { ClientPlasmicRootProvider } from "@/plasmic-init-client"; // changed
51
51
  * export default function MyPage() {
52
52
  * const prefetchedData = await PLASMIC.fetchComponentData("YourPage");
53
53
  * return (
@@ -1,6 +1,6 @@
1
1
  export function makePlasmicHostPage_pages_codegen(): string {
2
2
  return `import * as React from 'react';
3
- import { PlasmicCanvasHost, registerComponent } from '@plasmicapp/host';
3
+ import { PlasmicCanvasHost, registerComponent } from '@plasmicapp/react-web/lib/host';
4
4
 
5
5
  // You can register any code components that you want to use here; see
6
6
  // https://docs.plasmic.app/learn/code-components-ref/
@@ -12,7 +12,7 @@ import {
12
12
  ${ifTs(jsOrTs, `import type { GetStaticPaths, GetStaticProps } from "next";\n`)}
13
13
  import Error from "next/error";
14
14
  import { useRouter } from "next/router";
15
- import { PLASMIC } from "plasmic-init";
15
+ import { PLASMIC } from "@/plasmic-init";
16
16
 
17
17
  export default function PlasmicLoaderPage(props${ifTs(
18
18
  jsOrTs,
@@ -1,7 +1,7 @@
1
1
  export function makePlasmicHostPage_pages_loader(): string {
2
2
  return `import * as React from 'react';
3
3
  import { PlasmicCanvasHost } from '@plasmicapp/loader-nextjs';
4
- import { PLASMIC } from 'plasmic-init';
4
+ import { PLASMIC } from '@/plasmic-init';
5
5
 
6
6
  export default function PlasmicHost() {
7
7
  return PLASMIC && <PlasmicCanvasHost />;
@@ -4,10 +4,7 @@ import { installUpgrade } from "../utils/npm-utils";
4
4
 
5
5
  export async function installCodegenDeps(opts: { projectPath: string }) {
6
6
  const { projectPath } = opts;
7
- return (
8
- (await installUpgrade("@plasmicapp/cli", { workingDir: projectPath })) &&
9
- (await installUpgrade("@plasmicapp/host", { workingDir: projectPath }))
10
- );
7
+ return await installUpgrade("@plasmicapp/cli", { workingDir: projectPath });
11
8
  }
12
9
 
13
10
  export async function runCodegenSync(opts: {
@@ -1,10 +0,0 @@
1
- export default function Head() {
2
- return (
3
- <>
4
- <title>Create Next App</title>
5
- <meta content="width=device-width, initial-scale=1" name="viewport" />
6
- <meta name="description" content="Generated by create next app" />
7
- <link rel="icon" href="/favicon.ico" />
8
- </>
9
- )
10
- }
@@ -1,5 +0,0 @@
1
- // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
2
-
3
- export default function handler(req, res) {
4
- res.status(200).json({ name: 'John Doe' })
5
- }
@@ -1,10 +0,0 @@
1
- export default function Head() {
2
- return (
3
- <>
4
- <title>Create Next App</title>
5
- <meta content="width=device-width, initial-scale=1" name="viewport" />
6
- <meta name="description" content="Generated by create next app" />
7
- <link rel="icon" href="/favicon.ico" />
8
- </>
9
- )
10
- }
@@ -1,13 +0,0 @@
1
- // Next.js API route support: https://nextjs.org/docs/api-routes/introduction
2
- import type { NextApiRequest, NextApiResponse } from 'next'
3
-
4
- type Data = {
5
- name: string
6
- }
7
-
8
- export default function handler(
9
- req: NextApiRequest,
10
- res: NextApiResponse<Data>
11
- ) {
12
- res.status(200).json({ name: 'John Doe' })
13
- }