From 80a47b0389fc4d6a3966dfc54bc5f882bf3cd4dd Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Tue, 20 Feb 2024 14:57:44 -0600 Subject: [PATCH 01/15] feat: add nextjs sample --- run/nextjs-helloworld/.eslintrc.json | 3 + run/nextjs-helloworld/.gitignore | 36 ++++++++ run/nextjs-helloworld/README.md | 36 ++++++++ run/nextjs-helloworld/app/favicon.ico | Bin 0 -> 25931 bytes run/nextjs-helloworld/app/globals.css | 33 +++++++ run/nextjs-helloworld/app/layout.tsx | 22 +++++ run/nextjs-helloworld/app/page.tsx | 113 +++++++++++++++++++++++ run/nextjs-helloworld/next.config.mjs | 6 ++ run/nextjs-helloworld/package.json | 27 ++++++ run/nextjs-helloworld/postcss.config.js | 6 ++ run/nextjs-helloworld/public/next.svg | 1 + run/nextjs-helloworld/public/vercel.svg | 1 + run/nextjs-helloworld/tailwind.config.ts | 20 ++++ run/nextjs-helloworld/tsconfig.json | 26 ++++++ 14 files changed, 330 insertions(+) create mode 100644 run/nextjs-helloworld/.eslintrc.json create mode 100644 run/nextjs-helloworld/.gitignore create mode 100644 run/nextjs-helloworld/README.md create mode 100644 run/nextjs-helloworld/app/favicon.ico create mode 100644 run/nextjs-helloworld/app/globals.css create mode 100644 run/nextjs-helloworld/app/layout.tsx create mode 100644 run/nextjs-helloworld/app/page.tsx create mode 100644 run/nextjs-helloworld/next.config.mjs create mode 100644 run/nextjs-helloworld/package.json create mode 100644 run/nextjs-helloworld/postcss.config.js create mode 100644 run/nextjs-helloworld/public/next.svg create mode 100644 run/nextjs-helloworld/public/vercel.svg create mode 100644 run/nextjs-helloworld/tailwind.config.ts create mode 100644 run/nextjs-helloworld/tsconfig.json diff --git a/run/nextjs-helloworld/.eslintrc.json b/run/nextjs-helloworld/.eslintrc.json new file mode 100644 index 0000000000..bffb357a71 --- /dev/null +++ b/run/nextjs-helloworld/.eslintrc.json @@ -0,0 +1,3 @@ +{ + "extends": "next/core-web-vitals" +} diff --git a/run/nextjs-helloworld/.gitignore b/run/nextjs-helloworld/.gitignore new file mode 100644 index 0000000000..fd3dbb571a --- /dev/null +++ b/run/nextjs-helloworld/.gitignore @@ -0,0 +1,36 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js +.yarn/install-state.gz + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# misc +.DS_Store +*.pem + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* + +# local env files +.env*.local + +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts diff --git a/run/nextjs-helloworld/README.md b/run/nextjs-helloworld/README.md new file mode 100644 index 0000000000..c4033664f8 --- /dev/null +++ b/run/nextjs-helloworld/README.md @@ -0,0 +1,36 @@ +This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). + +## Getting Started + +First, run the development server: + +```bash +npm run dev +# or +yarn dev +# or +pnpm dev +# or +bun dev +``` + +Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. + +You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. + +This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font. + +## Learn More + +To learn more about Next.js, take a look at the following resources: + +- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. +- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. + +You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome! + +## Deploy on Vercel + +The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. + +Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details. diff --git a/run/nextjs-helloworld/app/favicon.ico b/run/nextjs-helloworld/app/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..718d6fea4835ec2d246af9800eddb7ffb276240c GIT binary patch literal 25931 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 LrJugUA?W`A8`#=m literal 0 HcmV?d00001 diff --git a/run/nextjs-helloworld/app/globals.css b/run/nextjs-helloworld/app/globals.css new file mode 100644 index 0000000000..875c01e819 --- /dev/null +++ b/run/nextjs-helloworld/app/globals.css @@ -0,0 +1,33 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +:root { + --foreground-rgb: 0, 0, 0; + --background-start-rgb: 214, 219, 220; + --background-end-rgb: 255, 255, 255; +} + +@media (prefers-color-scheme: dark) { + :root { + --foreground-rgb: 255, 255, 255; + --background-start-rgb: 0, 0, 0; + --background-end-rgb: 0, 0, 0; + } +} + +body { + color: rgb(var(--foreground-rgb)); + background: linear-gradient( + to bottom, + transparent, + rgb(var(--background-end-rgb)) + ) + rgb(var(--background-start-rgb)); +} + +@layer utilities { + .text-balance { + text-wrap: balance; + } +} diff --git a/run/nextjs-helloworld/app/layout.tsx b/run/nextjs-helloworld/app/layout.tsx new file mode 100644 index 0000000000..3314e4780a --- /dev/null +++ b/run/nextjs-helloworld/app/layout.tsx @@ -0,0 +1,22 @@ +import type { Metadata } from "next"; +import { Inter } from "next/font/google"; +import "./globals.css"; + +const inter = Inter({ subsets: ["latin"] }); + +export const metadata: Metadata = { + title: "Create Next App", + description: "Generated by create next app", +}; + +export default function RootLayout({ + children, +}: Readonly<{ + children: React.ReactNode; +}>) { + return ( + + {children} + + ); +} diff --git a/run/nextjs-helloworld/app/page.tsx b/run/nextjs-helloworld/app/page.tsx new file mode 100644 index 0000000000..dc191aa8de --- /dev/null +++ b/run/nextjs-helloworld/app/page.tsx @@ -0,0 +1,113 @@ +import Image from "next/image"; + +export default function Home() { + return ( +
+
+

+ Get started by editing  + app/page.tsx +

