Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions apps/meteor/definition/externals/meteor/npm-mongo.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
declare module 'meteor/npm-mongo' {
// The npm-mongo Meteor package re-exports the mongodb driver under this name.
export * as NpmModuleMongodb from 'mongodb';
}
8 changes: 8 additions & 0 deletions apps/meteor/definition/externals/meteor/webapp.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
declare module 'meteor/webapp' {
import type * as express from 'express';

namespace WebApp {
// Present in Meteor 3's generated types but missing from @types/meteor.
const rawHandlers: express.Application;
}
}
4 changes: 3 additions & 1 deletion apps/meteor/server/lib/saml/listener.ts
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,9 @@ const middleware = async function (req: express.Request, res: ServerResponse, ne
};

// Listen to incoming SAML http requests
WebApp.connectHandlers.use(
// In Meteor 3 connectHandlers is an express app (multi-middleware use), but
// @types/meteor still types it as connect.Server (1-2 args).
Comment thread
ggazzo marked this conversation as resolved.
(WebApp.connectHandlers as unknown as express.Application).use(
/^\/_saml/,
bodyParser.json(),
express.urlencoded({
Expand Down
6 changes: 5 additions & 1 deletion apps/meteor/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@
"paths": {
/* Support absolute /imports/* with a leading '/' */
"/*": ["*"],
"meteor/*": ["./node_modules/@types/meteor/*", ".meteor/local/types/packages.d.ts"],
/* No .meteor/local/types/packages.d.ts fallback: its `export =` module
declarations take over the module identity under TS7 and discard the
ambient merges from @types/meteor and definition/externals. Everything
it declared is covered by @types/meteor + definition/externals. */
"meteor/*": ["./node_modules/@types/meteor/*"],
"swiper/modules/index.mjs": ["./node_modules/swiper/types/modules/index.d.ts"],
"swiper/swiper-react.mjs": ["./node_modules/swiper/swiper-react.d.ts"],
},
Expand Down
Loading