Skip to content

Commit

Permalink
Merge pull request #308 from labzero/jeffrey/yarn-3
Browse files Browse the repository at this point in the history
Upgrade to Yarn 3
  • Loading branch information
JeffreyATW authored May 10, 2023
2 parents dfe8d0e + a144ad1 commit 3cdf73f
Show file tree
Hide file tree
Showing 7 changed files with 17,653 additions and 11,927 deletions.
13 changes: 11 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,14 @@ test-results.xml
screenshots
Dockerfile.bak

#Docker postgres-data
postgres-data
# Docker postgres-data
postgres-data

# Yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
873 changes: 873 additions & 0 deletions .yarn/releases/yarn-3.5.1.cjs

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.5.1.cjs
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"defaults"
],
"dependencies": {
"@babel/polyfill": "^7.0.0",
"@googlemaps/js-api-loader": "^1.15.1",
"@honeybadger-io/js": "^5.0.0",
"@popperjs/core": "^2.11.7",
Expand All @@ -24,7 +23,7 @@
"connect-flash": "^0.1.1",
"connect-session-sequelize": "^7.1.5",
"cookie-parser": "^1.4.6",
"core-js": "^2.5.4",
"core-js": "^3.30.2",
"cors": "^2.8.3",
"dayjs": "^1.11.7",
"dotenv": "^2.0.0",
Expand Down Expand Up @@ -254,5 +253,6 @@
"serve": "babel-node tools/run runServer || true",
"start": "babel-node tools/run start",
"prepare": "husky install"
}
},
"packageManager": "[email protected]"
}
2 changes: 1 addition & 1 deletion src/styles/globalCss.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* stylelint-disable selector-class-pattern */

@import '../../node_modules/react-geosuggest/module/geosuggest.css';
@import '~react-geosuggest/module/geosuggest.css';
@import './variables';
@import '~bootstrap/scss/bootstrap';

Expand Down
2 changes: 1 addition & 1 deletion test/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

require('global-jsdom/register');

require('@babel/polyfill');
require('core-js/stable');

// eslint-disable-next-line @typescript-eslint/no-var-requires
const { use } = require('chai');
Expand Down
28,681 changes: 16,761 additions & 11,920 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit 3cdf73f

Please sign in to comment.