+ +
+ +
+ Next.js Logo +
+ + +
+ ); +} diff --git a/run/nextjs-helloworld/next.config.mjs b/run/nextjs-helloworld/next.config.mjs new file mode 100644 index 0000000000..e25a6a237d --- /dev/null +++ b/run/nextjs-helloworld/next.config.mjs @@ -0,0 +1,6 @@ +/** @type {import('next').NextConfig} */ +const nextConfig = { + output: 'standalone', +}; + +export default nextConfig; diff --git a/run/nextjs-helloworld/package.json b/run/nextjs-helloworld/package.json new file mode 100644 index 0000000000..82f0135d38 --- /dev/null +++ b/run/nextjs-helloworld/package.json @@ -0,0 +1,27 @@ +{ + "name": "nextjs-helloworld", + "version": "0.1.0", + "private": true, + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint" + }, + "dependencies": { + "react": "^18", + "react-dom": "^18", + "next": "14.1.0" + }, + "devDependencies": { + "typescript": "^5", + "@types/node": "^20", + "@types/react": "^18", + "@types/react-dom": "^18", + "autoprefixer": "^10.0.1", + "postcss": "^8", + "tailwindcss": "^3.3.0", + "eslint": "^8", + "eslint-config-next": "14.1.0" + } +} diff --git a/run/nextjs-helloworld/postcss.config.js b/run/nextjs-helloworld/postcss.config.js new file mode 100644 index 0000000000..12a703d900 --- /dev/null +++ b/run/nextjs-helloworld/postcss.config.js @@ -0,0 +1,6 @@ +module.exports = { + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, +}; diff --git a/run/nextjs-helloworld/public/next.svg b/run/nextjs-helloworld/public/next.svg new file mode 100644 index 0000000000..5174b28c56 --- /dev/null +++ b/run/nextjs-helloworld/public/next.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/run/nextjs-helloworld/public/vercel.svg b/run/nextjs-helloworld/public/vercel.svg new file mode 100644 index 0000000000..d2f8422273 --- /dev/null +++ b/run/nextjs-helloworld/public/vercel.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/run/nextjs-helloworld/tailwind.config.ts b/run/nextjs-helloworld/tailwind.config.ts new file mode 100644 index 0000000000..7e4bd91a03 --- /dev/null +++ b/run/nextjs-helloworld/tailwind.config.ts @@ -0,0 +1,20 @@ +import type { Config } from "tailwindcss"; + +const config: Config = { + content: [ + "./pages/**/*.{js,ts,jsx,tsx,mdx}", + "./components/**/*.{js,ts,jsx,tsx,mdx}", + "./app/**/*.{js,ts,jsx,tsx,mdx}", + ], + theme: { + extend: { + backgroundImage: { + "gradient-radial": "radial-gradient(var(--tw-gradient-stops))", + "gradient-conic": + "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))", + }, + }, + }, + plugins: [], +}; +export default config; diff --git a/run/nextjs-helloworld/tsconfig.json b/run/nextjs-helloworld/tsconfig.json new file mode 100644 index 0000000000..e7ff90fd27 --- /dev/null +++ b/run/nextjs-helloworld/tsconfig.json @@ -0,0 +1,26 @@ +{ + "compilerOptions": { + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": true, + "skipLibCheck": true, + "strict": true, + "noEmit": true, + "esModuleInterop": true, + "module": "esnext", + "moduleResolution": "bundler", + "resolveJsonModule": true, + "isolatedModules": true, + "jsx": "preserve", + "incremental": true, + "plugins": [ + { + "name": "next" + } + ], + "paths": { + "@/*": ["./*"] + } + }, + "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], + "exclude": ["node_modules"] +} From a2a692d46db3441c110950f6c22189df8a754aea Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Tue, 20 Feb 2024 15:48:02 -0600 Subject: [PATCH 02/15] feat: add license --- run/nextjs-helloworld/.gitignore | 14 +++ run/nextjs-helloworld/app/favicon.ico | Bin 25931 -> 0 bytes run/nextjs-helloworld/app/globals.css | 33 ------- run/nextjs-helloworld/app/layout.tsx | 15 ++- run/nextjs-helloworld/app/page.tsx | 113 +++-------------------- run/nextjs-helloworld/next.config.mjs | 14 +++ run/nextjs-helloworld/postcss.config.js | 14 +++ run/nextjs-helloworld/public/next.svg | 1 - run/nextjs-helloworld/public/vercel.svg | 1 - run/nextjs-helloworld/tailwind.config.ts | 14 +++ 10 files changed, 83 insertions(+), 136 deletions(-) delete mode 100644 run/nextjs-helloworld/app/favicon.ico delete mode 100644 run/nextjs-helloworld/app/globals.css delete mode 100644 run/nextjs-helloworld/public/next.svg delete mode 100644 run/nextjs-helloworld/public/vercel.svg diff --git a/run/nextjs-helloworld/.gitignore b/run/nextjs-helloworld/.gitignore index fd3dbb571a..787d949fb1 100644 --- a/run/nextjs-helloworld/.gitignore +++ b/run/nextjs-helloworld/.gitignore @@ -1,3 +1,17 @@ +# Copyright 2024 Google Inc. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # dependencies diff --git a/run/nextjs-helloworld/app/favicon.ico b/run/nextjs-helloworld/app/favicon.ico deleted file mode 100644 index 718d6fea4835ec2d246af9800eddb7ffb276240c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25931 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 LrJugUA?W`A8`#=m diff --git a/run/nextjs-helloworld/app/globals.css b/run/nextjs-helloworld/app/globals.css deleted file mode 100644 index 875c01e819..0000000000 --- a/run/nextjs-helloworld/app/globals.css +++ /dev/null @@ -1,33 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - -:root { - --foreground-rgb: 0, 0, 0; - --background-start-rgb: 214, 219, 220; - --background-end-rgb: 255, 255, 255; -} - -@media (prefers-color-scheme: dark) { - :root { - --foreground-rgb: 255, 255, 255; - --background-start-rgb: 0, 0, 0; - --background-end-rgb: 0, 0, 0; - } -} - -body { - color: rgb(var(--foreground-rgb)); - background: linear-gradient( - to bottom, - transparent, - rgb(var(--background-end-rgb)) - ) - rgb(var(--background-start-rgb)); -} - -@layer utilities { - .text-balance { - text-wrap: balance; - } -} diff --git a/run/nextjs-helloworld/app/layout.tsx b/run/nextjs-helloworld/app/layout.tsx index 3314e4780a..316ad9c8d2 100644 --- a/run/nextjs-helloworld/app/layout.tsx +++ b/run/nextjs-helloworld/app/layout.tsx @@ -1,6 +1,19 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + import type { Metadata } from "next"; import { Inter } from "next/font/google"; -import "./globals.css"; const inter = Inter({ subsets: ["latin"] }); diff --git a/run/nextjs-helloworld/app/page.tsx b/run/nextjs-helloworld/app/page.tsx index dc191aa8de..783c23c080 100644 --- a/run/nextjs-helloworld/app/page.tsx +++ b/run/nextjs-helloworld/app/page.tsx @@ -1,4 +1,16 @@ -import Image from "next/image"; +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. export default function Home() { return ( @@ -8,105 +20,6 @@ export default function Home() { Get started by editing  app/page.tsx

