Skip to content

Commit ebdc91e

Browse files
authored
Merge branch 'development' into alisha/feature-pie-chart-volunteering-fresh
2 parents 59a0389 + fdd5b5c commit ebdc91e

12 files changed

Lines changed: 914 additions & 8 deletions

File tree

babel.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ module.exports = {
1010
useESModules: false,
1111
},
1212
],
13-
['@babel/plugin-transform-logical-assignment-operators'], // <-- needed for ||= and ??=
13+
['@babel/plugin-proposal-logical-assignment-operators'], // needed for ||= and ??=
1414
['module-resolver', { root: './src' }],
1515
],
1616
ignore: [

package-lock.json

Lines changed: 262 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"test:integration": "npm test -- --watch -c jest-integration.config.js",
2121
"test:staged": "npm test --findRelatedTests",
2222
"test:ci": "npm test -- --coverage",
23-
"lint": "eslint ./src --ext .js,.jsx --max-warnings=2000",
24-
"lint:fix": "eslint ./src --ext .js,.jsx --fix",
23+
"lint": "eslint ./src --ext .js,.jsx --max-warnings=2000 --ignore-pattern '**/node_modules/**' --ignore-pattern '**/coverage/**' --ignore-pattern '**/dist/**' --ignore-pattern '**/build/**'",
24+
"lint:fix": "eslint ./src --ext .js,.jsx --fix --ignore-pattern '**/node_modules/**' --ignore-pattern '**/coverage/**' --ignore-pattern '**/dist/**' --ignore-pattern '**/build/**'",
2525
"build": "babel src -d dist && mkdir -p dist/data && cp -r src/data/* dist/data/ 2>/dev/null || true",
2626
"buildw": "babel src -d dist --watch",
2727
"start": "node dist/server.js",
28-
"dev": "nodemon --exec \"babel-node --ignore 'node_modules/(?!@typespec)' src/server.js\"",
28+
"dev": "nodemon --exec \"babel-node --only src src/server.js\"",
2929
"serve": "babel-node src/server.js",
3030
"prepare-macos-linux": "husky install && chmod ug+x .husky/* && chmod ug+x .git/hooks/*",
3131
"prepare": "husky install"
@@ -63,6 +63,7 @@
6363
"supertest": "^6.3.4"
6464
},
6565
"dependencies": {
66+
"@atproto/api": "^0.15.8",
6667
"@aws-sdk/client-s3": "^3.920.0",
6768
"@azure/storage-blob": "^12.26.0",
6869
"@babel/cli": "^7.15.4",
@@ -95,6 +96,7 @@
9596
"dotenv": "^5.0.1",
9697
"dropbox": "^10.34.0",
9798
"express": "^4.22.1",
99+
"express-session": "^1.18.1",
98100
"express-validator": "^7.0.1",
99101
"express-ws": "^5.0.2",
100102
"form-data": "^4.0.5",

src/app.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ app.use(Sentry.Handlers.requestHandler());
1515
require('./startup/compression')(app);
1616
require('./startup/cors')(app);
1717
require('./startup/bodyParser')(app);
18+
require('./startup/session')(app); // Add session before middleware and routes
1819

1920
app.use('/api/test', testRoutes);
2021

0 commit comments

Comments
 (0)