Skip to content

Commit

Permalink
Merge pull request #600 from encorelab/599-bug-update-rxjs-to-deal-wi…
Browse files Browse the repository at this point in the history
…th-a-dependacy-conflict

599 bug update rxjs to deal with a dependency conflict, 597 Updating Node to version 18, Angular to version 15, dealing with undefined projectId error
  • Loading branch information
markiianbabiak authored Oct 3, 2024
2 parents 938e1f5 + 0d395b8 commit 30a4095
Show file tree
Hide file tree
Showing 118 changed files with 16,009 additions and 35,785 deletions.
10,838 changes: 3,879 additions & 6,959 deletions backend/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@
"@types/crypto-js": "^4.1.1",
"@types/express": "^4.17.13",
"@types/jsonwebtoken": "^8.5.8",
"@types/node": "^17.0.31",
"@types/node": "^18.19.50",
"@types/uuid": "^8.3.4",
"@typescript-eslint/eslint-plugin": "^5.22.0",
"@typescript-eslint/parser": "^5.22.0",
"cross-env": "^7.0.3",
"eslint": "^8.17.0",
"migrate-mongo": "^9.0.0",
"ts-node": "^10.7.0",
"ts-node-dev": "^1.1.8",
"typescript": "^4.6.4"
"ts-node": "^10.9.1",
"ts-node-dev": "^2.0.0",
"typescript": "^4.7.4"
},
"author": "",
"license": "ISC",
Expand Down
17 changes: 0 additions & 17 deletions frontend/.browserslistrc

This file was deleted.

1 change: 1 addition & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ chrome-profiler-events*.json
.history/*

# misc
/.angular/cache
/.sass-cache
/connect.lock
/coverage
Expand Down
42 changes: 33 additions & 9 deletions frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,17 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": [],
"allowedCommonJsDependencies": ["fabric"]
"allowedCommonJsDependencies": [
"fabric"
]
},
"configurations": {
"production": {
Expand Down Expand Up @@ -90,23 +97,40 @@
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"inlineStyleLanguage": "scss",
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
}
}
}
}
},
"defaultProject": "ck-board",
"cli": {
"defaultCollection": "@angular-eslint/schematics",
"analytics": false
"analytics": false,
"schematicCollections": [
"@angular-eslint/schematics"
]
},
"schematics": {
"@angular-eslint/schematics:application": {
"setParserOptionsProject": true
},
"@angular-eslint/schematics:library": {
"setParserOptionsProject": true
}
}
}
Loading

0 comments on commit 30a4095

Please sign in to comment.