@maka/maka-cli 5.122.1 → 5.123.1

package/bundle/typescript/src/templates/meteor/collection/collection.js

@@ -1,51 +1,51 @@
-import { Mongo } from 'meteor/mongo';<% if (where === 'client') { -%>
-export const <%= name %> = new Mongo.Collection(null);<% } else { -%>
-
-class <%= name %>Collection extends Mongo.Collection {
-  constructor() {
-    super('<%= name %>');
-
-    this.publicFields = {};
-    this.privateFields = {};
-    this.allow({
-      insert() { return false; },
-      update() { return false; },
-      remove() { return false; },
-    });
-  }
-
-  async createIndexAsync(index, options) {
-    return await createIndexAsync(index, options);
-  }
-
-  find(selector = {}, modifier) {
-    return super.find(selector, modifier);
-  }
-
-  async findOneAsync(selector = {}, modifier) {
-    return await super.findOneAsync(selector, modifier);
-  }
-
-  async insertAsync(doc) {
-    return await super.insertAsync(doc);
-  }
-
-  async updateAsync(selector, modifier) {
-    return await super.updateAsync(selector, modifier);
-  }
-
-  async upsertAsync(selector, modifier, options) {
-    return await super.upsertAsync(selector, modifier, options);
-  }
-
-  async remove(selector) {
-    return await super.removeAsync(selector);
-  }
-}
-
-/**
- * @memberof Server.<%= name %>
- * @member <%= name %>
- */
-const <%= name %> = new <%= name %>Collection();
-export default <%= name %>;<% } %>
+import { Mongo } from 'meteor/mongo';<% if (where === 'client') { -%>
+export const <%= name %> = new Mongo.Collection(null);<% } else { -%>
+
+class <%= name %>Collection extends Mongo.Collection {
+  constructor() {
+    super('<%= name %>');
+
+    this.publicFields = {};
+    this.privateFields = {};
+    this.allow({
+      insert() { return false; },
+      update() { return false; },
+      remove() { return false; },
+    });
+  }
+
+  async createIndexAsync(index, options) {
+    return await createIndexAsync(index, options);
+  }
+
+  find(selector = {}, modifier) {
+    return super.find(selector, modifier);
+  }
+
+  async findOneAsync(selector = {}, modifier) {
+    return await super.findOneAsync(selector, modifier);
+  }
+
+  async insertAsync(doc) {
+    return await super.insertAsync(doc);
+  }
+
+  async updateAsync(selector, modifier) {
+    return await super.updateAsync(selector, modifier);
+  }
+
+  async upsertAsync(selector, modifier, options) {
+    return await super.upsertAsync(selector, modifier, options);
+  }
+
+  async remove(selector) {
+    return await super.removeAsync(selector);
+  }
+}
+
+/**
+ * @memberof Server.<%= name %>
+ * @member <%= name %>
+ */
+const <%= name %> = new <%= name %>Collection();
+export default <%= name %>;<% } %>

package/bundle/typescript/src/templates/meteor/collection/collection.js.ts

