@maka/maka-cli 5.3.12 → 5.3.14

package/bundle/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.3.12",
+  "version": "5.3.14",
   "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/generators/dockerfile.js

@@ -1,6 +1,7 @@
 import { Generator } from '../generator.js';
 import { Log } from '../tools/log/log.class.js';
 import path from 'path';
+import slash from 'slash';
 Generator.create({
     name: 'dockerfile',
     usage: 'maka {generate, g}:dockerfile',
@@ -22,8 +23,8 @@ Generator.create({
         const context = {
             app: config.appName,
             config: config,
-            appPath: path.join(projectDirectory, 'app'),
-            bundlePath: path.join(projectDirectory, 'build', 'app.tar.gz'),
+            appPath: slash(path.join(projectDirectory, 'app')),
+            bundlePath: slash(path.join(projectDirectory, 'build', 'app.tar.gz')),
             useCert: (globalConfig.cert) ? this.fsi.isFile(globalConfig.cert) : false,
         };
         await this.scaffold.template({

package/bundle/typescript/src/generators/dockerfile.js.map

@@ -1 +1 @@
-{"version":3,"file":"dockerfile.js","sourceRoot":"","sources":["../../../../src/generators/dockerfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,IAAI,MAAM,MAAM,CAAC;AAMxB,SAAS,CAAC,MAAM,CAAC;IACf,IAAI,EAAE,YAAY;IAClB,KAAK,EAAE,+BAA+B;IACtC,SAAS,EAAE,gCAAgC;IAC3C,oBAAoB,EAAE,KAAK;IAC3B,mBAAmB,EAAE,IAAI;IACzB,SAAS,EAAE,CAAC;YACV,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;SACf,CAAC;IACF,QAAQ,EAAE;QACR,mBAAmB;KACpB;CACF,EAAE,KAAK,WAAW,IAAQ,EAAE,IAAqB;IAChD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAC/C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QACtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAEzD,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,MAAM,CAAC,OAAO;YACnB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC;YAC3C,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,YAAY,CAAC;YAC9D,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK;SAC1E,CAAC;QAEF,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,OAAO,EAAE,mBAAmB;YAC5B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC;YACnD,SAAS,EAAE,SAAS;YACpB,OAAO;YACP,MAAM;YACN,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IAAC,OAAM,CAAC,EAAE,CAAC;QACV,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACf,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"dockerfile.js","sourceRoot":"","sources":["../../../../src/generators/dockerfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,GAAG,EAAE,MAAM,2BAA2B,CAAC;AAChD,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,OAAO,CAAC;AAM1B,SAAS,CAAC,MAAM,CAAC;IACf,IAAI,EAAE,YAAY;IAClB,KAAK,EAAE,+BAA+B;IACtC,SAAS,EAAE,gCAAgC;IAC3C,oBAAoB,EAAE,KAAK;IAC3B,mBAAmB,EAAE,IAAI;IACzB,SAAS,EAAE,CAAC;YACV,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;SACf,CAAC;IACF,QAAQ,EAAE;QACR,mBAAmB;KACpB;CACF,EAAE,KAAK,WAAW,IAAQ,EAAE,IAAqB;IAChD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAC/C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QACtD,MAAM,gBAAgB,GAAG,IAAI,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;QAEzD,MAAM,OAAO,GAAG;YACd,GAAG,EAAE,MAAM,CAAC,OAAO;YACnB,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;YAClD,UAAU,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,EAAE,YAAY,CAAC,CAAC;YACrE,OAAO,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK;SAC1E,CAAC;QAEF,MAAM,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3B,OAAO,EAAE,mBAAmB;YAC5B,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,YAAY,CAAC;YACnD,SAAS,EAAE,SAAS;YACpB,OAAO;YACP,MAAM;YACN,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;IACL,CAAC;IAAC,OAAM,CAAC,EAAE,CAAC;QACV,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACf,CAAC;AACH,CAAC,CAAC,CAAC"}

package/bundle/typescript/src/generators/kits/auth/basic-meteor.auth.gen.js

@@ -132,6 +132,7 @@ Generator.create({
         if (isSsr) {
             // import required tracker to handle shortcoming of Context
             // on server.
+            await pkg.checkMeteorPackage(['maka:react-tracker'], { shouldInstall: true });
             await scaffold.injectImport({
                 filePath: `${pathToAuthFile}.${jsEngine}`,
                 importName: 'useTracker',

package/bundle/typescript/src/generators/kits/auth/basic-meteor.auth.gen.js.map

@@ -1 +1 @@
-{"version":3,"file":"basic-meteor.auth.gen.js","sourceRoot":"","sources":["../../../../../../src/generators/kits/auth/basic-meteor.auth.gen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"basic-meteor.auth.gen.js","sourceRoot":"","sources":["../../../../../../src/generators/kits/auth/basic-meteor.auth.gen.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,GAAG,EAAE,MAAM,iCAAiC,CAAC;AACtD,oEAAoE;AACpE,OAAO,OAAO,MAAM,qBAAqB,CAAC;AAC1C,OAAO,OAAO,MAAM,iCAAiC,CAAA;AAErD,OAAO,EACL,aAAa,GACd,MAAM,sCAAsC,CAAA;AAE7C,SAAS,CAAC,MAAM,CAAC;IACf,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,KAAK,EAAE,mDAAmD;IAC1D,SAAS,EAAE,6FAA6F;IACxG,SAAS,EAAE,CAAC;YACV,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,IAAI;YACd,WAAW,EAAE,0BAA0B;SACxC,CAAC;IACF,KAAK,EAAE,IAAI;IACX,oBAAoB,EAAE,KAAK;IAC3B,mBAAmB,EAAE,IAAI;IACzB,eAAe,EAAE;QACf,MAAM,EAAE,aAAa,CAAC,KAAK;KAC5B;IACD,WAAW,EAAE;;;GAGZ;CACF,EAAE,KAAK,WAAU,IAAQ,EAAE,IAAwB;IAClD,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC;IACnD,IAAI,CAAC;QACH,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC;QACxC,MAAM,GAAG,CAAC,kBAAkB,CAAC,CAAC,mBAAmB,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAE7E,MAAM,gBAAgB,GAAG,GAAG,CAAC,oBAAoB,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,aAAa,CAAC,OAAO,CAAC,GAAG,KAAK,QAAQ,CAAC;QACrD,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAE1C,MAAM,OAAO,CAAC,sBAAsB,CAAC,mBAAmB,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;QACpI,MAAM,OAAO,CAAC,sBAAsB,CAAC,SAAS,EAAE,CAAC,YAAY,CAAC,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,CAAC;QAC3J,MAAM,eAAe,GAAG,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,mDAAmD,QAAQ,EAAE,CAAC,CAAC;QAEhH,MAAM,oBAAoB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,yBAAyB,CAAC;QAE1F,MAAM,oBAAoB,GAAG,QAAQ,CAAC,WAAW,CAAC;YAChD,SAAS,EAAE;gBACT,oBAAoB,EAAE,WAAW;gBACjC,EAAE;gBACF,EAAE,EAAE,cAAc;gBAClB,wBAAwB,CAAC,YAAY;aACtC;SACF,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,QAAQ,CAAC;YACtB,OAAO,EAAE,yCAAyC;YAClD,QAAQ,EAAE,oBAAoB,GAAG,KAAK;YACtC,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,EAAE;YACX,MAAM,EAAE,aAAa;YACrB,KAAK,EAAE,WAAW;YAClB,MAAM,EAAE,KAAK;SACd,CAAC,CAAA;QAEF,MAAM,cAAc,GAAG,QAAQ,CAAC,WAAW,CAAC;YAC1C,SAAS,EAAE;gBACT,oBAAoB,EAAE,WAAW;gBACjC,EAAE;gBACF,EAAE,EAAE,cAAc;gBAClB,yBAAyB,CAAC,YAAY;aACvC;SACF,CAAC,CAAC;QAGH,uCAAuC;QACvC,MAAM,QAAQ,CAAC,YAAY,CAAC;YAC1B,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;YACzC,UAAU,EAAE,aAAa;YACzB,UAAU,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,gDAAgD;YACtH,aAAa,EAAE,KAAK;SACrB,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,mBAAmB,CAAC;YACjC,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;YACzC,OAAO,EAAE;;;OAGR;YACD,KAAK,EAAE,wBAAwB;YAC/B,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,mBAAmB,CAAC;YACjC,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;YACzC,OAAO,EAAE;;;OAGR;YACD,KAAK,EAAE,yBAAyB;YAChC,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,mBAAmB,CAAC;YACjC,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;YACzC,OAAO,EAAE;;;OAGR;YACD,KAAK,EAAE,6BAA6B;YACpC,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,mBAAmB,CAAC;YACjC,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;YACzC,OAAO,EAAE;;OAER;YACD,KAAK,EAAE,0BAA0B;YACjC,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,mBAAmB,CAAC;YACjC,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;YACzC,OAAO,EAAE;;OAER;YACD,KAAK,EAAE,+BAA+B;YACtC,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,mBAAmB,CAAC;YACjC,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;YACzC,OAAO,EAAE;;OAER;YACD,KAAK,EAAE,uBAAuB;YAC9B,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,mBAAmB,CAAC;YACjC,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;YACzC,OAAO,EAAE;;OAER;YACD,KAAK,EAAE,8BAA8B;YACrC,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,CAAC;YACV,2DAA2D;YAC3D,aAAa;YACb,MAAM,GAAG,CAAC,kBAAkB,CAAC,CAAC,oBAAoB,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAE9E,MAAM,QAAQ,CAAC,YAAY,CAAC;gBAC1B,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;gBAEzC,UAAU,EAAE,YAAY;gBACxB,UAAU,EAAE,2BAA2B;gBACvC,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;YAEH,MAAM,QAAQ,CAAC,cAAc,CAAC;gBAC5B,QAAQ,EAAE,GAAG,cAAc,IAAI,QAAQ,EAAE;gBACzC,OAAO,EAAE;;;;;;;;;;OAUV;gBACC,KAAK,EAAE,2BAA2B;gBAClC,GAAG,EAAE,cAAc;aACpB,CAAC,CAAC;QACL,CAAC;QAED,wCAAwC;QACxC,MAAM,QAAQ,CAAC,YAAY,CAAC;YAC1B,QAAQ,EAAE,eAAe;YACzB,UAAU,EAAE,QAAQ;YACpB,UAAU,EAAE,eAAe;YAC3B,aAAa,EAAE,IAAI;YACnB,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,mBAAmB,CAAC;YACjC,QAAQ,EAAE,eAAe;YACzB,OAAO,EAAE;;;;;;;OAOR;YACD,KAAK,EAAE,gBAAgB;YACvB,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;QAEH,iCAAiC;QACjC,MAAM,mBAAmB,GAAG,QAAQ,CAAC,WAAW,CAAC;YAC/C,SAAS,EAAE;gBACT,SAAS;gBACT,SAAS;gBACT,QAAQ,EAAE,cAAc;gBACxB,OAAO,CAAC,YAAY;aACrB;SACF,CAAC,CAAC;QAEH,iCAAiC;QACjC,MAAM,QAAQ,CAAC,YAAY,CAAC;YAC1B,QAAQ,EAAE,GAAG,mBAAmB,IAAI,QAAQ,EAAE;YAC9C,UAAU,EAAE,UAAU;YACtB,UAAU,EAAE,sBAAsB;YAClC,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QAEH,MAAM,QAAQ,CAAC,mBAAmB,CAAC;YACjC,QAAQ,EAAE,GAAG,mBAAmB,IAAI,QAAQ,EAAE;YAC9C,OAAO,EAAE;;;;;;OAMR;YACD,KAAK,EAAE,gBAAgB;YACvB,OAAO,EAAE,IAAI;SACd,CAAC,CAAC;IAEL,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACb,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC,EAAE,KAAK,eAAa,CAAC,EAAE,OAAO,CAAC,CAAC"}

package/bundle/typescript/src/templates/meteor/app/imports/startup/client/index.js.tsx

@@ -63,7 +63,7 @@ const theme = responsiveFontSizes(newTheme);<% }} %>
 import { BrowserRouter } from 'react-router-dom'
 import { onPageLoad } from 'meteor/server-render';
 <% } %>
-<% if (config.engines.ssr === 'true') { %>import AppRoutes from '../lib/routes';<% } else { %>import AppRoutes from './routes';<% } %>
+<% if (config.engines.ssr === 'meteor') { %>import AppRoutes from '../lib/routes';<% } else { %>import AppRoutes from './routes';<% } %>
 
 const App = () => (<% if (config.engines.ssr === 'meteor') { %>
   <BrowserRouter><% } %><% if (config.engines.graphql === 'apollo') { %>

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

@@ -2,6 +2,30 @@ 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;
+  }
+}
+
+// First-party "maka" namespaced Atmosphere package; no official types.
+declare module 'meteor/maka:react-tracker' {
+  export const useTracker: any;
+  export const withTracker: any;
+}
+
 declare module 'meteor/maka:http' {
     export const HTTP: {
     /**
@@ -149,10 +173,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/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/react/kit/auth/provider/authentication-provider.js.jsx

@@ -1,6 +1,5 @@
 import { Meteor } from 'meteor/meteor';
 import React, { createContext, useState, useEffect, useMemo } from 'react';
-import { Alert } from '@mui/material';
 
 // Authorization Context
 export const AuthContext = createContext({});
@@ -282,9 +281,22 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }) => {
   return (
     <AuthContext.Provider value={contextValue}>
       {alert.show && (
-        <Alert severity={alert.severity} style={{ position: 'fixed', bottom: 20, right: 20, zIndex: 100000 }}>
+        <div
+          role="alert"
+          style={{
+            position: 'fixed',
+            bottom: 20,
+            right: 20,
+            zIndex: 100000,
+            padding: '12px 16px',
+            borderRadius: 4,
+            color: '#fff',
+            backgroundColor: alert.severity === 'error' ? '#d32f2f' : '#2e7d32',
+            boxShadow: '0 2px 8px rgba(0,0,0,0.25)',
+          }}
+        >
           {alert.message}
-        </Alert>
+        </div>
       )}
       {children}
     </AuthContext.Provider>

package/bundle/typescript/src/templates/react/kit/auth/provider/authentication-provider.js.tsx

@@ -1,6 +1,5 @@
 import { Meteor } from 'meteor/meteor';
 import React, { createContext, useState, useEffect, ReactNode, useMemo } from 'react';
-import { Alert } from '@mui/material';
 
 // Define types for user and credentials
 // These are just placeholders to demonstrate the concept.
@@ -317,9 +316,22 @@ export const AuthProvider = ({ children, timeoutDuration = 3600000 }: AuthProvid
   return (
     <AuthContext.Provider value={contextValue}>
       {alert.show && (
-        <Alert severity={alert.severity} style={{ position: 'fixed', bottom: 20, right: 20, zIndex: 100000 }}>
+        <div
+          role="alert"
+          style={{
+            position: 'fixed',
+            bottom: 20,
+            right: 20,
+            zIndex: 100000,
+            padding: '12px 16px',
+            borderRadius: 4,
+            color: '#fff',
+            backgroundColor: alert.severity === 'error' ? '#d32f2f' : '#2e7d32',
+            boxShadow: '0 2px 8px rgba(0,0,0,0.25)',
+          }}
+        >
           {alert.message}
-        </Alert>
+        </div>
       )}
       {children}
     </AuthContext.Provider>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maka/maka-cli",
-  "version": "5.3.12",
+  "version": "5.3.14",
   "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.",