Skip to content

Commit

Permalink
Merge branch 'dev' into master-to-be-merged
Browse files Browse the repository at this point in the history
  • Loading branch information
vannizhang committed Sep 28, 2023
2 parents 18d8904 + a61fdda commit 341c46f
Show file tree
Hide file tree
Showing 338 changed files with 26,931 additions and 20,626 deletions.
29 changes: 16 additions & 13 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
module.exports = {
"extends": [
'plugin:react/recommended',
'plugin:@typescript-eslint/recommended',
// Uses eslint-config-prettier to disable ESLint rules from @typescript-eslint/eslint-plugin that would conflict with prettier
'prettier/@typescript-eslint',
// Enables eslint-plugin-prettier and eslint-config-prettier. This will display prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array.
'plugin:prettier/recommended',
],
"env": {
"browser": true
"browser": true,
"es2021": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended"
],
"overrides": [
],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2017,
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": [
"@typescript-eslint/eslint-plugin"
"react",
"@typescript-eslint",
'prettier' // added
],
"rules": {
'prettier/prettier': 'error', // added,
"@typescript-eslint/interface-name-prefix": "off",
"react/prop-types": [2, { ignore: ['children'] }]
"@typescript-eslint/no-namespace": "off"
}
}
}
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npx lint-staged
1 change: 0 additions & 1 deletion .prettierrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
module.exports = {
semi: true,
arrowParens: 'always',
semi: true,
trailingComma: 'es5',
singleQuote: true,
printWidth: 80,
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ npm run build
```

## External Libraries:
- [ArcGIS API for JavaScript (4.20)](https://developers.arcgis.com/javascript/index.html)
- [D3.js v4](https://d3js.org/)
- [ArcGIS API for JavaScript (4.26)](https://developers.arcgis.com/javascript/index.html)
- [D3.js v7](https://d3js.org/)
- [React v18](https://react.dev/blog/2022/03/29/react-v18)

## Resources
- [Wayback - 81 Flavors of World Imagery](https://www.esri.com/arcgis-blog/products/arcgis-living-atlas/imagery/wayback-81-flavors-of-world-imagery/)
Expand Down
Loading

0 comments on commit 341c46f

Please sign in to comment.