@@ -1,55 +1,55 @@
-import { Mongo } from 'meteor/mongo';<% if (where === 'client') { -%>
-export const <%= name %> = new Mongo.Collection(null);<% } else { %>
-
-class <%= name %>Collection extends Mongo.Collection<<%=name%>Collection> {
- publicFields: any;
-  privateFields: any;
-  allow: any = () => {};
-
-  constructor() {
-    super('<%= name %>');
-
-    this.publicFields = {};
-    this.privateFields = {};
-    this.allow({
-      insert() { return false; },
-      update() { return false; },
-      remove() { return false; },
-    });
-  }
-
-  async createIndexAsync(index: any, options: any) {
-    return await createIndexAsync(index, options);
-  }
-
-  find(selector = {}, modifier?: any) {
-    return super.find(selector, modifier);
-  }
-
-  async findOneAsync(selector = {}, modifier?: any) {
-    return super.findOneAsync(selector, modifier);
-  }
-
-  async insertAsync(doc: any) {
-    return await super.insertAsync(doc);
-  }
-
-  async updateAsync(selector: any, modifier?: any) {
-    return await super.updateAsync(selector, modifier);
-  }
-
-  async upsertAsync(selector: any, modifier?: any, options?: any) {
-    return await super.upsertAsync(selector, modifier, options);
-  }
-
-  async removeAsync(selector: any) {
-    return await super.removeAsync(selector);
-  }
-}
-
-/**
- * @memberof Server.<%= name %>
- * @member <%= name %>
- */
-const <%= name %> = new <%= name %>Collection();
-export default <%= name %>;<% } %>
+import { Mongo } from 'meteor/mongo';<% if (where === 'client') { -%>
+export const <%= name %> = new Mongo.Collection(null);<% } else { %>
+
+class <%= name %>Collection extends Mongo.Collection<<%=name%>Collection> {
+ publicFields: any;
+  privateFields: any;
+  allow: any = () => {};
+
+  constructor() {
+    super('<%= name %>');
+
+    this.publicFields = {};
+    this.privateFields = {};
+    this.allow({
+      insert() { return false; },
+      update() { return false; },
+      remove() { return false; },
+    });
+  }
+
+  async createIndexAsync(index: any, options: any) {
+    return await createIndexAsync(index, options);
+  }
+
+  find(selector = {}, modifier?: any) {
+    return super.find(selector, modifier);
+  }
+
+  async findOneAsync(selector = {}, modifier?: any) {
+    return super.findOneAsync(selector, modifier);
+  }
+
+  async insertAsync(doc: any) {
+    return await super.insertAsync(doc);
+  }
+
+  async updateAsync(selector: any, modifier?: any) {
+    return await super.updateAsync(selector, modifier);
+  }
+
+  async upsertAsync(selector: any, modifier?: any, options?: any) {
+    return await super.upsertAsync(selector, modifier, options);
+  }
+
+  async removeAsync(selector: any) {
+    return await super.removeAsync(selector);
+  }
+}
+
+/**
+ * @memberof Server.<%= name %>
+ * @member <%= name %>
+ */
+const <%= name %> = new <%= name %>Collection();
+export default <%= name %>;<% } %>

package/bundle/typescript/src/templates/meteor/collection/tests.js

@@ -1,27 +1,27 @@
-/* eslint-env jasmine */
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-  const <%= name %> = require('./<%= fileName %>').default;
-  describe('<%= name %>', () => {
-    <% if (test === 'jasmine') { %>
-       it('has been defined', () => {
-         let isDefined = false;
-         if(<%= name %>) {
-           isDefined = true;
-         }
-
-         expect(isDefined).toBe(true);
-
-       });
-    <% } else if (test === 'mocha') { %>
-       it('has been defined', () => {
-         let isDefined = false;
-         if(<%= name %>) {
-           isDefined = true;
-         }
-         assert.equal(isDefined, true);
-       });
-     <% } %>
-  });
-}
+/* eslint-env jasmine */
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isServer) {
+  const <%= name %> = require('./<%= fileName %>').default;
+  describe('<%= name %>', () => {
+    <% if (test === 'jasmine') { %>
+       it('has been defined', () => {
+         let isDefined = false;
+         if(<%= name %>) {
+           isDefined = true;
+         }
+
+         expect(isDefined).toBe(true);
+
+       });
+    <% } else if (test === 'mocha') { %>
+       it('has been defined', () => {
+         let isDefined = false;
+         if(<%= name %>) {
+           isDefined = true;
+         }
+         assert.equal(isDefined, true);
+       });
+     <% } %>
+  });
+}

package/bundle/typescript/src/templates/meteor/collection/tests.js.ts

