Skip to content

Commit e3b4dec

Browse files
authored
Merge branch 'master' into buffer-redraw
2 parents b9c2819 + 853d2dc commit e3b4dec

Some content is hidden

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

58 files changed

+1130
-257
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ Huge update made by @Remco4EF and @remcoblumink
1616
* Updates dependencies to latest versions
1717
* Updates react usage to 18+
1818
* REMOVED enzyme for tests --> testing does not work atm
19-
19+
* Added option to drag from external element to the timeline
20+
* Added nextjs15 demo to test #939 and removed bundled stylesheet (added somewhere in 0.30.0 reworks...)
2021

2122
## 0.28.0
2223

demo-next/.eslintrc.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": ["next/core-web-vitals", "next/typescript"]
3+
}

demo-next/.gitignore

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/node_modules
5+
/.pnp
6+
.pnp.*
7+
.yarn/*
8+
!.yarn/patches
9+
!.yarn/plugins
10+
!.yarn/releases
11+
!.yarn/versions
12+
13+
# testing
14+
/coverage
15+
16+
# next.js
17+
/.next/
18+
/out/
19+
20+
# production
21+
/build
22+
23+
# misc
24+
.DS_Store
25+
*.pem
26+
27+
# debug
28+
npm-debug.log*
29+
yarn-debug.log*
30+
yarn-error.log*
31+
32+
# env files (can opt-in for committing if needed)
33+
.env*
34+
35+
# vercel
36+
.vercel
37+
38+
# typescript
39+
*.tsbuildinfo
40+
next-env.d.ts

demo-next/README.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
2+
3+
## Getting Started
4+
5+
First, run the development server:
6+
7+
```bash
8+
npm run dev
9+
# or
10+
yarn dev
11+
# or
12+
pnpm dev
13+
# or
14+
bun dev
15+
```
16+
17+
Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
18+
19+
You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
20+
21+
This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
22+
23+
## Learn More
24+
25+
To learn more about Next.js, take a look at the following resources:
26+
27+
- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
28+
- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
29+
30+
You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
31+
32+
## Deploy on Vercel
33+
34+
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.
35+
36+
Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.

demo-next/next.config.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import type { NextConfig } from "next";
2+
import path from 'node:path'
3+
import { resolve } from 'path'
4+
5+
const nextConfig: NextConfig = {
6+
/* config options here */
7+
webpack: (config, { isServer }) => {
8+
config.resolve.alias = {
9+
...config.resolve.alias,
10+
'react-calendar-timeline/dist/Timeline.scss': resolve(__dirname, '../src/lib/Timeline.scss'),
11+
'react-calendar-timeline/style.css': resolve(__dirname, '../dist/style.css'),
12+
'react-calendar-timeline': resolve(__dirname, '../src/index.ts'),
13+
}
14+
return config
15+
}
16+
}
17+
export default nextConfig;

demo-next/package.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"name": "demo-next",
3+
"version": "0.1.0",
4+
"private": true,
5+
"scripts": {
6+
"dev": "next dev",
7+
"build": "next build",
8+
"start": "next start",
9+
"lint": "next lint"
10+
},
11+
"dependencies": {
12+
"next": "15.0.3",
13+
"randomcolor": "^0.6.2",
14+
"react": "19.0.0-rc-66855b96-20241106",
15+
"react-calendar-timeline": "file:../dist/",
16+
"react-dom": "19.0.0-rc-66855b96-20241106"
17+
},
18+
"devDependencies": {
19+
"@types/node": "^20",
20+
"@types/randomcolor": "^0.5.9",
21+
"@types/react": "^18",
22+
"@types/react-dom": "^18",
23+
"eslint": "^8",
24+
"eslint-config-next": "15.0.3",
25+
"typescript": "^5"
26+
}
27+
}

demo-next/public/file.svg

Lines changed: 1 addition & 0 deletions
Loading

demo-next/public/globe.svg

Lines changed: 1 addition & 0 deletions
Loading

demo-next/public/next.svg

Lines changed: 1 addition & 0 deletions
Loading

demo-next/public/vercel.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)