From d6dae171ba5a13221067f2b80bfa5135719d5246 Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Thu, 16 Apr 2020 19:31:01 -0700 Subject: [PATCH 01/10] Add linter to CI --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index b675244..370fb31 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,4 +6,5 @@ jobs: steps: - checkout - run: npm install + - run: eslint . - run: npm test From 610e6ed8ed84a27e408d4d0a1ab157b11ddef57d Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Fri, 17 Apr 2020 19:13:40 -0700 Subject: [PATCH 02/10] Attempt adding ESLint Orb for CircleCI --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 370fb31..cf886d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,6 @@ -version: 2 +version: 2.1 +orbs: + eslint: arrai/eslint@1.3.0 jobs: build: docker: From 8cd69e17c2803a3689582ecc85adef794c11aa00 Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Fri, 17 Apr 2020 19:39:23 -0700 Subject: [PATCH 03/10] Initial attempt at manually running ESLint Attempts to manually handle the steps of installing and running eslint without the use of the recommended CircleCI orb. --- .circleci/config.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf886d5..eb2df28 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,12 +1,19 @@ version: 2.1 -orbs: - eslint: arrai/eslint@1.3.0 jobs: build: docker: - image: circleci/node:7 steps: - checkout - - run: npm install - - run: eslint . - - run: npm test + - run: + name: Install project dependencies + command: npm install + - run: + name: Install the latest version of eslint + command: sudo npm install -g eslint + - run: + name: Run eslint + command: eslint --color . + - run: + name: Run test suite + command: npm test From 41ec2afeb15c11a58f55544477bb4e44c60ff8be Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Fri, 17 Apr 2020 20:24:01 -0700 Subject: [PATCH 04/10] Updates to CircleCI Configuration --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index eb2df28..fbb7b1f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,10 +10,10 @@ jobs: command: npm install - run: name: Install the latest version of eslint - command: sudo npm install -g eslint + command: npm install -g eslint - run: name: Run eslint - command: eslint --color . + command: eslint . - run: name: Run test suite command: npm test From 77fdec29b5d6a48bca633e6095effaed59c20498 Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Fri, 17 Apr 2020 20:25:16 -0700 Subject: [PATCH 05/10] Updates README and .git-ignore regarding Node/NPM Adds details to README around usage of Node/NPM, as well as version tracking for out-of-repo dependencies. --- .gitignore | 3 +++ README.md | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/.gitignore b/.gitignore index c35f9a8..85d9ba3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,7 @@ yarn-debug.log* yarn-error.log* package-lock.json +# nodenv local version +.node-version + /.vscode diff --git a/README.md b/README.md index 21ed95e..15e146e 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,17 @@ Travel Map (_aka Geornal_) is a hobby project built as part of the [Project-Unic ## Development +### Dependencies + +All project dependencies, aside from those listed below, are listed within `package.json`. + +| Dependency | Version | +|---|---| +| npm | `6.14.4` | +| node | `12.14.1` | + +It is highly encouraged that you use a Node version manager, such as [nodenv](https://github.com/nodenv/nodenv), to easily manage different projects on your machine which are utilizing npm/node. + ### Getting Started When working on the application locally: From 6c236b3b9753774995fbd79da09f58ca62b89a98 Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Fri, 17 Apr 2020 20:47:38 -0700 Subject: [PATCH 06/10] Updates to Project Deps (around Linter debugging) --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 3b161e5..7820dbe 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "dependencies": { - "@apollo/react-hooks": "^3.1.3", + "@apollo/react-hooks": "^3.1.5", "@urbica/react-map-gl": "^1.12.3", "@urbica/react-map-gl-cluster": "^0.2.0", "apollo-boost": "^0.4.4", @@ -12,7 +12,6 @@ "dotenv": "^8.2.0", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.2", - "eslint-plugin-import": "^2.18.2", "express": "^4.17.1", "express-favicon": "^2.0.1", "express-static": "^1.2.6", @@ -22,20 +21,20 @@ "jwt-decode": "^2.2.0", "lodash": "^4.17.15", "lodash.flowright": "^3.5.0", - "mapbox-gl": "^1.6.1", + "mapbox-gl": "^1.9.1", "node-sass": "^4.13.0", "path": "^0.12.7", "prop-types": "^15.7.2", - "react": "^16.12.0", - "react-apollo": "^3.1.3", - "react-dom": "^16.12.0", + "react": "^16.13.1", + "react-apollo": "^3.1.5", + "react-dom": "^16.13.1", "react-ga": "^2.7.0", "react-map-gl": "^5.1.2", "react-map-gl-geocoder": "^2.0.11", - "react-mapbox-gl": "^4.7.3", + "react-mapbox-gl": "^4.8.3", "react-meta-tags": "^0.7.4", "react-router-dom": "^5.1.2", - "react-scripts": "3.0.1", + "react-scripts": "^3.4.1", "react-simple-maps": "^0.12.1", "socket.io-client": "^2.3.0", "supercluster": "^7.0.0", @@ -76,10 +75,11 @@ "devDependencies": { "babel-jest": "^24.8.0", "enzyme-to-json": "^3.4.4", - "eslint": "^5.16.0", - "eslint-config-airbnb-base": "^13.2.0", + "eslint": "^6.8.0", + "eslint-config-airbnb-base": "^14.1.0", + "eslint-plugin-import": "^2.20.2", "eslint-plugin-jest": "^23.8.2", "husky": "^2.7.0", - "jest": "24.7.1" + "jest": "^24.9.0" } } From 8dcfcc3f078e33da0e90f024b47afca3eed2c018 Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Fri, 17 Apr 2020 20:48:45 -0700 Subject: [PATCH 07/10] Fix for Asset Path Issue May have been introduced by recent package updates; but not sure if this was just introduced in an earlier update. --- src/pages/Profile/subpages/Settings/Basics.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Profile/subpages/Settings/Basics.scss b/src/pages/Profile/subpages/Settings/Basics.scss index 41f9a5c..6c7069e 100644 --- a/src/pages/Profile/subpages/Settings/Basics.scss +++ b/src/pages/Profile/subpages/Settings/Basics.scss @@ -20,7 +20,7 @@ } #birthday { - background: #f8f8fc url("images/arrow_down.png") right no-repeat; + background: #f8f8fc url("../../../../images/arrow_down.png") right no-repeat; } [type="date"]::-webkit-inner-spin-button { From 97df531a390bc1ebdd8b46ec0f3c292df7a49065 Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Fri, 17 Apr 2020 21:00:07 -0700 Subject: [PATCH 08/10] =?UTF-8?q?Proper=20configuration=20for=20project?= =?UTF-8?q?=E2=80=99s=20eslintignore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ensures build and snapshot directories (and contents) are fully ignored. --- .eslintignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.eslintignore b/.eslintignore index 1facb5d..2ecf3d7 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1 +1,4 @@ /src/serviceWorker.js + +/build/* +**/__snapshots__ From 0ccc191070fce6869b4a1fef8111e461b5809d2b Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Fri, 17 Apr 2020 21:01:38 -0700 Subject: [PATCH 09/10] Adds newline on save to project vscode config --- .vscode/settings.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 3d423fd..c14524f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,6 @@ { "files.associations": { "*.js": "javascriptreact" - } + }, + "files.insertFinalNewline": true } From b761e02ac8523759636dc2e33f287dbdb9b811e7 Mon Sep 17 00:00:00 2001 From: Tim Walsh Date: Fri, 17 Apr 2020 21:05:17 -0700 Subject: [PATCH 10/10] Adds sudo to ESLint global instal (CircleCI Step) --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fbb7b1f..75ab329 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,7 +10,7 @@ jobs: command: npm install - run: name: Install the latest version of eslint - command: npm install -g eslint + command: sudo npm install -g eslint - run: name: Run eslint command: eslint .