@@ -1,27 +1,27 @@
-/* eslint-env jasmine */
-import { Meteor } from 'meteor/meteor';
-
-if (Meteor.isServer) {
-  const <%= name %> = require('./<%= fileName %>').default;
-  describe('<%= name %>', () => {
-    <% if (test === 'jasmine') { %>
-       it('has been defined', () => {
-         let isDefined = false;
-         if(<%= name %>) {
-           isDefined = true;
-         }
-
-         expect(isDefined).toBe(true);
-
-       });
-    <% } else if (test === 'mocha') { %>
-       it('has been defined', () => {
-         let isDefined = false;
-         if(<%= name %>) {
-           isDefined = true;
-         }
-         assert.equal(isDefined, true);
-       });
-     <% } %>
-  });
-}
+/* eslint-env jasmine */
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isServer) {
+  const <%= name %> = require('./<%= fileName %>').default;
+  describe('<%= name %>', () => {
+    <% if (test === 'jasmine') { %>
+       it('has been defined', () => {
+         let isDefined = false;
+         if(<%= name %>) {
+           isDefined = true;
+         }
+
+         expect(isDefined).toBe(true);
+
+       });
+    <% } else if (test === 'mocha') { %>
+       it('has been defined', () => {
+         let isDefined = false;
+         if(<%= name %>) {
+           isDefined = true;
+         }
+         assert.equal(isDefined, true);
+       });
+     <% } %>
+  });
+}

package/bundle/typescript/src/templates/meteor/config/deploy.sh.template

