@maka/maka-cli 5.3.11 → 5.3.13

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.3.11",
+  "version": "5.3.13",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",

package/bundle/typescript/src/templates/meteor/app/client/main.js.ts

@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 window.onbeforeunload = () => {
   if (Meteor.settings.public.logoutOnClose === true && Meteor.logout) {
     Meteor.logout();

package/bundle/typescript/src/templates/meteor/app/client/main.js.tsx

@@ -1,3 +1,5 @@
+import { Meteor } from 'meteor/meteor';
+
 window.onbeforeunload = () => {
   if (Meteor.settings.public.logoutOnClose === true && Meteor.logout) {
     Meteor.logout();

package/bundle/typescript/src/templates/meteor/app/maka.d.ts

@@ -1,5 +1,25 @@
 interface Window { cordova: any; }
 
+declare module "*.css";
+
+// Meteor's server-injected runtime config global. Genuinely undocumented --
+// not part of @types/meteor's app-facing API coverage.
+declare var __meteor_runtime_config__: any;
+
+// No official types; not covered by @types/meteor.
+declare module 'meteor/autoupdate' {
+  export const Autoupdate: any;
+}
+
+// Adds the one real WebApp member @types/meteor doesn't have yet. This
+// merges additively with @types/meteor's own `declare module "meteor/webapp"`
+// -- it must not redeclare anything already defined there.
+declare module 'meteor/webapp' {
+  namespace WebApp {
+    function addHtmlAttributeHook(callback: (request?: any) => Record<string, string>): void;
+  }
+}
+
 declare module 'meteor/maka:http' {
     export const HTTP: {
     /**
@@ -147,10 +167,18 @@ declare module 'meteor/maka:http' {
 
 declare module 'meteor/maka:rest' {
   import { IncomingMessage, ServerResponse } from 'http';
-  import { RateLimiterMemory, RateLimiterRedis, IRateLimiterOptions } from 'rate-limiter-flexible';
-  import { RedisClientType } from '@redis/client';
   import { Meteor } from 'meteor/meteor';
 
+  // rate-limiter-flexible and @redis/client are optional peer packages used
+  // only by maka:rest's rate-limiting feature -- they're bundled by the
+  // Meteor package itself, not something every app needs to npm install
+  // just to typecheck. Typed as `any` rather than pulling those packages in
+  // as devDependencies for every scaffolded project.
+  type IRateLimiterOptions = any;
+  type RateLimiterMemory = any;
+  type RateLimiterRedis = any;
+  type RedisClientType = any;
+
   export type LoginType = 'default' | null;
 
   export interface MakaRestOptions {

package/bundle/typescript/src/templates/meteor/app/meteor.d.ts

@@ -1,35 +1,21 @@
 /**
- * These are the common (for client and server) modules and interfaces that can't be automatically generated from the Meteor data.js file
+ * @types/meteor now provides comprehensive, actively-maintained coverage for
+ * all of Meteor's core packages (meteor, mongo, ddp, http, random, blaze,
+ * browser-policy-common, accounts-base, tracker, reactive-var, tiny-test,
+ * email, ejson, and more). This file used to hand-roll ambient types for all
+ * of those too, which -- since TypeScript merges multiple `declare module`
+ * blocks for the same module specifier -- collided with @types/meteor's real
+ * (and differently-shaped) declarations rather than replacing them, breaking
+ * `tsc` outright with dozens of duplicate-identifier/conflicting-type errors.
+ * What's left here is only what @types/meteor genuinely doesn't cover:
+ * community packages without official types, and Meteor's build-time
+ * (package.js / mobile-config.js) globals, which are a different API surface
+ * than the app-runtime types @types/meteor focuses on.
  */
 
-// Needed for testing.
-declare let require: Function;
-declare let beforeEach: Function;
-declare let afterEach: Function;
-declare let it: Function;
-declare let describe: Function;
-declare let assert: any;
-declare let equal: any;
-declare let Map: MapConstructor;
-declare let Meteor: any;
-
-// TODO: These should be worked out ...
-declare module 'meteor/react-meteor-data';
+// Community packages with no official type definitions.
 declare module 'meteor/mdg:validated-method';
 declare module 'meteor/apollo';
-declare module 'meteor/server-render';
-declare module 'meteor/underscore';
-declare module 'meteor/ddp-rate-limiter';
-declare module 'meteor/check';
-declare module 'meteor/webapp';
-
-interface EJSONable {
-  [key: string]: number | string | boolean | object | number[] | string[] | object[] | Date | Uint8Array | EJSON.CustomType;
-}
-interface JSONable {
-  [key: string]: number | string | boolean | object | number[] | string[] | object[];
-}
-type EJSON = EJSONable
 
 declare module "meteor/match" {
   export namespace Match {
@@ -47,279 +33,8 @@ declare module "meteor/match" {
   }
 }
 
-
-declare module "meteor/meteor" {
-  export namespace Meteor {
-    export var isDevelopment: any;
-    export var isServer: any;
-    export var isClient: any;
-
-    interface UserEmail {
-      address: string;
-      verified: boolean;
-    }
-
-    interface User {
-      _id?: string;
-      username?: string;
-      emails?: Meteor.UserEmail[];
-      createdAt?: number;
-      profile?: any;
-      services?: any;
-    }
-
-    enum StatusEnum {
-      connected,
-      connecting,
-      failed,
-      waiting,
-      offline
-    }
-
-    interface LiveQueryHandle {
-      stop(): void;
-    }
-  }
-}
-
-declare module "meteor/ddp" {
-  import { Meteor } from "meteor/meteor";
-
-  export namespace DDP {
-    interface DDPStatic {
-      subscribe(name: string, ...rest: any[]): Meteor.SubscriptionHandle;
-      call(method: string, ...parameters: any[]): void;
-      apply(method: string, ...parameters: any[]): void;
-      methods(IMeteorMethodsDictionary: any): any;
-      status(): DDPStatus;
-      reconnect(): void;
-      disconnect(): void;
-      onReconnect(): void;
-    }
-
-    interface DDPStatus {
-      connected: boolean;
-      status: Meteor.StatusEnum;
-      retryCount: number;
-      //To turn this into an interval until the next reconnection, use retryTime - (new Date()).getTime()
-      retryTime?: number;
-      reason?: string;
-    }
-  }
-}
-
-declare module "meteor/mongo" {
-  export namespace Mongo {
-    interface Selector {
-      [key: string]: any;
-    }
-    type Selector = object
-    interface Modifier { }
-    interface SortSpecifier { }
-    interface FieldSpecifier {
-      [id: string]: number;
-    }
-  }
-}
-
-declare module "meteor/http" {
-  export namespace HTTP {
-
-    interface HTTPRequest {
-      content?: string;
-      data?: any;
-      query?: string;
-      params?: { [id: string]: string };
-      auth?: string;
-      headers?: { [id: string]: string };
-      timeout?: number;
-      followRedirects?: boolean;
-    }
-
-    interface HTTPResponse {
-      statusCode?: number;
-      headers?: { [id: string]: string };
-      content?: string;
-      data?: any;
-    }
-
-    function call(method: string, url: string, options?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-    function del(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-    function get(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-    function post(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-    function put(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-  }
-}
-
-declare module "meteor/random" {
-  export namespace Random {
-    function id(numberOfChars?: number): string;
-    function secret(numberOfChars?: number): string;
-    function fraction(): number;
-    function hexString(numberOfDigits: number): string; // @param numberOfDigits, @returns a random hex string of the given length
-    function choice(array: any[]): string; // @param array, @return a random element in array
-    function choice(str: string): string; // @param str, @return a random char in str
-  }
-}
-
-/**
- * These are the client modules and interfaces that can't be automatically generated from the Meteor data.js file
- */
-
-declare module "meteor/meteor" {
-  import { Blaze } from "meteor/blaze";
-
-  export namespace Meteor {
-    /** Start definitions for Template **/
-    interface Event {
-      type: string;
-      target: HTMLElement;
-      currentTarget: HTMLElement;
-      which: number;
-      stopPropagation(): void;
-      stopImmediatePropagation(): void;
-      preventDefault(): void;
-      isPropagationStopped(): boolean;
-      isImmediatePropagationStopped(): boolean;
-      isDefaultPrevented(): boolean;
-    }
-
-    interface EventHandlerFunction extends Function {
-      (event?: Meteor.Event, templateInstance?: Blaze.TemplateInstance): void;
-    }
-
-    interface EventMap {
-      [id: string]: Meteor.EventHandlerFunction;
-    }
-    /** End definitions for Template **/
-
-    interface LoginWithExternalServiceOptions {
-      requestPermissions?: string[];
-      requestOfflineToken?: boolean;
-      forceApprovalPrompt?: boolean;
-      userEmail?: string;
-      loginStyle?: string;
-    }
-
-    function loginWithMeteorDeveloperAccount(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-    function loginWithFacebook(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-    function loginWithGithub(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-    function loginWithGoogle(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-    function loginWithMeetup(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-    function loginWithTwitter(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-    function loginWithWeibo(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-
-    interface SubscriptionHandle {
-      stop(): void;
-      ready(): boolean;
-    }
-  }
-}
-
-declare module "meteor/blaze" {
-  export namespace Blaze {
-    interface View {
-      name: string;
-      parentView: Blaze.View;
-      isCreated: boolean;
-      isRendered: boolean;
-      isDestroyed: boolean;
-      renderCount: number;
-      autorun(runFunc: Function): void;
-      onViewCreated(func: Function): void;
-      onViewReady(func: Function): void;
-      onViewDestroyed(func: Function): void;
-      firstNode(): Node;
-      lastNode(): Node;
-      template: Blaze.Template;
-      templateInstance(): any;
-    }
-    interface Template {
-      viewName: string;
-      renderFunction: Function;
-      constructView(): Blaze.View;
-    }
-  }
-}
-
-declare module "meteor/browser-policy" {
-  export namespace BrowserPolicy {
-
-    interface framing {
-      disallow(): void;
-      restrictToOrigin(origin: string): void;
-      allowAll(): void;
-    }
-    interface content {
-      allowEval(): void;
-      allowInlineStyles(): void;
-      allowInlineScripts(): void;
-      allowSameOriginForAll(): void;
-      allowDataUrlForAll(): void;
-      allowOriginForAll(origin: string): void;
-      allowImageOrigin(origin: string): void;
-      allowFrameOrigin(origin: string): void;
-      allowContentTypeSniffing(): void;
-      allowAllContentOrigin(): void;
-      allowAllContentDataUrl(): void;
-      allowAllContentSameOrigin(): void;
-
-      disallowAll(): void;
-      disallowInlineStyles(): void;
-      disallowEval(): void;
-      disallowInlineScripts(): void;
-      disallowFont(): void;
-      disallowObject(): void;
-      disallowAllContent(): void;
-      //TODO: add the basic content types
-      // allow<content type>Origin(origin)
-      // allow<content type>DataUrl()
-      // allow<content type>SameOrigin()
-      // disallow<content type>()
-    }
-  }
-}
-
-
-/**
- * These are the server modules and interfaces that can't be automatically generated from the Meteor data.js file
- */
-
-declare module "meteor/meteor" {
-  export namespace Meteor {
-    interface EmailFields {
-      subject?: Function;
-      text?: Function;
-    }
-
-    interface EmailTemplates {
-      from: string;
-      siteName: string;
-      resetPassword: Meteor.EmailFields;
-      enrollAccount: Meteor.EmailFields;
-      verifyEmail: Meteor.EmailFields;
-    }
-
-    interface Connection {
-      id: string;
-      close: Function;
-      onClose: Function;
-      clientAddress: string;
-      httpHeaders: object;
-    }
-  }
-}
-
-declare module "meteor/mongo" {
-  export namespace Mongo {
-    interface AllowDenyOptions {
-      insert?: (userId: string, doc: any) => boolean;
-      update?: (userId: string, doc: any, fieldNames: string[], modifier: any) => boolean;
-      remove?: (userId: string, doc: any) => boolean;
-      fetch?: string[];
-      transform?: Function;
-    }
-  }
+interface EJSONable {
+  [key: string]: number | string | boolean | object | number[] | string[] | object[] | Date | Uint8Array;
 }
 
 interface MailComposerOptions {
@@ -340,118 +55,12 @@ interface MailComposer {
   streamMessage(): void;
   pipe(stream: any /** fs.WriteStream **/): void;
 }
+
 /**
- * These are the modules and interfaces for packages that can't be automatically generated from the Meteor data.js file
+ * Build-time globals available in package.js / mobile-config.js, which fall
+ * outside @types/meteor's app-runtime coverage.
  */
 
-interface ILengthAble {
-  length: number;
-}
-
-interface ITinytestAssertions {
-  ok(doc: object): void;
-  expect_fail(): void;
-  fail(doc: object): void;
-  runId(): string;
-  equal<T>(actual: T, expected: T, message?: string, not?: boolean): void;
-  notEqual<T>(actual: T, expected: T, message?: string): void;
-  instanceOf(obj: object, klass: Function, message?: string): void;
-  notInstanceOf(obj: object, klass: Function, message?: string): void;
-  matches(actual: any, regexp: RegExp, message?: string): void;
-  notMatches(actual: any, regexp: RegExp, message?: string): void;
-  throws(f: Function, expected?: string | RegExp): void;
-  isTrue(v: boolean, msg?: string): void;
-  isFalse(v: boolean, msg?: string): void;
-  isNull(v: any, msg?: string): void;
-  isNotNull(v: any, msg?: string): void;
-  isUndefined(v: any, msg?: string): void;
-  isNotUndefined(v: any, msg?: string): void;
-  isNan(v: any, msg?: string): void;
-  isNotNan(v: any, msg?: string): void;
-  include<T>(s: Array<T> | object | string, value: any, msg?: string, not?: boolean): void;
-
-  notInclude<T>(s: Array<T> | object | string, value: any, msg?: string, not?: boolean): void;
-  length(obj: ILengthAble, expected_length: number, msg?: string): void;
-  _stringEqual(actual: string, expected: string, msg?: string): void;
-}
-
-declare module "meteor/tiny-test" {
-  export namespace Tinytest {
-    function add(description: string, func: (test: ITinytestAssertions) => void): void;
-    function addAsync(description: string, func: (test: ITinytestAssertions) => void): void;
-  }
-}
-
-
-// Kept in for backwards compatibility
-declare module "meteor/meteor" {
-  export namespace Meteor {
-    interface Tinytest {
-      add(description: string, func: (test: ITinytestAssertions) => void): void;
-      addAsync(description: string, func: (test: ITinytestAssertions) => void): void;
-    }
-  }
-}
-
-declare module "meteor/accounts-base" {
-  import { Meteor } from "meteor/meteor";
-
-  export namespace Accounts {
-    function addEmail(userId: string, newEmail: string, verified?: boolean): void;
-    function changePassword(oldPassword: string, newPassword: string, callback?: Function): void;
-    function createUser(options: {
-      username?: string;
-      email?: string;
-      password?: string;
-      profile?: object;
-    }, callback?: Function): string;
-    var emailTemplates: Meteor.EmailTemplates;
-    function findUserByEmail(email: string): object;
-    function findUserByUsername(username: string): object;
-    function forgotPassword(options: {
-      email?: string;
-    }, callback?: Function): void;
-    function onEmailVerificationLink(callback: Function): void;
-    function onEnrollmentLink(callback: Function): void;
-    function onResetPasswordLink(callback: Function): void;
-    function removeEmail(userId: string, email: string): void;
-    function resetPassword(token: string, newPassword: string, callback?: Function): void;
-    function sendEnrollmentEmail(userId: string, email?: string): void;
-    function sendResetPasswordEmail(userId: string, email?: string): void;
-    function sendVerificationEmail(userId: string, email?: string): void;
-    function setPassword(userId: string, newPassword: string, options?: {
-      logout?: object;
-    }): void;
-    function setUsername(userId: string, newUsername: string): void;
-    var ui: {
-      config(options: {
-        requestPermissions?: object;
-        requestOfflineToken?: object;
-        forceApprovalPrompt?: object;
-        passwordSignupFields?: string;
-      }): void;
-    };
-    function verifyEmail(token: string, callback?: Function): void;
-    function config(options: {
-      sendVerificationEmail?: boolean;
-      forbidClientAccountCreation?: boolean;
-      restrictCreationByEmailDomain?: string | Function;
-      loginExpirationInDays?: number;
-      oauthSecretKey?: string;
-    }): void;
-    function onLogin(func: Function): { stop: () => void };
-    function onLoginFailure(func: Function): { stop: () => void };
-    function user(): Meteor.User;
-    function userId(): string;
-    function loggingIn(): boolean;
-    function logout(callback?: Function): void;
-    function logoutOtherClients(callback?: Function): void;
-    function onCreateUser(func: Function): void;
-    function validateLoginAttempt(func: Function): { stop: () => void };
-    function validateNewUser(func: Function): boolean;
-  }
-}
-
 declare namespace App {
   function accessRule(domainRule: string, options?: {
     launchExternal?: boolean;
@@ -472,252 +81,14 @@ declare namespace App {
 }
 
 declare namespace Assets {
-  function getBinary(assetPath: string, asyncCallback?: Function): EJSON;
+  function getBinary(assetPath: string, asyncCallback?: Function): any;
   function getText(assetPath: string, asyncCallback?: Function): string;
 }
 
-declare module "meteor/blaze" {
-  import { Meteor } from "meteor/meteor";
-  export namespace Blaze {
-    function Each(argFunc: Function, contentFunc: Function, elseFunc?: Function): Blaze.View;
-    function If(conditionFunc: Function, contentFunc: Function, elseFunc?: Function): Blaze.View;
-    function Let(bindings: Function, contentFunc: Function): Blaze.View;
-    var Template: TemplateStatic;
-    interface TemplateStatic {
-      new (viewName?: string, renderFunction?: Function): Template;
-      // It should be [templateName: string]: TemplateInstance but this is not possible -- user will need to cast to TemplateInstance
-      [templateName: string]: any | Template; // added "any" to make it work
-      head: Template;
-      find(selector: string): Blaze.Template;
-      findAll(selector: string): Blaze.Template[];
-      $: any;
-    }
-    interface Template {
-    }
-
-    var TemplateInstance: TemplateInstanceStatic;
-    interface TemplateInstanceStatic {
-      new (view: Blaze.View): TemplateInstance;
-    }
-    interface TemplateInstance {
-      $(selector: string): any;
-      autorun(runFunc: Function): object;
-      data: object;
-      find(selector?: string): Blaze.TemplateInstance;
-      findAll(selector: string): Blaze.TemplateInstance[];
-      firstNode: object;
-      lastNode: object;
-      subscribe(name: string, ...args: any[]): Meteor.SubscriptionHandle;
-      subscriptionsReady(): boolean;
-      view: object;
-    }
-
-    function Unless(conditionFunc: Function, contentFunc: Function, elseFunc?: Function): Blaze.View;
-    var View: ViewStatic;
-    interface ViewStatic {
-      new (name?: string, renderFunction?: Function): View;
-    }
-    interface View {
-    }
-
-    function With(data: object | Function, contentFunc: Function): Blaze.View;
-    var currentView: Blaze.View;
-    function getData(elementOrView?: HTMLElement | Blaze.View): object;
-    function getView(element?: HTMLElement): Blaze.View;
-    function isTemplate(value: any): boolean;
-    function remove(renderedView: Blaze.View): void;
-    function render(templateOrView: Template | Blaze.View, parentNode: Node, nextNode?: Node, parentView?: Blaze.View): Blaze.View;
-    function renderWithData(templateOrView: Template | Blaze.View, data: object | Function, parentNode: Node, nextNode?: Node, parentView?: Blaze.View): Blaze.View;
-    function toHTML(templateOrView: Template | Blaze.View): string;
-    function toHTMLWithData(templateOrView: Template | Blaze.View, data: object | Function): string;
-  }
-}
-
 declare namespace Cordova {
   function depends(dependencies: { [id: string]: string }): void;
 }
 
-declare module "meteor/ddp" {
-  export namespace DDP {
-    function connect(url: string): DDP.DDPStatic;
-  }
-}
-
-declare namespace DDPCommon {
-  function MethodInvocation(options: {
-  }): any;
-}
-
-declare namespace EJSON {
-  var CustomType: CustomTypeStatic;
-  interface CustomTypeStatic {
-    new (): CustomType;
-  }
-  interface CustomType {
-    clone(): EJSON.CustomType;
-    equals(other: object): boolean;
-    toJSONValue(): JSONable;
-    typeName(): string;
-  }
-
-  function addType(name: string, factory: (val: JSONable) => EJSON.CustomType): void;
-  function clone<T>(val: T): T;
-  function equals(a: EJSON, b: EJSON, options?: {
-    keyOrderSensitive?: boolean;
-  }): boolean;
-  function fromJSONValue(val: JSONable): any;
-  function isBinary(x: object): boolean;
-  var newBinary: any;
-  function parse(str: string): EJSON;
-  function stringify(val: EJSON, options?: {
-    indent?: boolean | number | string;
-    canonical?: boolean;
-  }): string;
-  function toJSONValue(val: EJSON): JSONable;
-}
-
-declare namespace Match {
-  function test(value: any, pattern: any): boolean;
-}
-
-declare module "meteor/meteor" {
-  import { Mongo } from "meteor/mongo";
-
-  export namespace Meteor {
-    var Error: ErrorStatic;
-    interface ErrorStatic {
-      new (error: string | number, reason?: string, details?: string): Error;
-    }
-    interface Error {
-      error: string | number;
-      reason?: string;
-      details?: string;
-    }
-    function absoluteUrl(path?: string, options?: {
-      secure?: boolean;
-      replaceLocalhost?: boolean;
-      rootUrl?: string;
-    }): string;
-    function apply(name: string, args: EJSONable[], options?: {
-      wait?: boolean;
-      onResultReceived?: Function;
-    }, asyncCallback?: Function): any;
-    function call(name: string, ...args: any[]): any;
-    function clearInterval(id: number): void;
-    function clearTimeout(id: number): void;
-    function disconnect(): void;
-    var isClient: any;
-    var isCordova: boolean;
-    var isServer: any;
-    function loggingIn(): boolean;
-    function loginWith<ExternalService>(options?: {
-      requestPermissions?: string[];
-      requestOfflineToken?: boolean;
-      loginUrlParameters?: object;
-      userEmail?: string;
-      loginStyle?: string;
-      redirectUrl?: string;
-    }, callback?: Function): void;
-    function loginWithPassword(user: object | string, password: string, callback?: Function): void;
-    function logout(callback?: Function): void;
-    function logoutOtherClients(callback?: Function): void;
-    function methods(methods: object): void;
-    function onConnection(callback: Function): void;
-    function publish(name: string, func: Function): void;
-    function reconnect(): void;
-    var release: string;
-    function setInterval(func: Function, delay: number): number;
-    function setTimeout(func: Function, delay: number): number;
-    var settings: { [id: string]: any };
-    function startup(func: Function): void;
-    function status(): Meteor.StatusEnum;
-    function subscribe(name: string, ...args: any[]): Meteor.SubscriptionHandle;
-    function user(): Meteor.User;
-    function userId(): string;
-    var users: Mongo.Collection<User>;
-    function wrapAsync(func: Function, context?: object): any;
-  }
-}
-
-declare module "meteor/mongo" {
-  import { Meteor } from "meteor/meteor";
-
-  export namespace Mongo {
-    var Collection: CollectionStatic;
-    interface CollectionStatic {
-      new <T>(name: string, options?: {
-        connection?: object;
-        idGeneration?: string;
-        transform?: Function;
-      }): Collection<T>;
-    }
-    interface Collection<T> {
-      allow(options: {
-        insert?: (userId: string, doc: T) => boolean;
-        update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
-        remove?: (userId: string, doc: T) => boolean;
-        fetch?: string[];
-        transform?: Function;
-      }): boolean;
-      deny(options: {
-        insert?: (userId: string, doc: T) => boolean;
-        update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
-        remove?: (userId: string, doc: T) => boolean;
-        fetch?: string[];
-        transform?: Function;
-      }): boolean;
-      find(selector?: Mongo.Selector | Mongo.ObjectID | string, options?: {
-        sort?: Mongo.SortSpecifier;
-        skip?: number;
-        limit?: number;
-        fields?: Mongo.FieldSpecifier;
-        reactive?: boolean;
-        transform?: Function;
-      }): Mongo.Cursor<T>;
-      findOne(selector?: Mongo.Selector | Mongo.ObjectID | string, options?: {
-        sort?: Mongo.SortSpecifier;
-        skip?: number;
-        fields?: Mongo.FieldSpecifier;
-        reactive?: boolean;
-        transform?: Function;
-      }): T;
-      insert(doc: T, callback?: Function): string;
-      rawCollection(): any;
-      rawDatabase(): any;
-      remove(selector: Mongo.Selector | Mongo.ObjectID | string, callback?: Function): number;
-      update(selector: Mongo.Selector | Mongo.ObjectID | string, modifier: Mongo.Modifier, options?: {
-        multi?: boolean;
-        upsert?: boolean;
-      }, callback?: Function): number;
-      upsert(selector: Mongo.Selector | Mongo.ObjectID | string, modifier: Mongo.Modifier, options?: {
-        multi?: boolean;
-      }, callback?: Function): { numberAffected?: number; insertedId?: string; };
-      _ensureIndex(indexName: string, options?: { [key: string]: any }): void;
-    }
-
-    var Cursor: CursorStatic;
-    interface CursorStatic {
-      new <T>(): Cursor<T>;
-    }
-    interface Cursor<T> {
-      count(): number;
-      fetch(): Array<T>;
-      forEach(callback: <T>(doc: T, index: number, cursor: Mongo.Cursor<T>) => void, thisArg?: any): void;
-      map<U>(callback: (doc: T, index: number, cursor: Mongo.Cursor<T>) => U, thisArg?: any): Array<U>;
-      observe(callbacks: object): Meteor.LiveQueryHandle;
-      observeChanges(callbacks: object): Meteor.LiveQueryHandle;
-    }
-
-    var ObjectID: ObjectIDStatic;
-    interface ObjectIDStatic {
-      new (hexString?: string): ObjectID;
-    }
-    interface ObjectID {
-    }
-
-  }
-}
-
 declare namespace Npm {
   function depends(dependencies: { [id: string]: string }): void;
   function require(name: string): any;
@@ -743,89 +114,6 @@ declare namespace Package {
   }): void;
 }
 
-declare module "meteor/tracker" {
-  export namespace Tracker {
-    function Computation(): void;
-    interface Computation {
-      firstRun: boolean;
-      invalidate(): void;
-      invalidated: boolean;
-      onInvalidate(callback: Function): void;
-      onStop(callback: Function): void;
-      stop(): void;
-      stopped: boolean;
-    }
-
-    var Dependency: DependencyStatic;
-    interface DependencyStatic {
-      new (): Dependency;
-    }
-    interface Dependency {
-      changed(): void;
-      depend(fromComputation?: Tracker.Computation): boolean;
-      hasDependents(): boolean;
-    }
-
-    var active: boolean;
-    function afterFlush(callback: Function): void;
-    function autorun(runFunc: (computation: Tracker.Computation) => void, options?: {
-      onError?: Function;
-    }): Tracker.Computation;
-    var currentComputation: Tracker.Computation;
-    function flush(): void;
-    function nonreactive(func: Function): void;
-    function onInvalidate(callback: Function): void;
-  }
-}
-
-declare namespace Session {
-  function equals(key: string, value: string | number | boolean | any /** Null **/ | any /** Undefined **/): boolean;
-  function get(key: string): any;
-  function set(key: string, value: EJSONable | any /** Undefined **/): void;
-  function setDefault(key: string, value: EJSONable | any /** Undefined **/): void;
-}
-
-declare module "meteor/http" {
-  import { Meteor } from "meteor/meteor";
-  export namespace HTTP {
-
-    function call(method: string, url: string, options?: {
-      content?: string;
-      data?: object;
-      query?: string;
-      params?: object;
-      auth?: string;
-      headers?: object;
-      timeout?: number;
-      followRedirects?: boolean;
-      npmRequestOptions?: object;
-      beforeSend?: Function;
-    }, asyncCallback?: Function): HTTP.HTTPResponse;
-    function del(url: string, callOptions?: object, asyncCallback?: Function): HTTP.HTTPResponse;
-    function get(url: string, callOptions?: object, asyncCallback?: Function): HTTP.HTTPResponse;
-    function post(url: string, callOptions?: object, asyncCallback?: Function): HTTP.HTTPResponse;
-    function put(url: string, callOptions?: object, asyncCallback?: Function): HTTP.HTTPResponse;
-  }
-}
-
-declare module "meteor/email" {
-  export namespace Email {
-    function send(options: {
-      from?: string;
-      to?: string | string[];
-      cc?: string | string[];
-      bcc?: string | string[];
-      replyTo?: string | string[];
-      subject?: string;
-      text?: string;
-      html?: string;
-      headers?: object;
-      attachments?: object[];
-      mailComposer?: MailComposer;
-    }): void;
-  }
-}
-
 declare var CompileStep: CompileStepStatic;
 interface CompileStepStatic {
   new (): CompileStep;
@@ -876,66 +164,6 @@ interface PackageAPI {
   versionsFrom(meteorRelease: string | string[]): void;
 }
 
-declare module "meteor/reactive-var" {
-  import { Meteor } from "meteor/meteor";
-
-  export var ReactiveVar: ReactiveVarStatic;
-  interface ReactiveVarStatic {
-    new <T>(initialValue: T, equalsFunc?: Function): ReactiveVar<T>;
-  }
-  interface ReactiveVar<T> {
-    get(): T;
-    set(newValue: T): void;
-  }
-
-  export var Subscription: SubscriptionStatic;
-  interface SubscriptionStatic {
-    new (): Subscription;
-  }
-  interface Subscription {
-    added(collection: string, id: string, fields: object): void;
-    changed(collection: string, id: string, fields: object): void;
-    connection: Meteor.Connection;
-    error(error: Error): void;
-    onStop(func: Function): void;
-    ready(): void;
-    removed(collection: string, id: string): void;
-    stop(): void;
-    userId: string;
-  }
-}
-
-declare module "meteor/blaze" {
-  import { Meteor } from "meteor/meteor";
-
-  export var Template: TemplateStatic;
-  interface TemplateStatic {
-    new (): Template;
-    // It should be [templateName: string]: TemplateInstance but this is not possible -- user will need to cast to TemplateInstance
-    [templateName: string]: any | Template; // added "any" to make it work
-    head: Template;
-    find(selector: string): Blaze.Template;
-    findAll(selector: string): Blaze.Template[];
-    $: any;
-    body: Template;
-    currentData(): {};
-    instance(): Blaze.TemplateInstance;
-    parentData(numLevels?: number): {};
-    registerHelper(name: string, helperFunction: Function): void;
-  }
-  interface Template {
-    created: Function;
-    destroyed: Function;
-    events(eventMap: Meteor.EventMap): void;
-    helpers(helpers: { [id: string]: any }): void;
-    onCreated: Function;
-    onDestroyed: Function;
-    onRendered: Function;
-    rendered: Function;
-  }
-}
-
-declare function check(value: any, pattern: any): void;
 declare function execFileAsync(command: string, args?: any[], options?: {
   cwd?: object;
   env?: object;
@@ -951,4 +179,3 @@ declare function execFileSync(command: string, args?: any[], options?: {
   waitForClose?: string;
 }): string;
 declare function getExtension(): string;
-

package/bundle/typescript/src/templates/meteor/app/server/helmet-csp.js.ts

@@ -8,6 +8,7 @@ import { Meteor } from 'meteor/meteor'
 import { WebApp } from 'meteor/webapp'
 import { Autoupdate } from 'meteor/autoupdate'
 import crypto from 'crypto'
+import type { HelmetOptions } from 'helmet'
 
 const self = '\'self\''
 const data = 'data:'
@@ -42,13 +43,18 @@ const runtimeConfig = Object.assign(__meteor_runtime_config__, Autoupdate, {
 })
 
 // add client versions to __meteor_runtime_config__
+// clientProgram is typed `any` here: @types/meteor's WebApp.clientPrograms
+// shape only documents `version` as a plain string, but Meteor's real
+// runtime object also carries the versionRefreshable/versionNonRefreshable/
+// versionReplaceable accessor methods used below.
 Object.keys(WebApp.clientPrograms).forEach(arch => {
+  const clientProgram: any = WebApp.clientPrograms[arch];
   __meteor_runtime_config__.versions[arch] = {
-    version: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].version(),
-    versionRefreshable: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].versionRefreshable(),
-    versionNonRefreshable: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].versionNonRefreshable(),
+    version: Autoupdate.autoupdateVersion || clientProgram.version(),
+    versionRefreshable: Autoupdate.autoupdateVersion || clientProgram.versionRefreshable(),
+    versionNonRefreshable: Autoupdate.autoupdateVersion || clientProgram.versionNonRefreshable(),
     // comment the following line if you use Meteor < 2.0
-    versionReplaceable: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].versionReplaceable()
+    versionReplaceable: Autoupdate.autoupdateVersion || clientProgram.versionReplaceable()
   }
 })
 
@@ -62,7 +68,6 @@ const helmetOptions = {
   //If this is truu, site's won't be able to link to you
   crossOriginEmbedderPolicy: false,
   contentSecurityPolicy: {
-    blockAllMixedContent: true,
     directives: {
       defaultSrc: [self].concat(allowedOrigins),
       scriptSrc: [
@@ -121,10 +126,6 @@ const helmetOptions = {
   referrerPolicy: {
     policy: 'no-referrer'
   },
-  expectCt: {
-    enforce: true,
-    maxAge: 604800
-  },
   frameguard: {
     action: 'sameorigin'
   },
@@ -134,13 +135,12 @@ const helmetOptions = {
   permittedCrossDomainPolicies: {
     permittedPolicies: 'none'
   }
-};
+} satisfies HelmetOptions;
 
 // We assume, that we are working on a localhost when there is no https
 // connection available.
 // Run your project with --production flag to simulate script-src hashing
 if (!usesHttps && Meteor.isDevelopment && devAllowedOrigins) {
-  delete helmetOptions.contentSecurityPolicy.blockAllMixedContent;
   helmetOptions.contentSecurityPolicy.directives.scriptSrc = [
     self,
     devAllowedOrigins.join(' '),
@@ -173,7 +173,7 @@ if (!usesHttps && Meteor.isDevelopment && devAllowedOrigins) {
     unsafeInline,
   ];
 
-  helmetOptions.contentSecurityPolicy.directives['script-src-attr'] = null;
+  (helmetOptions.contentSecurityPolicy.directives as Record<string, any>)['script-src-attr'] = null;
 }
 
 export default helmetOptions;

package/bundle/typescript/src/templates/meteor/app/server/helmet-csp.js.tsx

@@ -8,6 +8,7 @@ import { Meteor } from 'meteor/meteor'
 import { WebApp } from 'meteor/webapp'
 import { Autoupdate } from 'meteor/autoupdate'
 import crypto from 'crypto'
+import type { HelmetOptions } from 'helmet'
 
 const self = '\'self\''
 const data = 'data:'
@@ -42,13 +43,18 @@ const runtimeConfig = Object.assign(__meteor_runtime_config__, Autoupdate, {
 })
 
 // add client versions to __meteor_runtime_config__
+// clientProgram is typed `any` here: @types/meteor's WebApp.clientPrograms
+// shape only documents `version` as a plain string, but Meteor's real
+// runtime object also carries the versionRefreshable/versionNonRefreshable/
+// versionReplaceable accessor methods used below.
 Object.keys(WebApp.clientPrograms).forEach(arch => {
+  const clientProgram: any = WebApp.clientPrograms[arch];
   __meteor_runtime_config__.versions[arch] = {
-    version: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].version(),
-    versionRefreshable: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].versionRefreshable(),
-    versionNonRefreshable: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].versionNonRefreshable(),
+    version: Autoupdate.autoupdateVersion || clientProgram.version(),
+    versionRefreshable: Autoupdate.autoupdateVersion || clientProgram.versionRefreshable(),
+    versionNonRefreshable: Autoupdate.autoupdateVersion || clientProgram.versionNonRefreshable(),
     // comment the following line if you use Meteor < 2.0
-    versionReplaceable: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].versionReplaceable()
+    versionReplaceable: Autoupdate.autoupdateVersion || clientProgram.versionReplaceable()
   }
 })
 
@@ -62,7 +68,6 @@ const helmetOptions = {
   //If this is truu, site's won't be able to link to you
   crossOriginEmbedderPolicy: false,
   contentSecurityPolicy: {
-    blockAllMixedContent: true,
     directives: {
       defaultSrc: [self].concat(allowedOrigins),
       scriptSrc: [
@@ -121,10 +126,6 @@ const helmetOptions = {
   referrerPolicy: {
     policy: 'no-referrer'
   },
-  expectCt: {
-    enforce: true,
-    maxAge: 604800
-  },
   frameguard: {
     action: 'sameorigin'
   },
@@ -134,13 +135,12 @@ const helmetOptions = {
   permittedCrossDomainPolicies: {
     permittedPolicies: 'none'
   }
-};
+} satisfies HelmetOptions;
 
 // We assume, that we are working on a localhost when there is no https
 // connection available.
 // Run your project with --production flag to simulate script-src hashing
 if (!usesHttps && Meteor.isDevelopment && devAllowedOrigins) {
-  delete helmetOptions.contentSecurityPolicy.blockAllMixedContent;
   helmetOptions.contentSecurityPolicy.directives.scriptSrc = [
     self,
     devAllowedOrigins.join(' '),
@@ -173,7 +173,7 @@ if (!usesHttps && Meteor.isDevelopment && devAllowedOrigins) {
     unsafeInline,
   ];
 
-  helmetOptions.contentSecurityPolicy.directives['script-src-attr'] = null;
+  (helmetOptions.contentSecurityPolicy.directives as Record<string, any>)['script-src-attr'] = null;
 }
 
 export default helmetOptions;

package/bundle/typescript/src/templates/meteor/app/server/main.js.ts

@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
 import helmet from "helmet";
 import helmetOptions from './helmet-csp';

package/bundle/typescript/src/templates/meteor/app/server/main.js.tsx

@@ -1,3 +1,4 @@
+import { Meteor } from 'meteor/meteor';
 import { WebApp } from 'meteor/webapp';
 import helmet from "helmet";
 import helmetOptions from './helmet-csp';

package/bundle/typescript/src/templates/react/component/component.js.jsx

@@ -42,7 +42,7 @@ class <%= className %> extends Component {
    * This is the main render method, and will rerun anytime either this.state or this.props is changed.
    */
   render() {<% if(clientGraphql === 'apollo') { %>
-    // Consider using the Query component or graphql() HOC from @apollo/client for class components<% } %><% if (withTranslations) { %>
+    // Consider using the Query component or graphql() HOC from @apollo/client for class components<% } %><% if (withTranslations && !isLayout) { %>
     const { t } = this.props;<% } %>
     return (
       <div id="<%= cssCaseName %>">

package/bundle/typescript/src/templates/react/component/component.js.tsx

@@ -48,7 +48,7 @@ class <%= className %> extends React.Component<I<%= className %>> {
    * This is the main render method, and will rerun anytime either this.state or this.props is changed.
    */
   render() {<% if(clientGraphql === 'apollo') { %>
-    // Consider using the Query component or graphql() HOC from @apollo/client for class components<% } %><% if (withTranslations) { %>
+    // Consider using the Query component or graphql() HOC from @apollo/client for class components<% } %><% if (withTranslations && !isLayout) { %>
     const { t } = this.props;<% } %>
     return (
       <div id="<%= cssCaseName %>">

package/bundle/typescript/src/templates/react/hook/hook.js.jsx

@@ -1,12 +1,12 @@
-import React, { useState } from 'react'<%if (withTranslations) { %>
+import React from 'react'<%if (withTranslations && !isLayout) { %>
 import { useTranslation } from 'react-i18next';<% } %>
 <% if (isLayout) { %>
 import { Outlet } from 'react-router-dom';
 <% }%>
 
-function <%= className %>(props) {
+function <%= className %>() {
   <% if(clientGraphql === 'apollo') { %>
-  //const { loading, error, data } = useQuery(gql`query Todos { todos }`, { variables: {/* input */} }); <% } %><% if (withTranslations) { %>
+  //const { loading, error, data } = useQuery(gql`query Todos { todos }`, { variables: {/* input */} }); <% } %><% if (withTranslations && !isLayout) { %>
   const { t } = useTranslation();<% } %>
 
   return (

package/bundle/typescript/src/templates/react/hook/hook.js.tsx

@@ -1,12 +1,12 @@
-import * as React from 'react';<%if (withTranslations) { %>
+import * as React from 'react';<%if (withTranslations && !isLayout) { %>
 import { useTranslation } from 'react-i18next';<% } %>
 <% if (isLayout) { %>
 import { Outlet } from 'react-router-dom';
 <% }%>
 
-function <%= className %>(props) {
+function <%= className %>() {
   <% if(clientGraphql === 'apollo') { %>
-  //const { loading, error, data } = useQuery(gql`query Todos { todos }`, { variables: {/* input */} }); <% } %><% if (withTranslations) { %>
+  //const { loading, error, data } = useQuery(gql`query Todos { todos }`, { variables: {/* input */} }); <% } %><% if (withTranslations && !isLayout) { %>
   const { t } = useTranslation();<% } %>
 
   return (

package/bundle/typescript/src/templates/react/test/test.js.tsx

@@ -33,6 +33,6 @@ describe('<<%= className %>/>', function() {
    const <%=camelCaseName%> = render(<<%= className %>/>);<% } %>
    const testMessage = <% if (isLayout) { %>''<% } else if (withTranslations) { %>'<h2>example</h2>'<% } else { %>'<h2>Find me in <%= myPath %></h2>'<% } %>
    const node = <%=camelCaseName%>.container.querySelector('#<%=cssCaseName%>');
-   <% if (test === 'mocha') { %>expect(node.innerHTML).equals(testMessage);<% } else { %>expect(node.innerHTML).toBe(testMessage);<% } %>
+   <% if (test === 'mocha') { %>expect(node!.innerHTML).equals(testMessage);<% } else { %>expect(node!.innerHTML).toBe(testMessage);<% } %>
   });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.3.11",
+  "version": "5.3.13",
   "type": "module",
   "summary": "A command line tool for scaffolding Meteor 2.x applications using either React.",
   "description": "A command line tool for scaffolding Meteor 2.x applications using React.",