- - - -
- Next.js Logo -
- - ); diff --git a/run/nextjs-helloworld/next.config.mjs b/run/nextjs-helloworld/next.config.mjs index e25a6a237d..4ac5675e00 100644 --- a/run/nextjs-helloworld/next.config.mjs +++ b/run/nextjs-helloworld/next.config.mjs @@ -1,3 +1,17 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + /** @type {import('next').NextConfig} */ const nextConfig = { output: 'standalone', diff --git a/run/nextjs-helloworld/postcss.config.js b/run/nextjs-helloworld/postcss.config.js index 12a703d900..6a10fa4135 100644 --- a/run/nextjs-helloworld/postcss.config.js +++ b/run/nextjs-helloworld/postcss.config.js @@ -1,3 +1,17 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + module.exports = { plugins: { tailwindcss: {}, diff --git a/run/nextjs-helloworld/public/next.svg b/run/nextjs-helloworld/public/next.svg deleted file mode 100644 index 5174b28c56..0000000000 --- a/run/nextjs-helloworld/public/next.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/run/nextjs-helloworld/public/vercel.svg b/run/nextjs-helloworld/public/vercel.svg deleted file mode 100644 index d2f8422273..0000000000 --- a/run/nextjs-helloworld/public/vercel.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/run/nextjs-helloworld/tailwind.config.ts b/run/nextjs-helloworld/tailwind.config.ts index 7e4bd91a03..31f8936382 100644 --- a/run/nextjs-helloworld/tailwind.config.ts +++ b/run/nextjs-helloworld/tailwind.config.ts @@ -1,3 +1,17 @@ +// Copyright 2024 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + import type { Config } from "tailwindcss"; const config: Config = { From 51993a71c33c56a8e1f0f8e0a7865e08b483a6a7 Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Tue, 20 Feb 2024 16:38:30 -0600 Subject: [PATCH 03/15] feat: simplify example --- run/nextjs-helloworld/.eslintrc.json | 3 -- run/nextjs-helloworld/.gitignore | 50 ------------------- run/nextjs-helloworld/README.md | 36 ------------- .../{next.config.mjs => app/layout.jsx} | 15 +++--- run/nextjs-helloworld/app/layout.tsx | 35 ------------- .../{postcss.config.js => app/page.jsx} | 11 ++-- run/nextjs-helloworld/app/page.tsx | 26 ---------- run/nextjs-helloworld/package.json | 33 +++++------- run/nextjs-helloworld/tailwind.config.ts | 34 ------------- run/nextjs-helloworld/tsconfig.json | 26 ---------- 10 files changed, 25 insertions(+), 244 deletions(-) delete mode 100644 run/nextjs-helloworld/.eslintrc.json delete mode 100644 run/nextjs-helloworld/.gitignore delete mode 100644 run/nextjs-helloworld/README.md rename run/nextjs-helloworld/{next.config.mjs => app/layout.jsx} (74%) delete mode 100644 run/nextjs-helloworld/app/layout.tsx rename run/nextjs-helloworld/{postcss.config.js => app/page.jsx} (80%) delete mode 100644 run/nextjs-helloworld/app/page.tsx delete mode 100644 run/nextjs-helloworld/tailwind.config.ts delete mode 100644 run/nextjs-helloworld/tsconfig.json diff --git a/run/nextjs-helloworld/.eslintrc.json b/run/nextjs-helloworld/.eslintrc.json deleted file mode 100644 index bffb357a71..0000000000 --- a/run/nextjs-helloworld/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "next/core-web-vitals" -} diff --git a/run/nextjs-helloworld/.gitignore b/run/nextjs-helloworld/.gitignore deleted file mode 100644 index 787d949fb1..0000000000 --- a/run/nextjs-helloworld/.gitignore +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 2024 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js -.yarn/install-state.gz - -# testing -/coverage - -# next.js -/.next/ -/out/ - -# production -/build - -# misc -.DS_Store -*.pem - -# debug -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# local env files -.env*.local - -# vercel -.vercel - -# typescript -*.tsbuildinfo -next-env.d.ts diff --git a/run/nextjs-helloworld/README.md b/run/nextjs-helloworld/README.md deleted file mode 100644 index c4033664f8..0000000000 --- a/run/nextjs-helloworld/README.md +++ /dev/null @@ -1,36 +0,0 @@ -This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next-app`](https://github.com/vercel/next.js/tree/canary/packages/create-next-app). - -## Getting Started - -First, run the development server: - -```bash -npm run dev -# or -yarn dev -# or -pnpm dev -# or -bun dev -``` - -Open [http://localhost:3000](http://localhost:3000) with your browser to see the result. - -You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file. - -This project uses [`next/font`](https://nextjs.org/docs/basic-features/font-optimization) to automatically optimize and load Inter, a custom Google Font. - -## Learn More - -To learn more about Next.js, take a look at the following resources: - -- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API. -- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial. - -You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js/) - your feedback and contributions are welcome! - -## Deploy on Vercel - -The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js. - -Check out our [Next.js deployment documentation](https://nextjs.org/docs/deployment) for more details. diff --git a/run/nextjs-helloworld/next.config.mjs b/run/nextjs-helloworld/app/layout.jsx similarity index 74% rename from run/nextjs-helloworld/next.config.mjs rename to run/nextjs-helloworld/app/layout.jsx index 4ac5675e00..2e85834b4c 100644 --- a/run/nextjs-helloworld/next.config.mjs +++ b/run/nextjs-helloworld/app/layout.jsx @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -12,9 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -/** @type {import('next').NextConfig} */ -const nextConfig = { - output: 'standalone', -}; - -export default nextConfig; +export default function RootLayout({ children }) { + return ( + + {children} + + ); +} diff --git a/run/nextjs-helloworld/app/layout.tsx b/run/nextjs-helloworld/app/layout.tsx deleted file mode 100644 index 316ad9c8d2..0000000000 --- a/run/nextjs-helloworld/app/layout.tsx +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import type { Metadata } from "next"; -import { Inter } from "next/font/google"; - -const inter = Inter({ subsets: ["latin"] }); - -export const metadata: Metadata = { - title: "Create Next App", - description: "Generated by create next app", -}; - -export default function RootLayout({ - children, -}: Readonly<{ - children: React.ReactNode; -}>) { - return ( - - {children} - - ); -} diff --git a/run/nextjs-helloworld/postcss.config.js b/run/nextjs-helloworld/app/page.jsx similarity index 80% rename from run/nextjs-helloworld/postcss.config.js rename to run/nextjs-helloworld/app/page.jsx index 6a10fa4135..3b95109d22 100644 --- a/run/nextjs-helloworld/postcss.config.js +++ b/run/nextjs-helloworld/app/page.jsx @@ -4,7 +4,7 @@ // you may not use this file except in compliance with the License. // You may obtain a copy of the License at // -// http://www.apache.org/licenses/LICENSE-2.0 +// https://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, software // distributed under the License is distributed on an "AS IS" BASIS, @@ -12,9 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -module.exports = { - plugins: { - tailwindcss: {}, - autoprefixer: {}, - }, -}; +export default function Page() { + return

Hello, Next.js!

; +} diff --git a/run/nextjs-helloworld/app/page.tsx b/run/nextjs-helloworld/app/page.tsx deleted file mode 100644 index 783c23c080..0000000000 --- a/run/nextjs-helloworld/app/page.tsx +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -export default function Home() { - return ( -
-
-

- Get started by editing  - app/page.tsx -

-
-
- ); -} diff --git a/run/nextjs-helloworld/package.json b/run/nextjs-helloworld/package.json index 82f0135d38..ebbc4cb03c 100644 --- a/run/nextjs-helloworld/package.json +++ b/run/nextjs-helloworld/package.json @@ -1,27 +1,20 @@ { - "name": "nextjs-helloworld", - "version": "0.1.0", - "private": true, + "name": "helloworld", + "description": "Simple hello world sample in Next.js", + "version": "1.0.0", "scripts": { - "dev": "next dev", + "dev": "next dev --turbo", "build": "next build", - "start": "next start", - "lint": "next lint" + "start": "next start" }, - "dependencies": { - "react": "^18", - "react-dom": "^18", - "next": "14.1.0" + "engines": { + "node": ">=20.0.0" }, - "devDependencies": { - "typescript": "^5", - "@types/node": "^20", - "@types/react": "^18", - "@types/react-dom": "^18", - "autoprefixer": "^10.0.1", - "postcss": "^8", - "tailwindcss": "^3.3.0", - "eslint": "^8", - "eslint-config-next": "14.1.0" + "author": "Google LLC", + "license": "Apache-2.0", + "dependencies": { + "next": "14.1.0", + "react": "18.2.0", + "react-dom": "18.2.0" } } diff --git a/run/nextjs-helloworld/tailwind.config.ts b/run/nextjs-helloworld/tailwind.config.ts deleted file mode 100644 index 31f8936382..0000000000 --- a/run/nextjs-helloworld/tailwind.config.ts +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import type { Config } from "tailwindcss"; - -const config: Config = { - content: [ - "./pages/**/*.{js,ts,jsx,tsx,mdx}", - "./components/**/*.{js,ts,jsx,tsx,mdx}", - "./app/**/*.{js,ts,jsx,tsx,mdx}", - ], - theme: { - extend: { - backgroundImage: { - "gradient-radial": "radial-gradient(var(--tw-gradient-stops))", - "gradient-conic": - "conic-gradient(from 180deg at 50% 50%, var(--tw-gradient-stops))", - }, - }, - }, - plugins: [], -}; -export default config; diff --git a/run/nextjs-helloworld/tsconfig.json b/run/nextjs-helloworld/tsconfig.json deleted file mode 100644 index e7ff90fd27..0000000000 --- a/run/nextjs-helloworld/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "compilerOptions": { - "lib": ["dom", "dom.iterable", "esnext"], - "allowJs": true, - "skipLibCheck": true, - "strict": true, - "noEmit": true, - "esModuleInterop": true, - "module": "esnext", - "moduleResolution": "bundler", - "resolveJsonModule": true, - "isolatedModules": true, - "jsx": "preserve", - "incremental": true, - "plugins": [ - { - "name": "next" - } - ], - "paths": { - "@/*": ["./*"] - } - }, - "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"], - "exclude": ["node_modules"] -} From 6b8365505e7d27ccfbcf41d29e8c0b95197e03af Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Tue, 20 Feb 2024 16:55:43 -0600 Subject: [PATCH 04/15] chore: add react import --- run/nextjs-helloworld/app/layout.jsx | 2 ++ run/nextjs-helloworld/app/page.jsx | 2 ++ 2 files changed, 4 insertions(+) diff --git a/run/nextjs-helloworld/app/layout.jsx b/run/nextjs-helloworld/app/layout.jsx index 2e85834b4c..4a9c7ddbf1 100644 --- a/run/nextjs-helloworld/app/layout.jsx +++ b/run/nextjs-helloworld/app/layout.jsx @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import React from 'react' + export default function RootLayout({ children }) { return ( diff --git a/run/nextjs-helloworld/app/page.jsx b/run/nextjs-helloworld/app/page.jsx index 3b95109d22..b4bfa66e78 100644 --- a/run/nextjs-helloworld/app/page.jsx +++ b/run/nextjs-helloworld/app/page.jsx @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +import React from 'react' + export default function Page() { return

Hello, Next.js!

; } From e0d65f97ee5163bf57fd3b6500f4d0bb3e874c01 Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Tue, 20 Feb 2024 17:18:04 -0600 Subject: [PATCH 05/15] chore: update all packages --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 650ce33f60..293e444501 100644 --- a/package.json +++ b/package.json @@ -18,20 +18,20 @@ "generate-ci": "node .github/workflows/utils/generate.js" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^6.0.0", - "c8": "^8.0.0", - "eslint-config-prettier": "^9.0.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", + "c8": "^9.1.0", + "eslint-config-prettier": "^9.1.0", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^5.0.0-alpha.1", - "gts": "^5.0.1", - "mocha": "^10.2.0", + "eslint-plugin-prettier": "^5.1.3", + "gts": "^5.2.0", + "mocha": "^10.3.0", "nunjucks": "^3.2.4", - "prettier": "^3.0.3", - "typescript": "^5.0.4" + "prettier": "^3.2.5", + "typescript": "^5.3.3" }, "dependencies": { - "commander": "^11.0.0", - "eslint": "^8.53.0" + "commander": "^12.0.0", + "eslint": "^8.56.0" } } From 9903f7c7d396c0dc1b96b59547b3b5afdf297e83 Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Tue, 20 Feb 2024 17:20:40 -0600 Subject: [PATCH 06/15] chore: add jsx true --- .eslintrc.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.eslintrc.json b/.eslintrc.json index 7e5a1dd078..eb40cd4182 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -12,6 +12,10 @@ "node/no-unsupported-features/es-syntax": ["off"] }, "parserOptions": { + "ecmaVersion": 7, + "ecmaFeatures": { + "jsx": true + }, "sourceType": "module" } } From 040415013ebc205bbcee2c4e3c66a396e9f854de Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Tue, 20 Feb 2024 20:34:31 -0600 Subject: [PATCH 07/15] chore: remove ecmaVersion --- .eslintrc.json | 1 - run/nextjs-helloworld/app/layout.jsx | 6 ++---- run/nextjs-helloworld/app/page.jsx | 2 -- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index eb40cd4182..9cbec86af3 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -12,7 +12,6 @@ "node/no-unsupported-features/es-syntax": ["off"] }, "parserOptions": { - "ecmaVersion": 7, "ecmaFeatures": { "jsx": true }, diff --git a/run/nextjs-helloworld/app/layout.jsx b/run/nextjs-helloworld/app/layout.jsx index 4a9c7ddbf1..d65434211c 100644 --- a/run/nextjs-helloworld/app/layout.jsx +++ b/run/nextjs-helloworld/app/layout.jsx @@ -10,11 +10,9 @@ // distributed under the License is distributed on an "AS IS" BASIS, // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and -// limitations under the License. +// limitations under the License.; -import React from 'react' - -export default function RootLayout({ children }) { +export default function RootLayout({children}) { return ( {children} diff --git a/run/nextjs-helloworld/app/page.jsx b/run/nextjs-helloworld/app/page.jsx index b4bfa66e78..3b95109d22 100644 --- a/run/nextjs-helloworld/app/page.jsx +++ b/run/nextjs-helloworld/app/page.jsx @@ -12,8 +12,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -import React from 'react' - export default function Page() { return

Hello, Next.js!

; } From 81f321c08a690e37fc63bc33a720a3d86d91646b Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Tue, 20 Feb 2024 20:54:34 -0600 Subject: [PATCH 08/15] chore: trigger build --- run/nextjs-helloworld/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/nextjs-helloworld/package.json b/run/nextjs-helloworld/package.json index ebbc4cb03c..d9a0ed6e45 100644 --- a/run/nextjs-helloworld/package.json +++ b/run/nextjs-helloworld/package.json @@ -1,6 +1,6 @@ { "name": "helloworld", - "description": "Simple hello world sample in Next.js", + "description": "Hello world sample in Next.js", "version": "1.0.0", "scripts": { "dev": "next dev --turbo", From 4147e80b128c7a77ea1933633c52025672f86ecc Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Wed, 21 Feb 2024 09:03:22 -0600 Subject: [PATCH 09/15] chore: undo changes to global package.json --- package.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 293e444501..f659e7e690 100644 --- a/package.json +++ b/package.json @@ -18,20 +18,20 @@ "generate-ci": "node .github/workflows/utils/generate.js" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^7.0.2", - "@typescript-eslint/parser": "^7.0.2", - "c8": "^9.1.0", - "eslint-config-prettier": "^9.1.0", + "@typescript-eslint/eslint-plugin": "^6.0.0", + "@typescript-eslint/parser": "^6.0.0", + "c8": "^8.0.0", + "eslint-config-prettier": "^9.0.0", "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^5.1.3", - "gts": "^5.2.0", - "mocha": "^10.3.0", + "eslint-plugin-prettier": "^5.0.0-alpha.1", + "gts": "^5.0.1", + "mocha": "^10.2.0", "nunjucks": "^3.2.4", - "prettier": "^3.2.5", - "typescript": "^5.3.3" + "prettier": "^3.0.3", + "typescript": "^5.0.4" }, "dependencies": { - "commander": "^12.0.0", - "eslint": "^8.56.0" + "commander": "^11.0.0", + "eslint": "^8.53.0" } -} +} \ No newline at end of file From 424357656ca35116dfd4554ac8b8dca0010be904 Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Wed, 21 Feb 2024 09:07:47 -0600 Subject: [PATCH 10/15] chore: add empty line back to package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f659e7e690..650ce33f60 100644 --- a/package.json +++ b/package.json @@ -34,4 +34,4 @@ "commander": "^11.0.0", "eslint": "^8.53.0" } -} \ No newline at end of file +} From b896cd8ff6faf4f87e29554c975dbe97240b767c Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Wed, 21 Feb 2024 10:26:07 -0600 Subject: [PATCH 11/15] chore: attempt to add next.js tests --- .../test/e2e_test_cleanup.yaml | 19 ++++ .../test/e2e_test_setup.yaml | 41 +++++++ run/nextjs-helloworld/test/index.test.js | 36 ++++++ run/nextjs-helloworld/test/retry.sh | 67 +++++++++++ run/nextjs-helloworld/test/system.test.js | 107 ++++++++++++++++++ 5 files changed, 270 insertions(+) create mode 100644 run/nextjs-helloworld/test/e2e_test_cleanup.yaml create mode 100644 run/nextjs-helloworld/test/e2e_test_setup.yaml create mode 100644 run/nextjs-helloworld/test/index.test.js create mode 100755 run/nextjs-helloworld/test/retry.sh create mode 100644 run/nextjs-helloworld/test/system.test.js diff --git a/run/nextjs-helloworld/test/e2e_test_cleanup.yaml b/run/nextjs-helloworld/test/e2e_test_cleanup.yaml new file mode 100644 index 0000000000..a82fd25c06 --- /dev/null +++ b/run/nextjs-helloworld/test/e2e_test_cleanup.yaml @@ -0,0 +1,19 @@ +steps: + +- id: 'Delete image and service' + name: 'gcr.io/cloud-builders/gcloud' + entrypoint: '/bin/bash' + args: + - '-c' + - | + ./test/retry.sh "gcloud container images describe gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" \ + "gcloud container images delete gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} --quiet" + + ./test/retry.sh "gcloud run services describe ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM}" \ + "gcloud run services delete ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM} --quiet" + +substitutions: + _SERVICE: logging-manual + _VERSION: manual + _REGION: us-central1 + _PLATFORM: managed diff --git a/run/nextjs-helloworld/test/e2e_test_setup.yaml b/run/nextjs-helloworld/test/e2e_test_setup.yaml new file mode 100644 index 0000000000..b354bca091 --- /dev/null +++ b/run/nextjs-helloworld/test/e2e_test_setup.yaml @@ -0,0 +1,41 @@ +steps: + +- id: 'Build Container Image' + name: 'gcr.io/cloud-builders/docker' + entrypoint: '/bin/bash' + args: + - '-c' + - | + ./test/retry.sh "docker build -t gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} ." + +- id: 'Push Container Image' + name: 'gcr.io/cloud-builders/docker' + entrypoint: '/bin/bash' + args: + - '-c' + - | + ./test/retry.sh "docker push gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" + +- id: 'Deploy to Cloud Run' + name: 'gcr.io/cloud-builders/gcloud:latest' + entrypoint: /bin/bash + args: + - '-c' + - | + ./test/retry.sh "gcloud run deploy ${_SERVICE} \ + --image gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} \ + --no-allow-unauthenticated \ + --region ${_REGION} \ + --platform ${_PLATFORM} \ + --set-env-vars NAME=${_NAME}" + + +images: +- gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} + +substitutions: + _SERVICE: logging-manual + _VERSION: manual + _REGION: us-central1 + _PLATFORM: managed + _NAME: Cloud diff --git a/run/nextjs-helloworld/test/index.test.js b/run/nextjs-helloworld/test/index.test.js new file mode 100644 index 0000000000..90793379cb --- /dev/null +++ b/run/nextjs-helloworld/test/index.test.js @@ -0,0 +1,36 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import assert from 'assert'; +import supertest from 'supertest'; +import app from '../index.js'; + +let request; +describe('Unit Tests', () => { + before(() => { + request = supertest(app); + }); + + it('Service uses the NAME override', async () => { + process.env.NAME = 'Cloud'; + const response = await request.get('/').retry(3).expect(200); + assert.equal(response.text, 'Hello Cloud!'); + }); + + it('Service uses the NAME default', async () => { + process.env.NAME = ''; + const response = await request.get('/').retry(3).expect(200); + assert.equal(response.text, 'Hello World!'); + }); +}); diff --git a/run/nextjs-helloworld/test/retry.sh b/run/nextjs-helloworld/test/retry.sh new file mode 100755 index 0000000000..0f36c2075a --- /dev/null +++ b/run/nextjs-helloworld/test/retry.sh @@ -0,0 +1,67 @@ +#!/usr/bin/env bash +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +## +# retry.sh +# Provides utility function commonly needed across Cloud Build pipelines to +# retry commands on failure. +# +# Usage: +# 1. Retry single command: +# +# ./retry.sh "CMD" +# +# 2. Retry with check: +# +# ./retry.sh "gcloud RESOURCE EXISTS?" "gcloud ACTION" +# +## + +# Usage: try "cmd1" "cmd2" +# If first cmd executes successfully then execute second cmd +runIfSuccessful() { + echo "running: $1" + $($1 > /dev/null) + if [ $? -eq 0 ]; then + echo "running: $2" + $($2 > /dev/null) + fi +} + +# Define max retries +max_attempts=3; +attempt_num=1; + +arg1="$1" +arg2="$2" + +if [ $# -eq 1 ] +then + cmd="$arg1" +else + cmd="runIfSuccessful \"$arg1\" \"$arg2\"" +fi + +until eval $cmd +do + if ((attempt_num==max_attempts)) + then + echo "Attempt $attempt_num / $max_attempts failed! No more retries left!" + exit 1 + else + echo "Attempt $attempt_num / $max_attempts failed!" + sleep $((attempt_num++)) + fi +done diff --git a/run/nextjs-helloworld/test/system.test.js b/run/nextjs-helloworld/test/system.test.js new file mode 100644 index 0000000000..3980f27031 --- /dev/null +++ b/run/nextjs-helloworld/test/system.test.js @@ -0,0 +1,107 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// https://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +import assert from 'assert'; +import {execSync} from 'child_process'; +import request from 'got'; +import {GoogleAuth} from 'google-auth-library'; +const auth = new GoogleAuth(); + +const get = (route, base_url) => { + if (!ID_TOKEN) { + throw Error('"ID_TOKEN" environment variable is required.'); + } + + return request(new URL(route, base_url.trim()), { + headers: { + Authorization: `${ID_TOKEN.trim()}`, + }, + throwHttpErrors: false, + }); +}; + +let BASE_URL, ID_TOKEN; +describe('End-to-End Tests', () => { + const {GOOGLE_CLOUD_PROJECT} = process.env; + if (!GOOGLE_CLOUD_PROJECT) { + throw Error('"GOOGLE_CLOUD_PROJECT" env var not found.'); + } + let {SERVICE_NAME} = process.env; + if (!SERVICE_NAME) { + SERVICE_NAME = 'helloworld'; + console.log( + `"SERVICE_NAME" env var not found. Defaulting to "${SERVICE_NAME}"` + ); + } + let {NAME} = process.env; + if (!NAME) { + NAME = 'Cloud'; + console.log(`"NAME" env var not found. Defaulting to "${NAME}"`); + } + const {SAMPLE_VERSION} = process.env; + const PLATFORM = 'managed'; + const REGION = 'us-central1'; + before(async () => { + // Deploy service using Cloud Build + let buildCmd = + `gcloud builds submit --project ${GOOGLE_CLOUD_PROJECT} ` + + '--config ./test/e2e_test_setup.yaml ' + + `--substitutions _SERVICE=${SERVICE_NAME},_PLATFORM=${PLATFORM},_REGION=${REGION}` + + `,_NAME=${NAME}`; + if (SAMPLE_VERSION) buildCmd += `,_VERSION=${SAMPLE_VERSION}`; + + console.log('Starting Cloud Build...'); + execSync(buildCmd, {timeout: 240000}); // timeout at 4 mins + console.log('Cloud Build completed.'); + + // Retrieve URL of Cloud Run service + const url = execSync( + `gcloud run services describe ${SERVICE_NAME} --project=${GOOGLE_CLOUD_PROJECT} ` + + `--platform=${PLATFORM} --region=${REGION} --format='value(status.url)'` + ); + + BASE_URL = url.toString('utf-8').trim(); + if (!BASE_URL) throw Error('Cloud Run service URL not found'); + + // Retrieve ID token for testing + const client = await auth.getIdTokenClient(BASE_URL); + const clientHeaders = await client.getRequestHeaders(); + ID_TOKEN = clientHeaders['Authorization'].trim(); + if (!ID_TOKEN) throw Error('Unable to acquire an ID token.'); + }); + + after(() => { + let cleanUpCmd = + `gcloud builds submit --project ${GOOGLE_CLOUD_PROJECT} ` + + '--config ./test/e2e_test_cleanup.yaml ' + + `--substitutions _SERVICE=${SERVICE_NAME},_PLATFORM=${PLATFORM},_REGION=${REGION}`; + if (SAMPLE_VERSION) cleanUpCmd += `,_VERSION=${SAMPLE_VERSION}`; + + execSync(cleanUpCmd); + }); + + it('Service uses the NAME override', async () => { + const response = await get('/', BASE_URL); + assert.strictEqual( + response.statusCode, + 200, + 'Did not fallback to default as expected' + ); + assert.strictEqual( + response.body, + `Hello ${NAME}!`, + `Expected override "${NAME}" not found` + ); + }); +}); From 6aeb1840afe238c638f4360515e378340e58c085 Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Wed, 21 Feb 2024 10:39:33 -0600 Subject: [PATCH 12/15] chore: add license to yaml files --- run/nextjs-helloworld/package.json | 4 +++- run/nextjs-helloworld/test/e2e_test_cleanup.yaml | 14 ++++++++++++++ run/nextjs-helloworld/test/e2e_test_setup.yaml | 14 ++++++++++++++ run/nextjs-helloworld/test/index.test.js | 2 +- run/nextjs-helloworld/test/retry.sh | 2 +- run/nextjs-helloworld/test/system.test.js | 2 +- 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/run/nextjs-helloworld/package.json b/run/nextjs-helloworld/package.json index d9a0ed6e45..c31f5b063f 100644 --- a/run/nextjs-helloworld/package.json +++ b/run/nextjs-helloworld/package.json @@ -5,7 +5,9 @@ "scripts": { "dev": "next dev --turbo", "build": "next build", - "start": "next start" + "start": "next start", + "test": "c8 mocha -p -j 2 test/index.test.js --exit", + "system-test": "NAME=Cloud c8 mocha -p -j 2 test/system.test.js --timeout=180000" }, "engines": { "node": ">=20.0.0" diff --git a/run/nextjs-helloworld/test/e2e_test_cleanup.yaml b/run/nextjs-helloworld/test/e2e_test_cleanup.yaml index a82fd25c06..00d541f04c 100644 --- a/run/nextjs-helloworld/test/e2e_test_cleanup.yaml +++ b/run/nextjs-helloworld/test/e2e_test_cleanup.yaml @@ -1,3 +1,17 @@ +# Copyright 2024 Google LLC. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + steps: - id: 'Delete image and service' diff --git a/run/nextjs-helloworld/test/e2e_test_setup.yaml b/run/nextjs-helloworld/test/e2e_test_setup.yaml index b354bca091..8355049eee 100644 --- a/run/nextjs-helloworld/test/e2e_test_setup.yaml +++ b/run/nextjs-helloworld/test/e2e_test_setup.yaml @@ -1,3 +1,17 @@ +# Copyright 2024 Google LLC. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + steps: - id: 'Build Container Image' diff --git a/run/nextjs-helloworld/test/index.test.js b/run/nextjs-helloworld/test/index.test.js index 90793379cb..f0a5c8c6c4 100644 --- a/run/nextjs-helloworld/test/index.test.js +++ b/run/nextjs-helloworld/test/index.test.js @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. diff --git a/run/nextjs-helloworld/test/retry.sh b/run/nextjs-helloworld/test/retry.sh index 0f36c2075a..d5611fbe46 100755 --- a/run/nextjs-helloworld/test/retry.sh +++ b/run/nextjs-helloworld/test/retry.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright 2020 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/run/nextjs-helloworld/test/system.test.js b/run/nextjs-helloworld/test/system.test.js index 3980f27031..af0729743c 100644 --- a/run/nextjs-helloworld/test/system.test.js +++ b/run/nextjs-helloworld/test/system.test.js @@ -1,4 +1,4 @@ -// Copyright 2020 Google LLC +// Copyright 2024 Google LLC // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. From 0574efe0dad098676b0b05b3d37c0fbb212940b3 Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Wed, 21 Feb 2024 10:42:27 -0600 Subject: [PATCH 13/15] chore: change test service name --- .../test/e2e_test_setup.yaml | 2 +- run/nextjs-helloworld/test/index.test.js | 36 ------------------- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 run/nextjs-helloworld/test/index.test.js diff --git a/run/nextjs-helloworld/test/e2e_test_setup.yaml b/run/nextjs-helloworld/test/e2e_test_setup.yaml index 8355049eee..86b7f689c1 100644 --- a/run/nextjs-helloworld/test/e2e_test_setup.yaml +++ b/run/nextjs-helloworld/test/e2e_test_setup.yaml @@ -48,7 +48,7 @@ images: - gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} substitutions: - _SERVICE: logging-manual + _SERVICE: nextjs-helloworld _VERSION: manual _REGION: us-central1 _PLATFORM: managed diff --git a/run/nextjs-helloworld/test/index.test.js b/run/nextjs-helloworld/test/index.test.js deleted file mode 100644 index f0a5c8c6c4..0000000000 --- a/run/nextjs-helloworld/test/index.test.js +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import assert from 'assert'; -import supertest from 'supertest'; -import app from '../index.js'; - -let request; -describe('Unit Tests', () => { - before(() => { - request = supertest(app); - }); - - it('Service uses the NAME override', async () => { - process.env.NAME = 'Cloud'; - const response = await request.get('/').retry(3).expect(200); - assert.equal(response.text, 'Hello Cloud!'); - }); - - it('Service uses the NAME default', async () => { - process.env.NAME = ''; - const response = await request.get('/').retry(3).expect(200); - assert.equal(response.text, 'Hello World!'); - }); -}); From 3183badeef1278965b9f87ea02c47630b29650e2 Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Wed, 21 Feb 2024 12:20:34 -0600 Subject: [PATCH 14/15] chore: move nextjs to new frontend directory --- .../run}/nextjs-helloworld/app/layout.jsx | 0 .../run}/nextjs-helloworld/app/page.jsx | 0 frontend/run/nextjs-helloworld/package.json | 28 +++++ run/nextjs-helloworld/package.json | 22 ---- .../test/e2e_test_cleanup.yaml | 33 ------ .../test/e2e_test_setup.yaml | 55 --------- run/nextjs-helloworld/test/retry.sh | 67 ----------- run/nextjs-helloworld/test/system.test.js | 107 ------------------ 8 files changed, 28 insertions(+), 284 deletions(-) rename {run => frontend/run}/nextjs-helloworld/app/layout.jsx (100%) rename {run => frontend/run}/nextjs-helloworld/app/page.jsx (100%) create mode 100644 frontend/run/nextjs-helloworld/package.json delete mode 100644 run/nextjs-helloworld/package.json delete mode 100644 run/nextjs-helloworld/test/e2e_test_cleanup.yaml delete mode 100644 run/nextjs-helloworld/test/e2e_test_setup.yaml delete mode 100755 run/nextjs-helloworld/test/retry.sh delete mode 100644 run/nextjs-helloworld/test/system.test.js diff --git a/run/nextjs-helloworld/app/layout.jsx b/frontend/run/nextjs-helloworld/app/layout.jsx similarity index 100% rename from run/nextjs-helloworld/app/layout.jsx rename to frontend/run/nextjs-helloworld/app/layout.jsx diff --git a/run/nextjs-helloworld/app/page.jsx b/frontend/run/nextjs-helloworld/app/page.jsx similarity index 100% rename from run/nextjs-helloworld/app/page.jsx rename to frontend/run/nextjs-helloworld/app/page.jsx diff --git a/frontend/run/nextjs-helloworld/package.json b/frontend/run/nextjs-helloworld/package.json new file mode 100644 index 0000000000..2158067ba9 --- /dev/null +++ b/frontend/run/nextjs-helloworld/package.json @@ -0,0 +1,28 @@ +{ + "name": "helloworld", + "description": "Simple hello world sample in Node", + "version": "1.0.0", + "private": true, + "main": "index.js", + "scripts": { + "start": "node index.js", + "test": "c8 mocha -p -j 2 test/app.test.js --exit", + "system-test": "NAME=Cloud c8 mocha -p -j 2 test/system.test.js --timeout=180000" + }, + "type": "module", + "engines": { + "node": ">=16.0.0" + }, + "author": "Google LLC", + "license": "Apache-2.0", + "dependencies": { + "express": "^4.17.1" + }, + "devDependencies": { + "c8": "^9.1.0", + "google-auth-library": "^9.6.3", + "got": "^14.2.0", + "mocha": "^10.3.0", + "supertest": "^6.3.4" + } +} diff --git a/run/nextjs-helloworld/package.json b/run/nextjs-helloworld/package.json deleted file mode 100644 index c31f5b063f..0000000000 --- a/run/nextjs-helloworld/package.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "name": "helloworld", - "description": "Hello world sample in Next.js", - "version": "1.0.0", - "scripts": { - "dev": "next dev --turbo", - "build": "next build", - "start": "next start", - "test": "c8 mocha -p -j 2 test/index.test.js --exit", - "system-test": "NAME=Cloud c8 mocha -p -j 2 test/system.test.js --timeout=180000" - }, - "engines": { - "node": ">=20.0.0" - }, - "author": "Google LLC", - "license": "Apache-2.0", - "dependencies": { - "next": "14.1.0", - "react": "18.2.0", - "react-dom": "18.2.0" - } -} diff --git a/run/nextjs-helloworld/test/e2e_test_cleanup.yaml b/run/nextjs-helloworld/test/e2e_test_cleanup.yaml deleted file mode 100644 index 00d541f04c..0000000000 --- a/run/nextjs-helloworld/test/e2e_test_cleanup.yaml +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 2024 Google LLC. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -steps: - -- id: 'Delete image and service' - name: 'gcr.io/cloud-builders/gcloud' - entrypoint: '/bin/bash' - args: - - '-c' - - | - ./test/retry.sh "gcloud container images describe gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" \ - "gcloud container images delete gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} --quiet" - - ./test/retry.sh "gcloud run services describe ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM}" \ - "gcloud run services delete ${_SERVICE} --region ${_REGION} --platform ${_PLATFORM} --quiet" - -substitutions: - _SERVICE: logging-manual - _VERSION: manual - _REGION: us-central1 - _PLATFORM: managed diff --git a/run/nextjs-helloworld/test/e2e_test_setup.yaml b/run/nextjs-helloworld/test/e2e_test_setup.yaml deleted file mode 100644 index 86b7f689c1..0000000000 --- a/run/nextjs-helloworld/test/e2e_test_setup.yaml +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2024 Google LLC. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -steps: - -- id: 'Build Container Image' - name: 'gcr.io/cloud-builders/docker' - entrypoint: '/bin/bash' - args: - - '-c' - - | - ./test/retry.sh "docker build -t gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} ." - -- id: 'Push Container Image' - name: 'gcr.io/cloud-builders/docker' - entrypoint: '/bin/bash' - args: - - '-c' - - | - ./test/retry.sh "docker push gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION}" - -- id: 'Deploy to Cloud Run' - name: 'gcr.io/cloud-builders/gcloud:latest' - entrypoint: /bin/bash - args: - - '-c' - - | - ./test/retry.sh "gcloud run deploy ${_SERVICE} \ - --image gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} \ - --no-allow-unauthenticated \ - --region ${_REGION} \ - --platform ${_PLATFORM} \ - --set-env-vars NAME=${_NAME}" - - -images: -- gcr.io/${PROJECT_ID}/${_SERVICE}:${_VERSION} - -substitutions: - _SERVICE: nextjs-helloworld - _VERSION: manual - _REGION: us-central1 - _PLATFORM: managed - _NAME: Cloud diff --git a/run/nextjs-helloworld/test/retry.sh b/run/nextjs-helloworld/test/retry.sh deleted file mode 100755 index d5611fbe46..0000000000 --- a/run/nextjs-helloworld/test/retry.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2024 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -## -# retry.sh -# Provides utility function commonly needed across Cloud Build pipelines to -# retry commands on failure. -# -# Usage: -# 1. Retry single command: -# -# ./retry.sh "CMD" -# -# 2. Retry with check: -# -# ./retry.sh "gcloud RESOURCE EXISTS?" "gcloud ACTION" -# -## - -# Usage: try "cmd1" "cmd2" -# If first cmd executes successfully then execute second cmd -runIfSuccessful() { - echo "running: $1" - $($1 > /dev/null) - if [ $? -eq 0 ]; then - echo "running: $2" - $($2 > /dev/null) - fi -} - -# Define max retries -max_attempts=3; -attempt_num=1; - -arg1="$1" -arg2="$2" - -if [ $# -eq 1 ] -then - cmd="$arg1" -else - cmd="runIfSuccessful \"$arg1\" \"$arg2\"" -fi - -until eval $cmd -do - if ((attempt_num==max_attempts)) - then - echo "Attempt $attempt_num / $max_attempts failed! No more retries left!" - exit 1 - else - echo "Attempt $attempt_num / $max_attempts failed!" - sleep $((attempt_num++)) - fi -done diff --git a/run/nextjs-helloworld/test/system.test.js b/run/nextjs-helloworld/test/system.test.js deleted file mode 100644 index af0729743c..0000000000 --- a/run/nextjs-helloworld/test/system.test.js +++ /dev/null @@ -1,107 +0,0 @@ -// Copyright 2024 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// https://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import assert from 'assert'; -import {execSync} from 'child_process'; -import request from 'got'; -import {GoogleAuth} from 'google-auth-library'; -const auth = new GoogleAuth(); - -const get = (route, base_url) => { - if (!ID_TOKEN) { - throw Error('"ID_TOKEN" environment variable is required.'); - } - - return request(new URL(route, base_url.trim()), { - headers: { - Authorization: `${ID_TOKEN.trim()}`, - }, - throwHttpErrors: false, - }); -}; - -let BASE_URL, ID_TOKEN; -describe('End-to-End Tests', () => { - const {GOOGLE_CLOUD_PROJECT} = process.env; - if (!GOOGLE_CLOUD_PROJECT) { - throw Error('"GOOGLE_CLOUD_PROJECT" env var not found.'); - } - let {SERVICE_NAME} = process.env; - if (!SERVICE_NAME) { - SERVICE_NAME = 'helloworld'; - console.log( - `"SERVICE_NAME" env var not found. Defaulting to "${SERVICE_NAME}"` - ); - } - let {NAME} = process.env; - if (!NAME) { - NAME = 'Cloud'; - console.log(`"NAME" env var not found. Defaulting to "${NAME}"`); - } - const {SAMPLE_VERSION} = process.env; - const PLATFORM = 'managed'; - const REGION = 'us-central1'; - before(async () => { - // Deploy service using Cloud Build - let buildCmd = - `gcloud builds submit --project ${GOOGLE_CLOUD_PROJECT} ` + - '--config ./test/e2e_test_setup.yaml ' + - `--substitutions _SERVICE=${SERVICE_NAME},_PLATFORM=${PLATFORM},_REGION=${REGION}` + - `,_NAME=${NAME}`; - if (SAMPLE_VERSION) buildCmd += `,_VERSION=${SAMPLE_VERSION}`; - - console.log('Starting Cloud Build...'); - execSync(buildCmd, {timeout: 240000}); // timeout at 4 mins - console.log('Cloud Build completed.'); - - // Retrieve URL of Cloud Run service - const url = execSync( - `gcloud run services describe ${SERVICE_NAME} --project=${GOOGLE_CLOUD_PROJECT} ` + - `--platform=${PLATFORM} --region=${REGION} --format='value(status.url)'` - ); - - BASE_URL = url.toString('utf-8').trim(); - if (!BASE_URL) throw Error('Cloud Run service URL not found'); - - // Retrieve ID token for testing - const client = await auth.getIdTokenClient(BASE_URL); - const clientHeaders = await client.getRequestHeaders(); - ID_TOKEN = clientHeaders['Authorization'].trim(); - if (!ID_TOKEN) throw Error('Unable to acquire an ID token.'); - }); - - after(() => { - let cleanUpCmd = - `gcloud builds submit --project ${GOOGLE_CLOUD_PROJECT} ` + - '--config ./test/e2e_test_cleanup.yaml ' + - `--substitutions _SERVICE=${SERVICE_NAME},_PLATFORM=${PLATFORM},_REGION=${REGION}`; - if (SAMPLE_VERSION) cleanUpCmd += `,_VERSION=${SAMPLE_VERSION}`; - - execSync(cleanUpCmd); - }); - - it('Service uses the NAME override', async () => { - const response = await get('/', BASE_URL); - assert.strictEqual( - response.statusCode, - 200, - 'Did not fallback to default as expected' - ); - assert.strictEqual( - response.body, - `Hello ${NAME}!`, - `Expected override "${NAME}" not found` - ); - }); -}); From 9751512f5c96f5b9e5b206a484f61ac63542b3bc Mon Sep 17 00:00:00 2001 From: Luke Schlangen Date: Wed, 21 Feb 2024 16:08:09 -0600 Subject: [PATCH 15/15] chore: add region tags --- frontend/run/nextjs-helloworld/app/layout.jsx | 4 ++++ frontend/run/nextjs-helloworld/app/page.jsx | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/frontend/run/nextjs-helloworld/app/layout.jsx b/frontend/run/nextjs-helloworld/app/layout.jsx index d65434211c..7db3f28ba1 100644 --- a/frontend/run/nextjs-helloworld/app/layout.jsx +++ b/frontend/run/nextjs-helloworld/app/layout.jsx @@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License.; +// [START cloudrun_nextjs_helloworld_service] +// [START run_nextjs_helloworld_service] export default function RootLayout({children}) { return ( @@ -19,3 +21,5 @@ export default function RootLayout({children}) { ); } +// [END run_nextjs_helloworld_service] +// [END cloudrun_nextjs_helloworld_service] diff --git a/frontend/run/nextjs-helloworld/app/page.jsx b/frontend/run/nextjs-helloworld/app/page.jsx index 3b95109d22..6171c73360 100644 --- a/frontend/run/nextjs-helloworld/app/page.jsx +++ b/frontend/run/nextjs-helloworld/app/page.jsx @@ -12,6 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. +// [START cloudrun_nextjs_helloworld_service] +// [START run_nextjs_helloworld_service] export default function Page() { return

Hello, Next.js!

; } +// [END run_nextjs_helloworld_service] +// [END cloudrun_nextjs_helloworld_service]