@@ -1,101 +1,101 @@
-# DATA VOLUME: if a second, bare (unpartitioned, unformatted) disk is
-# attached to this instance, claim it for the bundle -- the thing most
-# likely to blow out a small root volume on a redeploy (a staged
-# extract briefly holds old + new bundle at once). A disk that already
-# has partitions is left alone; only a genuinely blank one gets
-# formatted. No-op on a single-disk box.
-ROOT_DISK=$(lsblk -no pkname "$(findmnt -no SOURCE /)" 2>/dev/null)
-DATA_DEV=$(lsblk -ndo NAME,TYPE | awk -v root="$ROOT_DISK" '$2=="disk" && $1!=root {print $1; exit}')
-if [ -n "$DATA_DEV" ] && ! mountpoint -q /mnt/data; then
-  sudo mkdir -p /mnt/data
-  if [ "$(lsblk -ndo NAME "/dev/$DATA_DEV" | wc -l)" = "1" ]; then
-    sudo blkid "/dev/$DATA_DEV" >/dev/null 2>&1 || sudo mkfs -t ext4 -L data "/dev/$DATA_DEV"
-    UUID=$(sudo blkid -s UUID -o value "/dev/$DATA_DEV")
-    grep -q "$UUID" /etc/fstab || echo "UUID=$UUID /mnt/data ext4 defaults,nofail 0 2" | sudo tee -a /etc/fstab
-    sudo mount /mnt/data
-    sudo chown "$(whoami):$(whoami)" /mnt/data
-  else
-    echo "/dev/$DATA_DEV has existing partitions -- not touching it automatically"
-  fi
-fi
-BUNDLE_ROOT=$HOME
-mountpoint -q /mnt/data && BUNDLE_ROOT=/mnt/data
-sudo apt-get update
-# install git and nginx
-sudo apt install build-essential git nginx -y
-# setup node and npm with the proper node version using nvm
-git clone https://gist.github.com/c427ccd6f4377b39299b9d402f5d51fe.git ~/maka-env/nvm-install
-rm -rf ~/.bash_profile ~/.bashrc
-touch ~/.bash_profile ~/.bashrc
-echo "test -f ~/.bashrc && . ~/.bashrc" > ~/.bash_profile
-chmod +x ~/maka-env/nvm-install/nvm-install.sh && ~/maka-env/nvm-install/nvm-install.sh
-source ~/.bashrc
-nvm install <%= nodeVersion %> || nvm install <%= fallbackVersion %>
-[ "$(nvm current)" == "<%= nodeVersion %>" ] && nvm alias default <%= nodeVersion %> || nvm alias default <%= fallbackVersion %>
-npm install -g pm2@latest
-npm install -g @dotenvx/dotenvx@latest
-pm2 install pm2-logrotate
-pm2 set pm2-logrotate:max_size 20M
-pm2 set pm2-logrotate:compress true
-pm2 set pm2-logrotate:retain 30
-rm -rf ~/maka-env/nvm-install
-# Prepare nginx
-[ -d /etc/systemd/system/nginx.service.d ] && echo "nginx.service.d exists" || sudo mkdir /etc/systemd/system/nginx.service.d
-printf "[Service]\nExecStartPost=/bin/sleep 0.1\n" > override.conf
-sudo cp override.conf /etc/systemd/system/nginx.service.d/override.conf
-sudo systemctl daemon-reload || null
-sudo systemctl stop nginx
-sudo nginx -s stop
-sudo cp ~/nginx.conf /etc/nginx/sites-enabled/default
-sudo systemctl daemon-reload && sudo systemctl start nginx
-# Ensure certbot is installed and re-inject the SSL server block that
-# `sudo cp` above just overwrote (domain/email from letsencrypt.json).
-# certbot --nginx is idempotent: skips reissuing a still-valid cert but
-# always makes sure the nginx config has the SSL block wired in.
-sudo snap install core >/dev/null 2>&1
-sudo snap refresh core >/dev/null 2>&1
-sudo snap install --classic certbot >/dev/null 2>&1 || true
-[ -L /usr/bin/certbot ] || sudo ln -s /snap/bin/certbot /usr/bin/certbot
-sudo certbot --nginx --agree-tos --expand -n --domains <%= domainNames %> --email <%= emailUpdate %>
-# Decompress the bundle -- extracted onto BUNDLE_ROOT (the data volume
-# when one's attached, see above), with ~/bundle symlinked to it so
-# everything downstream (pm2, `cd bundle/programs/server` below) keeps
-# resolving relative to $HOME unchanged.
-echo "Attempting to decompress the bundle"
-if [ -f app.tar.gz ]; then
-  echo "Bundle found, decompressing"
-  rm -rf "$BUNDLE_ROOT/bundle"
-  tar -xf app.tar.gz -C "$BUNDLE_ROOT"
-elif [ -f app.tar.gz.bk ]; then
-  echo "No bundle found, using backup"
-  cp app.tar.gz.bk app.tar.gz
-  rm -rf "$BUNDLE_ROOT/bundle"
-  tar -xf app.tar.gz -C "$BUNDLE_ROOT"
-else
-  echo "Could not find app.tar.gz, exiting!"
-  exit 1
-fi
-[ "$BUNDLE_ROOT" = "$HOME" ] || ln -sfn "$BUNDLE_ROOT/bundle" ~/bundle
-cd bundle/programs/server
-npm install
-npm audit fix --force
-cd ~
-# Reset pm2
-pm2 delete all
-# updating PM2 to latest
-pm2 update
-# Bring up pm2 with environment
-if [ -f ~/process.env ]; then
-  dotenvx run -f ~/process.env -- pm2 start ~/pm2.config.js
-else
-  pm2 start ~/pm2.config.js
-fi
-# Configure pm2 to start on boot
-pm2 startup
-sudo env PATH=$PATH:$(which npm) $(which pm2) startup systemd -u <%= ec2User %> --hp /home/<%= ec2User %>
-pm2 save
-# remove backup tar, if any
-# rm -f ~/app.tar.gz.bk
-# backup tar bundle
-mv ~/app.tar.gz ~/app.tar.gz.bk
-exit 0
+# DATA VOLUME: if a second, bare (unpartitioned, unformatted) disk is
+# attached to this instance, claim it for the bundle -- the thing most
+# likely to blow out a small root volume on a redeploy (a staged
+# extract briefly holds old + new bundle at once). A disk that already
+# has partitions is left alone; only a genuinely blank one gets
+# formatted. No-op on a single-disk box.
+ROOT_DISK=$(lsblk -no pkname "$(findmnt -no SOURCE /)" 2>/dev/null)
+DATA_DEV=$(lsblk -ndo NAME,TYPE | awk -v root="$ROOT_DISK" '$2=="disk" && $1!=root {print $1; exit}')
+if [ -n "$DATA_DEV" ] && ! mountpoint -q /mnt/data; then
+  sudo mkdir -p /mnt/data
+  if [ "$(lsblk -ndo NAME "/dev/$DATA_DEV" | wc -l)" = "1" ]; then
+    sudo blkid "/dev/$DATA_DEV" >/dev/null 2>&1 || sudo mkfs -t ext4 -L data "/dev/$DATA_DEV"
+    UUID=$(sudo blkid -s UUID -o value "/dev/$DATA_DEV")
+    grep -q "$UUID" /etc/fstab || echo "UUID=$UUID /mnt/data ext4 defaults,nofail 0 2" | sudo tee -a /etc/fstab
+    sudo mount /mnt/data
+    sudo chown "$(whoami):$(whoami)" /mnt/data
+  else
+    echo "/dev/$DATA_DEV has existing partitions -- not touching it automatically"
+  fi
+fi
+BUNDLE_ROOT=$HOME
+mountpoint -q /mnt/data && BUNDLE_ROOT=/mnt/data
+sudo apt-get update
+# install git and nginx
+sudo apt install build-essential git nginx -y
+# setup node and npm with the proper node version using nvm
+git clone https://gist.github.com/c427ccd6f4377b39299b9d402f5d51fe.git ~/maka-env/nvm-install
+rm -rf ~/.bash_profile ~/.bashrc
+touch ~/.bash_profile ~/.bashrc
+echo "test -f ~/.bashrc && . ~/.bashrc" > ~/.bash_profile
+chmod +x ~/maka-env/nvm-install/nvm-install.sh && ~/maka-env/nvm-install/nvm-install.sh
+source ~/.bashrc
+nvm install <%= nodeVersion %> || nvm install <%= fallbackVersion %>
+[ "$(nvm current)" == "<%= nodeVersion %>" ] && nvm alias default <%= nodeVersion %> || nvm alias default <%= fallbackVersion %>
+npm install -g pm2@latest
+npm install -g @dotenvx/dotenvx@latest
+pm2 install pm2-logrotate
+pm2 set pm2-logrotate:max_size 20M
+pm2 set pm2-logrotate:compress true
+pm2 set pm2-logrotate:retain 30
+rm -rf ~/maka-env/nvm-install
+# Prepare nginx
+[ -d /etc/systemd/system/nginx.service.d ] && echo "nginx.service.d exists" || sudo mkdir /etc/systemd/system/nginx.service.d
+printf "[Service]\nExecStartPost=/bin/sleep 0.1\n" > override.conf
+sudo cp override.conf /etc/systemd/system/nginx.service.d/override.conf
+sudo systemctl daemon-reload || null
+sudo systemctl stop nginx
+sudo nginx -s stop
+sudo cp ~/nginx.conf /etc/nginx/sites-enabled/default
+sudo systemctl daemon-reload && sudo systemctl start nginx
+# Ensure certbot is installed and re-inject the SSL server block that
+# `sudo cp` above just overwrote (domain/email from letsencrypt.json).
+# certbot --nginx is idempotent: skips reissuing a still-valid cert but
+# always makes sure the nginx config has the SSL block wired in.
+sudo snap install core >/dev/null 2>&1
+sudo snap refresh core >/dev/null 2>&1
+sudo snap install --classic certbot >/dev/null 2>&1 || true
+[ -L /usr/bin/certbot ] || sudo ln -s /snap/bin/certbot /usr/bin/certbot
+sudo certbot --nginx --agree-tos --expand -n --domains <%= domainNames %> --email <%= emailUpdate %>
+# Decompress the bundle -- extracted onto BUNDLE_ROOT (the data volume
+# when one's attached, see above), with ~/bundle symlinked to it so
+# everything downstream (pm2, `cd bundle/programs/server` below) keeps
+# resolving relative to $HOME unchanged.
+echo "Attempting to decompress the bundle"
+if [ -f app.tar.gz ]; then
+  echo "Bundle found, decompressing"
+  rm -rf "$BUNDLE_ROOT/bundle"
+  tar -xf app.tar.gz -C "$BUNDLE_ROOT"
+elif [ -f app.tar.gz.bk ]; then
+  echo "No bundle found, using backup"
+  cp app.tar.gz.bk app.tar.gz
+  rm -rf "$BUNDLE_ROOT/bundle"
+  tar -xf app.tar.gz -C "$BUNDLE_ROOT"
+else
+  echo "Could not find app.tar.gz, exiting!"
+  exit 1
+fi
+[ "$BUNDLE_ROOT" = "$HOME" ] || ln -sfn "$BUNDLE_ROOT/bundle" ~/bundle
+cd bundle/programs/server
+npm install
+npm audit fix --force
+cd ~
+# Reset pm2
+pm2 delete all
+# updating PM2 to latest
+pm2 update
+# Bring up pm2 with environment
+if [ -f ~/process.env ]; then
+  dotenvx run -f ~/process.env -- pm2 start ~/pm2.config.js
+else
+  pm2 start ~/pm2.config.js
+fi
+# Configure pm2 to start on boot
+pm2 startup
+sudo env PATH=$PATH:$(which npm) $(which pm2) startup systemd -u <%= ec2User %> --hp /home/<%= ec2User %>
+pm2 save
+# remove backup tar, if any
+# rm -f ~/app.tar.gz.bk
+# backup tar bundle
+mv ~/app.tar.gz ~/app.tar.gz.bk
+exit 0

