Skip to content

Commit 84be541

Browse files
committed
Merge remote-tracking branch 'origin/main' into nickytonline/add-long-lat-to-geo
2 parents ac259b4 + ae067fa commit 84be541

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+5233
-198
lines changed

.github/workflows/e2e-next.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Next.js e2e test suite
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [main]
7+
8+
jobs:
9+
test:
10+
name: E2E tests
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Installing with LTS Node.js
15+
uses: actions/setup-node@v2
16+
with:
17+
node-version: 'lts/*'
18+
- name: NPM Install
19+
run: npm install
20+
- name: Run Next.js e2e test suite
21+
run: npm run test:next
22+
env:
23+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_BOT_AUTH_TOKEN }}
24+
NETLIFY_SITE_ID: 1d5a5c76-d445-4ae5-b694-b0d3f2e2c395

demos/default/hello.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
world
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import Link from 'next/link'
2+
import path from 'path'
3+
import fs from 'fs'
4+
5+
export async function getServerSideProps() {
6+
const text = fs.readFileSync(path.join(process.cwd(), 'hello.txt'), 'utf8').trim()
7+
8+
return {
9+
props: {
10+
world: text,
11+
time: new Date().getTime(),
12+
},
13+
}
14+
}
15+
16+
const File = ({ world, time }) => (
17+
<>
18+
<p>hello {world}</p>
19+
<span id="anotherTime">time: {time}</span>
20+
<Link href="/" id="home">
21+
to home
22+
</Link>
23+
<br />
24+
<Link href="/something" id="something">
25+
to something
26+
</Link>
27+
</>
28+
)
29+
export default File

demos/nx-next-monorepo-demo/package-lock.json

Lines changed: 252 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)