Skip to content

Commit dc8c119

Browse files
Merge pull request #307 from oslabs-beta/main
Merging Reactime v18 into OS Labs main, initial
2 parents 4ff74dd + 50364bf commit dc8c119

File tree

180 files changed

+9952
-15278
lines changed

Some content is hidden

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

180 files changed

+9952
-15278
lines changed

.eslintrc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"extends": [
3-
"airbnb",
3+
"airbnb",
44
"plugin:jest/recommended",
55
"plugin:@typescript-eslint/eslint-recommended",
6-
"plugin:@typescript-eslint/recommended"],
6+
"plugin:@typescript-eslint/recommended"
7+
],
78
"root": true,
89
"plugins": ["jest", "react", "react-hooks", "@typescript-eslint"],
910
"rules": {
@@ -13,7 +14,8 @@
1314
"react-hooks/rules-of-hooks": "error", // Checks rules of Hooks
1415
"react-hooks/exhaustive-deps": "warn", // Checks effect dependencies
1516
"react/jsx-filename-extension": [0],
16-
"linebreak-style": "off"
17+
"linebreak-style": "off",
18+
"max-len": [{ "ignoreComments": true }]
1719
},
1820
"env": {
1921
"es6": true,
@@ -33,4 +35,4 @@
3335
"ecmaVersion": 2018,
3436
"sourceType": "module"
3537
}
36-
}
38+
}

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ node_modules/
55
.DS_Store
66
src/extension/build/bundles
77
package/reactime-*.tgz
8-
tictactoe
98
parents
109
coverage
1110
src/extension/build.zip
@@ -15,4 +14,5 @@ bower_components
1514
sandboxes/manual-tests/NextJS/.next
1615
.vscode
1716
src/app/components/Map.tsx
18-
package-lock.json
17+
package-lock.json
18+
yarn.lock

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "tests/manual-tests/recoilTest"]
22
path = tests/manual-tests/recoilTest
33
url = https://github.com/kevinfey/recoilTest
4+
[submodule "reactime-website"]
5+
path = reactime-website
6+
url = https://github.com/reactimetravel/reactime-website

.prettierrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"printWidth": 100,
3+
"semi": true,
4+
"singleQuote": true,
5+
"jsxSingleQuote": true,
6+
"tabWidth": 2,
7+
"bracketSpacing": true,
8+
"trailingComma": "all"
9+
}

demo-app-next/.gitignore

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
2+
3+
# dependencies
4+
/node_modules
5+
/.pnp
6+
.pnp.js
7+
8+
# testing
9+
/coverage
10+
11+
# next.js
12+
/.next/
13+
/out/
14+
15+
# production
16+
/build
17+
18+
# misc
19+
.DS_Store
20+
21+
# debug
22+
npm-debug.log*
23+
yarn-debug.log*
24+
yarn-error.log*
25+
26+
# local env files
27+
.env.local
28+
.env.development.local
29+
.env.test.local
30+
.env.production.local

demo-app-next/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This is a starter template for [Learn Next.js](https://nextjs.org/learn).

demo-app-next/next-env.d.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/// <reference types="next" />
2+
/// <reference types="next/image-types/global" />
3+
4+
// NOTE: This file should not be edited
5+
// see https://nextjs.org/docs/basic-features/typescript for more information.

demo-app-next/package.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"private": true,
3+
"scripts": {
4+
"dev": "next dev",
5+
"build": "next build",
6+
"start": "next start"
7+
},
8+
"dependencies": {
9+
"next": "latest",
10+
"react": "18.2.0",
11+
"react-dom": "18.2.0"
12+
},
13+
"devDependencies": {
14+
"@types/node": "18.15.0",
15+
"@types/react": "18.0.28",
16+
"typescript": "4.9.5"
17+
}
18+
}

demo-app-next/public/favicon.ico

14.7 KB
Binary file not shown.

demo-app-next/public/vercel.svg

Lines changed: 4 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)