package/bundle/typescript/src/templates/meteor/config/docker-compose.yaml

@@ -1,17 +1,17 @@
-version: "3.7"
-services:
-  <%= app %>:
-    image: "<%= appFileCase %>:latest"
-    ports:
-      - 80:3000
-    volumes:
-      - ./pm2.config.js:/home/ubuntu/pm2.config.js
-      - ./settings.json:/home/ubuntu/settings.json
-
-  mongo:
-    image: "mongo"
-    ports:
-      - 27017:27017
-
-networks:
-    default:
+version: "3.7"
+services:
+  <%= app %>:
+    image: "<%= appFileCase %>:latest"
+    ports:
+      - 80:3000
+    volumes:
+      - ./pm2.config.js:/home/ubuntu/pm2.config.js
+      - ./settings.json:/home/ubuntu/settings.json
+
+  mongo:
+    image: "mongo"
+    ports:
+      - 27017:27017
+
+networks:
+    default:

package/bundle/typescript/src/templates/meteor/config/nginx.conf.template

@@ -1,31 +1,31 @@
-server_tokens off;
-map $http_upgrade $connection_upgrade {
-	default upgrade;
-	''      close;
-}
-
-server {
-	listen 80 default_server;
-	listen [::]:80 default_server ipv6only=on;
-<% if (domainNames) { -%>
-	server_name <%= domainNames.split(',').map(function(d) { return d.trim(); }).join(' ') %>;
-<% } -%>
-	if ($http_user_agent ~ "MSIE" ) {
-		return 303 https://browser-update.org/update.html;
-	}
-	location = /favicon.ico {
-		alias /home/<%= ec2User %>/bundle/programs/web.browser/app;
-	}
-
-	location / {
-		proxy_pass http://0.0.0.0:3000;
-		proxy_http_version 1.1;
-		proxy_set_header Upgrade $http_upgrade;
-		proxy_set_header Connection "upgrade";
-		proxy_set_header X-Forwarded-For $remote_addr;
-		proxy_set_header Host $host;
-		if ($uri != '/') {
-			expires 30d;
-		}
-	}
-}
+server_tokens off;
+map $http_upgrade $connection_upgrade {
+	default upgrade;
+	''      close;
+}
+
+server {
+	listen 80 default_server;
+	listen [::]:80 default_server ipv6only=on;
+<% if (domainNames) { -%>
+	server_name <%= domainNames.split(',').map(function(d) { return d.trim(); }).join(' ') %>;
+<% } -%>
+	if ($http_user_agent ~ "MSIE" ) {
+		return 303 https://browser-update.org/update.html;
+	}
+	location = /favicon.ico {
+		alias /home/<%= ec2User %>/bundle/programs/web.browser/app;
+	}
+
+	location / {
+		proxy_pass http://0.0.0.0:3000;
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection "upgrade";
+		proxy_set_header X-Forwarded-For $remote_addr;
+		proxy_set_header Host $host;
+		if ($uri != '/') {
+			expires 30d;
+		}
+	}
+}