@maka/maka-cli 4.7.11 → 4.7.13

package/bundle/obf/src/templates/meteor/app/public/manifest.json

@@ -1,27 +1,27 @@
-{
-  "short_name": "<%= app %>",
-  "name": "<%= app %>",
-  "start_url": "/",
-  "background_color": "#FFF",
-  "display": "standalone",
-  "scope": "/",
-  "theme_color": "#FFF",
-  "icons": [
-    {
-      "src": "/maka-144x144.png",
-      "sizes": "144x144",
-      "type": "image/png"
-    },
-    {
-      "src": "/maka-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
-    },
-    {
-      "src": "/maka-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "purpose": "any maskable"
-    }
-  ]
-}
+{
+  "short_name": "<%= app %>",
+  "name": "<%= app %>",
+  "start_url": "/",
+  "background_color": "#FFF",
+  "display": "standalone",
+  "scope": "/",
+  "theme_color": "#FFF",
+  "icons": [
+    {
+      "src": "/maka-144x144.png",
+      "sizes": "144x144",
+      "type": "image/png"
+    },
+    {
+      "src": "/maka-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    },
+    {
+      "src": "/maka-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "any maskable"
+    }
+  ]
+}

package/bundle/obf/src/templates/meteor/app/public/sw.js

@@ -1,30 +1,30 @@
-const cacheName = 'cache-v1';
-const precacheResources = [
-  '/',
-];
-
-self.addEventListener('install', event => {
-  console.log('Service worker install event!');
-  event.waitUntil(
-    caches.open(cacheName)
-      .then(cache => {
-        return cache.addAll(precacheResources);
-      })
-  );
-});
-
-self.addEventListener('activate', event => {
-  console.log('Service worker activate event!');
-});
-
-self.addEventListener('fetch', event => {
-  console.log('Fetch intercepted for:', event.request.url);
-  event.respondWith(caches.match(event.request)
-    .then(cachedResponse => {
-        if (cachedResponse) {
-          return cachedResponse;
-        }
-        return fetch(event.request);
-      })
-    );
-});
+const cacheName = 'cache-v1';
+const precacheResources = [
+  '/',
+];
+
+self.addEventListener('install', event => {
+  console.log('Service worker install event!');
+  event.waitUntil(
+    caches.open(cacheName)
+      .then(cache => {
+        return cache.addAll(precacheResources);
+      })
+  );
+});
+
+self.addEventListener('activate', event => {
+  console.log('Service worker activate event!');
+});
+
+self.addEventListener('fetch', event => {
+  console.log('Fetch intercepted for:', event.request.url);
+  event.respondWith(caches.match(event.request)
+    .then(cachedResponse => {
+        if (cachedResponse) {
+          return cachedResponse;
+        }
+        return fetch(event.request);
+      })
+    );
+});

package/bundle/obf/src/templates/meteor/app/public/sw.js.jsx

@@ -1,30 +1,30 @@
-const cacheName = 'cache-v1';
-const precacheResources = [
-  '/',
-];
-
-self.addEventListener('install', event => {
-  console.log('Service worker install event!');
-  event.waitUntil(
-    caches.open(cacheName)
-      .then(cache => {
-        return cache.addAll(precacheResources);
-      })
-  );
-});
-
-self.addEventListener('activate', event => {
-  console.log('Service worker activate event!');
-});
-
-self.addEventListener('fetch', event => {
-  console.log('Fetch intercepted for:', event.request.url);
-  event.respondWith(caches.match(event.request)
-    .then(cachedResponse => {
-        if (cachedResponse) {
-          return cachedResponse;
-        }
-        return fetch(event.request);
-      })
-    );
-});
+const cacheName = 'cache-v1';
+const precacheResources = [
+  '/',
+];
+
+self.addEventListener('install', event => {
+  console.log('Service worker install event!');
+  event.waitUntil(
+    caches.open(cacheName)
+      .then(cache => {
+        return cache.addAll(precacheResources);
+      })
+  );
+});
+
+self.addEventListener('activate', event => {
+  console.log('Service worker activate event!');
+});
+
+self.addEventListener('fetch', event => {
+  console.log('Fetch intercepted for:', event.request.url);
+  event.respondWith(caches.match(event.request)
+    .then(cachedResponse => {
+        if (cachedResponse) {
+          return cachedResponse;
+        }
+        return fetch(event.request);
+      })
+    );
+});

package/bundle/obf/src/templates/meteor/app/public/sw.js.ts

@@ -1,30 +1,30 @@
-const cacheName = 'cache-v1';
-const precacheResources = [
-  '/',
-];
-
-self.addEventListener('install', event => {
-  console.log('Service worker install event!');
-  event.waitUntil(
-    caches.open(cacheName)
-      .then(cache => {
-        return cache.addAll(precacheResources);
-      })
-  );
-});
-
-self.addEventListener('activate', event => {
-  console.log('Service worker activate event!');
-});
-
-self.addEventListener('fetch', event => {
-  console.log('Fetch intercepted for:', event.request.url);
-  event.respondWith(caches.match(event.request)
-    .then(cachedResponse => {
-        if (cachedResponse) {
-          return cachedResponse;
-        }
-        return fetch(event.request);
-      })
-    );
-});
+const cacheName = 'cache-v1';
+const precacheResources = [
+  '/',
+];
+
+self.addEventListener('install', event => {
+  console.log('Service worker install event!');
+  event.waitUntil(
+    caches.open(cacheName)
+      .then(cache => {
+        return cache.addAll(precacheResources);
+      })
+  );
+});
+
+self.addEventListener('activate', event => {
+  console.log('Service worker activate event!');
+});
+
+self.addEventListener('fetch', event => {
+  console.log('Fetch intercepted for:', event.request.url);
+  event.respondWith(caches.match(event.request)
+    .then(cachedResponse => {
+        if (cachedResponse) {
+          return cachedResponse;
+        }
+        return fetch(event.request);
+      })
+    );
+});

package/bundle/obf/src/templates/meteor/app/public/sw.js.tsx

@@ -1,30 +1,30 @@
-const cacheName = 'cache-v1';
-const precacheResources = [
-  '/',
-];
-
-self.addEventListener('install', event => {
-  console.log('Service worker install event!');
-  event.waitUntil(
-    caches.open(cacheName)
-      .then(cache => {
-        return cache.addAll(precacheResources);
-      })
-  );
-});
-
-self.addEventListener('activate', event => {
-  console.log('Service worker activate event!');
-});
-
-self.addEventListener('fetch', event => {
-  console.log('Fetch intercepted for:', event.request.url);
-  event.respondWith(caches.match(event.request)
-    .then(cachedResponse => {
-        if (cachedResponse) {
-          return cachedResponse;
-        }
-        return fetch(event.request);
-      })
-    );
-});
+const cacheName = 'cache-v1';
+const precacheResources = [
+  '/',
+];
+
+self.addEventListener('install', event => {
+  console.log('Service worker install event!');
+  event.waitUntil(
+    caches.open(cacheName)
+      .then(cache => {
+        return cache.addAll(precacheResources);
+      })
+  );
+});
+
+self.addEventListener('activate', event => {
+  console.log('Service worker activate event!');
+});
+
+self.addEventListener('fetch', event => {
+  console.log('Fetch intercepted for:', event.request.url);
+  event.respondWith(caches.match(event.request)
+    .then(cachedResponse => {
+        if (cachedResponse) {
+          return cachedResponse;
+        }
+        return fetch(event.request);
+      })
+    );
+});

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

@@ -1,179 +1,179 @@
-/*
- * Content Security Policy (CSP)
- * https://guide.meteor.com/security.html#httpheaders
- */
-
-/* global __meteor_runtime_config__ */
-import { Meteor } from 'meteor/meteor'
-import { WebApp } from 'meteor/webapp'
-import { Autoupdate } from 'meteor/autoupdate'
-import crypto from 'crypto'
-
-const self = '\'self\''
-const data = 'data:'
-const unsafeEval = '\'unsafe-eval\''
-const unsafeInline = '\'unsafe-inline\''
-const allowedOrigins = Meteor.settings.extraAllowedOrigins;
-const devAllowedOrigins = Meteor.settings.devAllowedOrigins;
-
-// create the default connect source for our current domain in
-// a multi-protocol compatible way (http/ws or https/wss)
-const url = Meteor.absoluteUrl()
-const domain = url.replace(/http(s)*:\/\//, '').replace(/\/$/, '')
-const s = url.match(/(?!=http)s(?=:\/\/)/) ? 's' : ''
-const usesHttps = s.length > 0
-const connectSrc = [
-  self,
-  `http${s}://${domain}`,
-  `ws${s}://${domain}`
-]
-
-// Prepare runtime config for generating the sha256 hash
-// It is important, that the hash meets exactly the hash of the
-// script in the client bundle.
-// Otherwise the app would not be able to start, since the runtimeConfigScript
-// is rejected __meteor_runtime_config__ is not available, causing
-// a cascade of follow-up errors.
-const runtimeConfig = Object.assign(__meteor_runtime_config__, Autoupdate, {
-  // the following lines may depend on, whether you called Accounts.config
-  // and whether your Meteor app is a "newer" version
-  accountsConfigCalled: true,
-  isModern: true
-})
-
-// add client versions to __meteor_runtime_config__
-Object.keys(WebApp.clientPrograms).forEach(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(),
-    // comment the following line if you use Meteor < 2.0
-    versionReplaceable: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].versionReplaceable()
-  }
-})
-
-const runtimeConfigScript = `__meteor_runtime_config__ = JSON.parse(decodeURIComponent("${encodeURIComponent(JSON.stringify(runtimeConfig))}"))`
-const runtimeConfigHash = crypto.createHash('sha256').update(runtimeConfigScript).digest('base64')
-
-const helmetOptions = {
-  crossOriginOpenerPolicy: { policy: "same-origin-allow-popups" },
-  crossOriginResourcePolicy: true,
-  //If you want to embed something like an iframe, set to false
-  //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: [
-        self,
-        // Remove / comment out unsafeEval if you do not use dynamic imports
-        // to tighten security. However, if you use dynamic imports this line
-        // must be kept in order to make them work.
-        unsafeEval,
-        `'sha256-${runtimeConfigHash}'`
-      ].concat(allowedOrigins),
-      childSrc: [self].concat(allowedOrigins),
-      // If you have external apps, that should be allowed as sources for
-      // connections or images, your should add them here
-      // Call helmetOptions() without args if you have no external sources
-      // Note, that this is just an example and you may configure this to your needs
-      connectSrc: connectSrc.concat(allowedOrigins),
-      fontSrc: [self, data].concat(allowedOrigins),
-      formAction: [self].concat(allowedOrigins),
-      frameAncestors: [self].concat(allowedOrigins),
-      frameSrc: [self].concat(allowedOrigins),
-      // This is an example to show, that we can define to show images only
-      // from our self, browser data/blob and a defined set of hosts.
-      // Configure to your needs.
-      imgSrc: [self, data, 'blob:'].concat(allowedOrigins),
-      manifestSrc: [self].concat(allowedOrigins),
-      mediaSrc: [self].concat(allowedOrigins),
-      objectSrc: [self].concat(allowedOrigins),
-      // these are just examples, configure to your needs, see
-      // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/sandbox
-      sandbox: [
-        // allow-downloads-without-user-activation // experimental
-        'allow-forms',
-        'allow-modals',
-        // 'allow-orientation-lock',
-        // 'allow-pointer-lock',
-        'allow-popups',
-        // 'allow-popups-to-escape-sandbox',
-        // 'allow-presentation',
-        'allow-same-origin',
-        'allow-scripts',
-        // 'allow-storage-access-by-user-activation ', // experimental
-        // 'allow-top-navigation',
-        // 'allow-top-navigation-by-user-activation'
-      ],
-      styleSrc: [self, unsafeInline].concat(allowedOrigins),
-      workerSrc: [self, 'blob:'].concat(allowedOrigins)
-    }
-  },
-  // see the helmet documentation to get a better understanding of
-  // the following configurations and settings
-  strictTransportSecurity: {
-    maxAge: 15552000,
-    includeSubDomains: true,
-    preload: false
-  },
-  referrerPolicy: {
-    policy: 'no-referrer'
-  },
-  expectCt: {
-    enforce: true,
-    maxAge: 604800
-  },
-  frameguard: {
-    action: 'sameorigin'
-  },
-  dnsPrefetchControl: {
-    allow: false
-  },
-  permittedCrossDomainPolicies: {
-    permittedPolicies: 'none'
-  }
-};
-
-// 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) {
-  delete helmetOptions.contentSecurityPolicy.blockAllMixedContent;
-  helmetOptions.contentSecurityPolicy.directives.scriptSrc = [
-    self,
-    devAllowedOrigins.join(' '),
-    data,
-    unsafeEval,
-    unsafeInline,
-  ];
-
-  helmetOptions.contentSecurityPolicy.directives.styleSrc = [
-    self,
-    devAllowedOrigins.join(' '),
-    data,
-    unsafeEval,
-    unsafeInline,
-  ];
-
-  helmetOptions.contentSecurityPolicy.directives.imgSrc = [
-    self,
-    devAllowedOrigins.join(' '),
-    data,
-    unsafeEval,
-    unsafeInline,
-  ];
-
-    helmetOptions.contentSecurityPolicy.directives.fontSrc = [
-    self,
-    devAllowedOrigins.join(' '),
-    data,
-    unsafeEval,
-    unsafeInline,
-  ];
-
-  helmetOptions.contentSecurityPolicy.directives['script-src-attr'] = null;
-}
-
-export default helmetOptions;
+/*
+ * Content Security Policy (CSP)
+ * https://guide.meteor.com/security.html#httpheaders
+ */
+
+/* global __meteor_runtime_config__ */
+import { Meteor } from 'meteor/meteor'
+import { WebApp } from 'meteor/webapp'
+import { Autoupdate } from 'meteor/autoupdate'
+import crypto from 'crypto'
+
+const self = '\'self\''
+const data = 'data:'
+const unsafeEval = '\'unsafe-eval\''
+const unsafeInline = '\'unsafe-inline\''
+const allowedOrigins = Meteor.settings.extraAllowedOrigins;
+const devAllowedOrigins = Meteor.settings.devAllowedOrigins;
+
+// create the default connect source for our current domain in
+// a multi-protocol compatible way (http/ws or https/wss)
+const url = Meteor.absoluteUrl()
+const domain = url.replace(/http(s)*:\/\//, '').replace(/\/$/, '')
+const s = url.match(/(?!=http)s(?=:\/\/)/) ? 's' : ''
+const usesHttps = s.length > 0
+const connectSrc = [
+  self,
+  `http${s}://${domain}`,
+  `ws${s}://${domain}`
+]
+
+// Prepare runtime config for generating the sha256 hash
+// It is important, that the hash meets exactly the hash of the
+// script in the client bundle.
+// Otherwise the app would not be able to start, since the runtimeConfigScript
+// is rejected __meteor_runtime_config__ is not available, causing
+// a cascade of follow-up errors.
+const runtimeConfig = Object.assign(__meteor_runtime_config__, Autoupdate, {
+  // the following lines may depend on, whether you called Accounts.config
+  // and whether your Meteor app is a "newer" version
+  accountsConfigCalled: true,
+  isModern: true
+})
+
+// add client versions to __meteor_runtime_config__
+Object.keys(WebApp.clientPrograms).forEach(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(),
+    // comment the following line if you use Meteor < 2.0
+    versionReplaceable: Autoupdate.autoupdateVersion || WebApp.clientPrograms[arch].versionReplaceable()
+  }
+})
+
+const runtimeConfigScript = `__meteor_runtime_config__ = JSON.parse(decodeURIComponent("${encodeURIComponent(JSON.stringify(runtimeConfig))}"))`
+const runtimeConfigHash = crypto.createHash('sha256').update(runtimeConfigScript).digest('base64')
+
+const helmetOptions = {
+  crossOriginOpenerPolicy: { policy: "same-origin-allow-popups" },
+  crossOriginResourcePolicy: true,
+  //If you want to embed something like an iframe, set to false
+  //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: [
+        self,
+        // Remove / comment out unsafeEval if you do not use dynamic imports
+        // to tighten security. However, if you use dynamic imports this line
+        // must be kept in order to make them work.
+        unsafeEval,
+        `'sha256-${runtimeConfigHash}'`
+      ].concat(allowedOrigins),
+      childSrc: [self].concat(allowedOrigins),
+      // If you have external apps, that should be allowed as sources for
+      // connections or images, your should add them here
+      // Call helmetOptions() without args if you have no external sources
+      // Note, that this is just an example and you may configure this to your needs
+      connectSrc: connectSrc.concat(allowedOrigins),
+      fontSrc: [self, data].concat(allowedOrigins),
+      formAction: [self].concat(allowedOrigins),
+      frameAncestors: [self].concat(allowedOrigins),
+      frameSrc: [self].concat(allowedOrigins),
+      // This is an example to show, that we can define to show images only
+      // from our self, browser data/blob and a defined set of hosts.
+      // Configure to your needs.
+      imgSrc: [self, data, 'blob:'].concat(allowedOrigins),
+      manifestSrc: [self].concat(allowedOrigins),
+      mediaSrc: [self].concat(allowedOrigins),
+      objectSrc: [self].concat(allowedOrigins),
+      // these are just examples, configure to your needs, see
+      // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy/sandbox
+      sandbox: [
+        // allow-downloads-without-user-activation // experimental
+        'allow-forms',
+        'allow-modals',
+        // 'allow-orientation-lock',
+        // 'allow-pointer-lock',
+        'allow-popups',
+        // 'allow-popups-to-escape-sandbox',
+        // 'allow-presentation',
+        'allow-same-origin',
+        'allow-scripts',
+        // 'allow-storage-access-by-user-activation ', // experimental
+        // 'allow-top-navigation',
+        // 'allow-top-navigation-by-user-activation'
+      ],
+      styleSrc: [self, unsafeInline].concat(allowedOrigins),
+      workerSrc: [self, 'blob:'].concat(allowedOrigins)
+    }
+  },
+  // see the helmet documentation to get a better understanding of
+  // the following configurations and settings
+  strictTransportSecurity: {
+    maxAge: 15552000,
+    includeSubDomains: true,
+    preload: false
+  },
+  referrerPolicy: {
+    policy: 'no-referrer'
+  },
+  expectCt: {
+    enforce: true,
+    maxAge: 604800
+  },
+  frameguard: {
+    action: 'sameorigin'
+  },
+  dnsPrefetchControl: {
+    allow: false
+  },
+  permittedCrossDomainPolicies: {
+    permittedPolicies: 'none'
+  }
+};
+
+// 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) {
+  delete helmetOptions.contentSecurityPolicy.blockAllMixedContent;
+  helmetOptions.contentSecurityPolicy.directives.scriptSrc = [
+    self,
+    devAllowedOrigins.join(' '),
+    data,
+    unsafeEval,
+    unsafeInline,
+  ];
+
+  helmetOptions.contentSecurityPolicy.directives.styleSrc = [
+    self,
+    devAllowedOrigins.join(' '),
+    data,
+    unsafeEval,
+    unsafeInline,
+  ];
+
+  helmetOptions.contentSecurityPolicy.directives.imgSrc = [
+    self,
+    devAllowedOrigins.join(' '),
+    data,
+    unsafeEval,
+    unsafeInline,
+  ];
+
+    helmetOptions.contentSecurityPolicy.directives.fontSrc = [
+    self,
+    devAllowedOrigins.join(' '),
+    data,
+    unsafeEval,
+    unsafeInline,
+  ];
+
+  helmetOptions.contentSecurityPolicy.directives['script-src-attr'] = null;
+}
+
+export default helmetOptions;