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

BC-5828 - feathers update #4568

Merged
merged 34 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
dbb8b96
BC-5639 - update feathersjs to v5
SevenWaysDP Oct 27, 2023
4ffca6f
BC-5639 - WIP problems
SevenWaysDP Oct 27, 2023
3801f10
BC-5639 - fix configs
SevenWaysDP Oct 27, 2023
ea9daef
fixup! BC-5639 - fix configs
SevenWaysDP Oct 27, 2023
3cf4a9f
BC-5639 - fix binding of service
SevenWaysDP Oct 30, 2023
eeac174
BC-5639 - fix error
SevenWaysDP Oct 30, 2023
e354ba0
BC-5639 - update feathers-hooks-common
SevenWaysDP Oct 30, 2023
47c8a94
BC-5639 - temp fix compilations bug
SevenWaysDP Oct 30, 2023
a03c213
BC-5639 - fix error
SevenWaysDP Nov 1, 2023
1fabfc0
BC-5639 - fix test promise error
SevenWaysDP Nov 1, 2023
edb7e9f
BC-5639 - update express deps
SevenWaysDP Nov 1, 2023
5f313b2
BC-5639 - fix tests
SevenWaysDP Nov 3, 2023
22a1ba8
uncomment sync account functions
virgilchiriac Nov 3, 2023
8e1569c
some cleanup
virgilchiriac Nov 14, 2023
11f85a1
Merge branch 'main' into bc-5639-poc-feathers-update
virgilchiriac Nov 14, 2023
7a9c7db
BC-5639 - try to fix calendar
virgilchiriac Nov 14, 2023
9d92307
BC-5639 - fix some tests
virgilchiriac Nov 16, 2023
a904613
BC-5639 - fix errors
virgilchiriac Nov 20, 2023
3d0a5f0
BC-5639 - skip oauth tests (service is fully migrated to nest)
virgilchiriac Nov 20, 2023
442d3ce
Merge branch 'main' into BC-5828-feathers-update
virgilchiriac Nov 22, 2023
d52b031
fix permission tests
virgilchiriac Nov 22, 2023
fe97c02
Merge branch 'main' into BC-5828-feathers-update
virgilchiriac Nov 22, 2023
53fa31b
Merge branch 'main' into BC-5828-feathers-update
SevenWaysDP Nov 24, 2023
22cdc5f
undo hydra url config
virgilchiriac Nov 28, 2023
28a3186
update feathers and remove skipLibCheck
virgilchiriac Nov 29, 2023
4f46ca6
Merge branch 'main' into BC-5828-feathers-update
virgilchiriac Nov 29, 2023
b5c18df
exclude feathers error declaration and explicitly add ws package
virgilchiriac Nov 29, 2023
b7cc15c
Merge branch 'main' into BC-5828-feathers-update
virgilchiriac Nov 30, 2023
89ed51b
Merge branch 'main' into BC-5828-feathers-update
virgilchiriac Dec 5, 2023
dd5ce7e
revert
virgilchiriac Dec 5, 2023
2baede8
ignore broken feathers reference definition
virgilchiriac Dec 4, 2023
439397d
Revert "revert"
virgilchiriac Dec 5, 2023
6e8a225
fix mess
virgilchiriac Dec 5, 2023
5aae5d0
Merge branch 'main' into BC-5828-feathers-update
virgilchiriac Dec 6, 2023
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
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ COPY src /schulcloud-server/src
COPY apps /schulcloud-server/apps
COPY --from=git /app/serverversion /schulcloud-server/apps/server/static-assets
COPY scripts/ldapSync.sh /schulcloud-server/scripts/
COPY add-ts-nocheck.js /schulcloud-server/
RUN npm run build

ENV NODE_ENV=production
Expand Down
39 changes: 39 additions & 0 deletions add-ts-nocheck.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
ignore the typescript error in the feathersjs ts declarations
using "skipLibCheck": true in tsconfig.json is not wanted for a single declaration error
references:
https://github.com/feathersjs/feathers/discussions/3351
https://github.com/microsoft/TypeScript/issues/38538

usage: node add-ts-nocheck.js in package.json scripts
*/
const fs = require('fs');

const ADDED_STR = '// @ts-nocheck\n\n';
const FILES = ['node_modules/@feathersjs/express/lib/declarations.d.ts'];

Promise.allSettled(FILES.map(addTsNoCheck)).then((results) => {
let hasErrors = false;

for (const result of results) {
if (result.status === 'rejected') {
hasErrors = true;
console.error(result.reason);
}
}

if (hasErrors) {
process.exit(1);
}
});

async function addTsNoCheck(file) {
const content = fs.readFileSync(file).toString();

if (content.includes(ADDED_STR)) {
console.log(JSON.stringify(ADDED_STR), 'is already in', file);
} else {
fs.writeFileSync(file, ADDED_STR + content);
console.log(JSON.stringify(ADDED_STR), 'added into', file);
}
}
Loading
Loading