Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update package.json, react-scripts clash with eatlas deps #88

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/explore.R
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ gp_explore <- function(sf = geoplumber::traffic,
gp_build()
}
# TODO: is it free?
# is_port_engated(port = 8000)
# is_port_engaged(port = 8000)
# attempt starting backend in any case
message("Serving data at ", "http://localhost:8000/api/explore")
f <- function(s, p) {s$setDocs(FALSE);s$run(port = p)}
Expand Down
53 changes: 31 additions & 22 deletions inst/js/package.json
Original file line number Diff line number Diff line change
@@ -1,38 +1,47 @@
{
"name": "geoplumber",
"name": "gp_app",
"version": "0.1.0",
"private": true,
"dependencies": {
"leaflet": "^1.4.0",
"prop-types": "^15.6.2",
"react": "^16.7.0",
"react-bootstrap": "^0.32.4",
"react-dom": "^16.7.0",
"react-leaflet": "^2.2.0",
"react-leaflet-control": "^2.1.0",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-scripts": "^3.0.1"
"leaflet": "^1.7.1",
"prop-types": "^15.7.2",
"react": "^16.13.1",
"react-bootstrap": "^1.3.0",
"react-dom": "^16.13.1",
"react-leaflet": "^2.7.0",
"react-leaflet-control": "^2.1.2",
"react-router": "^5.2.0",
"react-router-dom": "^5.2.0",
"react-scripts": "^4.0.3"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"build": "react-scripts --max_old_space_size=4096 build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": "react-app"
},
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
],
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"enzyme": "^3.8.0",
"enzyme-adapter-react-16": "^1.8.0",
"react-test-renderer": "^16.7.0",
"sinon": "^7.2.3"
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.3.2",
"@testing-library/user-event": "^7.1.2",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5",
"react-test-renderer": "^16.13.1",
"sinon": "^9.2.0"
}
}
2 changes: 1 addition & 1 deletion tests/testthat/test-explore.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ test_that("import added", {
expect_message(gp_create(gp))
proj_dir <- read_tempfile()
od <- setwd(proj_dir)
# check import in ther
# check import in there
gp_explore(run = FALSE)
cont <- readLines("src/App.js")
expect_true(any(grepl("Eatlas", cont)))
Expand Down