@maka/maka-cli 5.123.0 → 5.123.1

package/bundle/typescript/src/templates/meteor/config/pm2.config.js

@@ -1,27 +1,27 @@
-const meteorSettings = require('./settings.json');
-
-const PORT = 3000;
-
-module.exports = {
-  apps : [
-      {
-        name: '<%= app %>',
-        script: './bundle/main.js',
-        instance_var: 'PROCESS_ID',
-        watch: false,
-        env: {
-          ROOT_URL: process.env.ROOT_URL || `http://0.0.0.0<% if (isDocker) { %>:${PORT}<% } %>`,
-          PORT,
-          MONGO_URL: process.env.MONGO_URL || 'mongodb://<% if (isDocker) { %>mongo<% } else { %>localhost<% } %>:27017/<%= app %>',
-          MAIL_URL: process.env.MAIL_URL || 'smtp://username:password@host:port',
-          METEOR_SETTINGS: { ...meteorSettings },
-        },
-        node_args: "--max_old_space_size=1024",
-        max_memory_restart: '300M',
-        exp_backoff_restart_delay: 100,
-        //instances: 'max',
-        //exec_mode: 'cluster',
-      }
-  ]
-}
-
+const meteorSettings = require('./settings.json');
+
+const PORT = 3000;
+
+module.exports = {
+  apps : [
+      {
+        name: '<%= app %>',
+        script: './bundle/main.js',
+        instance_var: 'PROCESS_ID',
+        watch: false,
+        env: {
+          ROOT_URL: process.env.ROOT_URL || `http://0.0.0.0<% if (isDocker) { %>:${PORT}<% } %>`,
+          PORT,
+          MONGO_URL: process.env.MONGO_URL || 'mongodb://<% if (isDocker) { %>mongo<% } else { %>localhost<% } %>:27017/<%= app %>',
+          MAIL_URL: process.env.MAIL_URL || 'smtp://username:password@host:port',
+          METEOR_SETTINGS: { ...meteorSettings },
+        },
+        node_args: "--max_old_space_size=1024",
+        max_memory_restart: '300M',
+        exp_backoff_restart_delay: 100,
+        //instances: 'max',
+        //exec_mode: 'cluster',
+      }
+  ]
+}
+

package/bundle/typescript/src/templates/meteor/config/process.env

@@ -1,5 +1,5 @@
-# These values are for running this environment locally.
-# Configure prod environment values for your deployment (pm2, galaxy)
-#MAIL_URL="smtp://gmail.com:25"
-#MONGO_URL="mongodb://localhost:27017/<%= app %>"
-#ROOT_URL="http://localhost:3000"
+# These values are for running this environment locally.
+# Configure prod environment values for your deployment (pm2, galaxy)
+#MAIL_URL="smtp://gmail.com:25"
+#MONGO_URL="mongodb://localhost:27017/<%= app %>"
+#ROOT_URL="http://localhost:3000"

package/bundle/typescript/src/templates/meteor/config/settings.json

@@ -1,11 +1,11 @@
-{
-  "public": {
-    "logoutOnClose": false,
-    "enableServiceWorker": false
-  },
-  "//server": "//Will not run on client",
-  "language": "en",
-  "extraAllowedOrigins": [""],
-  "devAllowedOrigins": ["cdn.jsdelivr.net", "fonts.googleapis.com", "fonts.gstatic.com"],
-  "enforceCSP": true
-}
+{
+  "public": {
+    "logoutOnClose": false,
+    "enableServiceWorker": false
+  },
+  "//server": "//Will not run on client",
+  "language": "en",
+  "extraAllowedOrigins": [""],
+  "devAllowedOrigins": ["cdn.jsdelivr.net", "fonts.googleapis.com", "fonts.gstatic.com"],
+  "enforceCSP": true
+}

package/bundle/typescript/src/templates/meteor/config/ssh.json

@@ -1,6 +1,6 @@
-{
-  "host": "1.2.3.4",
-  "port": 22,
-  "user": "ubuntu",
-  "pem": "_keys/<%= app %>.pem.txt"
-}
+{
+  "host": "1.2.3.4",
+  "port": 22,
+  "user": "ubuntu",
+  "pem": "_keys/<%= app %>.pem.txt"
+}

package/bundle/typescript/src/templates/meteor/dbc/config.js

@@ -1,70 +1,70 @@
-/* Copy the following into respective settings.json files for each
- * environment you wish to enable (dev, staging, prod, etc). */
-<% if (type === 'pgsql') { %>
-/*
-"<%= camelCase %>PgConfig": {
-  "pgUser": "",
-  "pgDatabase": "",
-  "pgPassword": "",
-  "pgHost": "localhost",
-  "pgPort": 5432,
-  "pgMaxPoolClients": 10,
-  "pgTimeoutMilli": 5000
-}
-*/
-const pgConfig = Meteor.settings.<%= camelCase %>PgConfig;
-const config = {
-	user:               pgConfig?.pgUser,
-	database:           pgConfig?.pgDatabase,
-	password:           pgConfig?.pgPassword,
-	host:               pgConfig?.pgHost,
-	port:               pgConfig?.pgPort,
-	max:                pgConfig?.pgMaxPoolClients,
-	idleTimeoutMillis:  pgConfig?.pgTimeoutMilli
-};
-
-export default config;
-<% } else if (type === 'mssql') { %>
-/*
-"<%= camelCase %>MsConfig": {
-  "msUser": "",
-  "msDatabase": "",
-  "msPassword": "",
-  "msHost": "localhost",
-  "msPort": 1433,
-  "msMaxPoolClients": 10,
-  "msPoolTimeoutMilli": 5000,
-  "trustedConnections": true
-}
-*/
-const msConfig = Meteor.settings.<%= camelCase %>MsConfig;
-const config = {
-	user:                 msConfig?.msUser,
-	database:             msConfig?.msDatabase,
-	password:             msConfig?.msPassword,
-	server:               msConfig?.msHost,
-	port:                 msConfig?.msPort,
-  pool: {
-    max:                msConfig?.msMaxPoolClients,
-    idleTimeoutMillis:  msConfig?.msPoolTimeoutMilli
-  },
-  options: {
-    trustedConnecton:   msConfig?.trustedConnections
-  }
-};
-
-export default config;
-<% } else if (type === 'sqlite') { %>
-/*
-"<%= camelCase %>LiteConfig": {
-  "readonly": false,
-  "fileMustExist": false
-}
-*/
-const sqliteConfig = Meteor.settings.<%= camelCase %>LiteConfig;
-const config = {
-  readonly:       sqliteConfig?.readonly,
-  fileMustExist:  sqliteConfig?.fileMustExist
-}
-export default config;
-<% } %>
+/* Copy the following into respective settings.json files for each
+ * environment you wish to enable (dev, staging, prod, etc). */
+<% if (type === 'pgsql') { %>
+/*
+"<%= camelCase %>PgConfig": {
+  "pgUser": "",
+  "pgDatabase": "",
+  "pgPassword": "",
+  "pgHost": "localhost",
+  "pgPort": 5432,
+  "pgMaxPoolClients": 10,
+  "pgTimeoutMilli": 5000
+}
+*/
+const pgConfig = Meteor.settings.<%= camelCase %>PgConfig;
+const config = {
+	user:               pgConfig?.pgUser,
+	database:           pgConfig?.pgDatabase,
+	password:           pgConfig?.pgPassword,
+	host:               pgConfig?.pgHost,
+	port:               pgConfig?.pgPort,
+	max:                pgConfig?.pgMaxPoolClients,
+	idleTimeoutMillis:  pgConfig?.pgTimeoutMilli
+};
+
+export default config;
+<% } else if (type === 'mssql') { %>
+/*
+"<%= camelCase %>MsConfig": {
+  "msUser": "",
+  "msDatabase": "",
+  "msPassword": "",
+  "msHost": "localhost",
+  "msPort": 1433,
+  "msMaxPoolClients": 10,
+  "msPoolTimeoutMilli": 5000,
+  "trustedConnections": true
+}
+*/
+const msConfig = Meteor.settings.<%= camelCase %>MsConfig;
+const config = {
+	user:                 msConfig?.msUser,
+	database:             msConfig?.msDatabase,
+	password:             msConfig?.msPassword,
+	server:               msConfig?.msHost,
+	port:                 msConfig?.msPort,
+  pool: {
+    max:                msConfig?.msMaxPoolClients,
+    idleTimeoutMillis:  msConfig?.msPoolTimeoutMilli
+  },
+  options: {
+    trustedConnecton:   msConfig?.trustedConnections
+  }
+};
+
+export default config;
+<% } else if (type === 'sqlite') { %>
+/*
+"<%= camelCase %>LiteConfig": {
+  "readonly": false,
+  "fileMustExist": false
+}
+*/
+const sqliteConfig = Meteor.settings.<%= camelCase %>LiteConfig;
+const config = {
+  readonly:       sqliteConfig?.readonly,
+  fileMustExist:  sqliteConfig?.fileMustExist
+}
+export default config;
+<% } %>

package/bundle/typescript/src/templates/meteor/dbc/config.js.ts

@@ -1,70 +1,70 @@
-/* Copy the following into respective settings.json files for each
- * environment you wish to enable (dev, staging, prod, etc). */
-<% if (type === 'pgsql') { %>
-/*
-"<%= camelCase %>PgConfig": {
-  "pgUser": "",
-  "pgDatabase": "",
-  "pgPassword": "",
-  "pgHost": "localhost",
-  "pgPort": 5432,
-  "pgMaxPoolClients": 10,
-  "pgTimeoutMilli": 5000
-}
-*/
-const pgConfig = Meteor.settings.<%= camelCase %>PgConfig;
-const config = {
-	user:               pgConfig?.pgUser,
-	database:           pgConfig?.pgDatabase,
-	password:           pgConfig?.pgPassword,
-	host:               pgConfig?.pgHost,
-	port:               pgConfig?.pgPort,
-	max:                pgConfig?.pgMaxPoolClients,
-	idleTimeoutMillis:  pgConfig?.pgTimeoutMilli
-};
-
-export default config;
-<% } else if (type === 'mssql') { %>
-/*
-"<%= camelCase %>MsConfig": {
-  "msUser": "",
-  "msDatabase": "",
-  "msPassword": "",
-  "msHost": "localhost",
-  "msPort": 1433,
-  "msMaxPoolClients": 10,
-  "msPoolTimeoutMilli": 5000,
-  "trustedConnections": true
-}
-*/
-const msConfig = Meteor.settings.<%= camelCase %>MsConfig;
-const config = {
-	user:                 msConfig?.msUser,
-	database:             msConfig?.msDatabase,
-	password:             msConfig?.msPassword,
-	server:               msConfig?.msHost,
-	port:                 msConfig?.msPort,
-  pool: {
-    max:                msConfig?.msMaxPoolClients,
-    idleTimeoutMillis:  msConfig?.msPoolTimeoutMilli
-  },
-  options: {
-    trustedConnecton:   msConfig?.trustedConnections
-  }
-};
-
-export default config;
-<% } else if (type === 'sqlite') { %>
-/*
-"<%= camelCase %>LiteConfig": {
-  "readonly": false,
-  "fileMustExist": false
-}
-*/
-const sqliteConfig = Meteor.settings.<%= camelCase %>LiteConfig;
-const config = {
-  readonly:       sqliteConfig?.readonly,
-  fileMustExist:  sqliteConfig?.fileMustExist
-}
-export default config;
-<% } %>
+/* Copy the following into respective settings.json files for each
+ * environment you wish to enable (dev, staging, prod, etc). */
+<% if (type === 'pgsql') { %>
+/*
+"<%= camelCase %>PgConfig": {
+  "pgUser": "",
+  "pgDatabase": "",
+  "pgPassword": "",
+  "pgHost": "localhost",
+  "pgPort": 5432,
+  "pgMaxPoolClients": 10,
+  "pgTimeoutMilli": 5000
+}
+*/
+const pgConfig = Meteor.settings.<%= camelCase %>PgConfig;
+const config = {
+	user:               pgConfig?.pgUser,
+	database:           pgConfig?.pgDatabase,
+	password:           pgConfig?.pgPassword,
+	host:               pgConfig?.pgHost,
+	port:               pgConfig?.pgPort,
+	max:                pgConfig?.pgMaxPoolClients,
+	idleTimeoutMillis:  pgConfig?.pgTimeoutMilli
+};
+
+export default config;
+<% } else if (type === 'mssql') { %>
+/*
+"<%= camelCase %>MsConfig": {
+  "msUser": "",
+  "msDatabase": "",
+  "msPassword": "",
+  "msHost": "localhost",
+  "msPort": 1433,
+  "msMaxPoolClients": 10,
+  "msPoolTimeoutMilli": 5000,
+  "trustedConnections": true
+}
+*/
+const msConfig = Meteor.settings.<%= camelCase %>MsConfig;
+const config = {
+	user:                 msConfig?.msUser,
+	database:             msConfig?.msDatabase,
+	password:             msConfig?.msPassword,
+	server:               msConfig?.msHost,
+	port:                 msConfig?.msPort,
+  pool: {
+    max:                msConfig?.msMaxPoolClients,
+    idleTimeoutMillis:  msConfig?.msPoolTimeoutMilli
+  },
+  options: {
+    trustedConnecton:   msConfig?.trustedConnections
+  }
+};
+
+export default config;
+<% } else if (type === 'sqlite') { %>
+/*
+"<%= camelCase %>LiteConfig": {
+  "readonly": false,
+  "fileMustExist": false
+}
+*/
+const sqliteConfig = Meteor.settings.<%= camelCase %>LiteConfig;
+const config = {
+  readonly:       sqliteConfig?.readonly,
+  fileMustExist:  sqliteConfig?.fileMustExist
+}
+export default config;
+<% } %>

package/bundle/typescript/src/templates/meteor/dbc/conn.js

@@ -1,37 +1,37 @@
-<% if (type === 'pgsql') { %>
-// https://node-postgres.com/features/pooling
-import pg from 'pg';
-import config from './config';
-
-console.log(`Enabling <%= name %> PG SQL client pool ...`);
-const <%= camelCase %>PgPool = new pg.Pool(config);
-<%= camelCase %>PgPool.on('error', (err) => {
-  console.error(`Unexpected PostgreSQL error on idle client: ${err}`);
-});
-
-export default <%= camelCase %>PgPool;
-<% } else if (type === 'mssql') { %>
-// https://www.npmjs.com/package/mssql
-import sql from 'mssql';
-import config from './config';
-
-console.log(`Enabling <%= name %> MS SQL client pool ...`);
-const <%= camelCase %>MsPool = new sql.ConnectionPool(config, err => {
-  if (err) {
-    console.error(`<%= name %> connection NOT established.  ${err}`);
-    console.error(`Check configuration /imports/startup/server/dbc/<%=fileName%>/config.<%=engine%>`);
-  } else {
-    console.log(`Connection to <%= name %> SQL Server established.`);
-  }
-});
-
-export default <%= camelCase %>MsPool;
-<% } else if (type === 'sqlite') { %>
-// https://github.com/JoshuaWise/better-sqlite
-import Database from 'better-sqlite3';
-import config from './config';
-
-console.log(`Enabling <%= name %> SQL LITE3 database ...`);
-const <%= camelCase %>SqlLiteDB = new Database(`${process.env['PWD']}/private/<%= camelCase %>.db`, config);
-export default <%= camelCase %>SqlLiteDB;
-<% } %>
+<% if (type === 'pgsql') { %>
+// https://node-postgres.com/features/pooling
+import pg from 'pg';
+import config from './config';
+
+console.log(`Enabling <%= name %> PG SQL client pool ...`);
+const <%= camelCase %>PgPool = new pg.Pool(config);
+<%= camelCase %>PgPool.on('error', (err) => {
+  console.error(`Unexpected PostgreSQL error on idle client: ${err}`);
+});
+
+export default <%= camelCase %>PgPool;
+<% } else if (type === 'mssql') { %>
+// https://www.npmjs.com/package/mssql
+import sql from 'mssql';
+import config from './config';
+
+console.log(`Enabling <%= name %> MS SQL client pool ...`);
+const <%= camelCase %>MsPool = new sql.ConnectionPool(config, err => {
+  if (err) {
+    console.error(`<%= name %> connection NOT established.  ${err}`);
+    console.error(`Check configuration /imports/startup/server/dbc/<%=fileName%>/config.<%=engine%>`);
+  } else {
+    console.log(`Connection to <%= name %> SQL Server established.`);
+  }
+});
+
+export default <%= camelCase %>MsPool;
+<% } else if (type === 'sqlite') { %>
+// https://github.com/JoshuaWise/better-sqlite
+import Database from 'better-sqlite3';
+import config from './config';
+
+console.log(`Enabling <%= name %> SQL LITE3 database ...`);
+const <%= camelCase %>SqlLiteDB = new Database(`${process.env['PWD']}/private/<%= camelCase %>.db`, config);
+export default <%= camelCase %>SqlLiteDB;
+<% } %>

package/bundle/typescript/src/templates/meteor/dbc/conn.js.ts

@@ -1,37 +1,37 @@
-<% if (type === 'pgsql') { %>
-// https://node-postgres.com/features/pooling
-import pg from 'pg';
-import config from './config';
-
-console.log(`[+] Enabling <%= name %> PG SQL client pool ...`);
-const <%= camelCase %>PgPool = new pg.Pool(config);
-<%= camelCase %>PgPool.on('error', (err, client) => {
-  console.log(`[!] Unexpected PostgreSQL error on idle client: ${err}`);
-});
-
-export default <%= camelCase %>PgPool;
-<% } else if (type === 'mssql') { %>
-// https://www.npmjs.com/package/mssql
-import sql from 'mssql';
-import config from './config';
-
-console.log(`[+] Enabling <%= name %> MS SQL client pool ...`);
-const <%= camelCase %>MsPool = new sql.ConnectionPool(config, err => {
-  if (err) {
-    console.log(`[-] <%= name %> connection NOT established.  ${err}`);
-    console.log(`[!] Check configuration /imports/startup/server/dbc/<%=fileName%>/config.<%=engine%>`);
-  } else {
-    console.log(`[+] Connection to <%= name %> SQL Server established.`);
-  }
-});
-
-export default <%= camelCase %>MsPool;
-<% } else if (type === 'sqlite') { %>
-// https://github.com/JoshuaWise/better-sqlite
-import Database from 'better-sqlite3';
-import config from './config';
-
-console.log(`[+] Enabling <%= name %> SQL LITE3 database ...`);
-const <%= camelCase %>SqlLiteDB = new Database(`${process.env['PWD']}/private/<%= camelCase %>.db`, config);
-export default <%= camelCase %>SqlLiteDB;
-<% } %>
+<% if (type === 'pgsql') { %>
+// https://node-postgres.com/features/pooling
+import pg from 'pg';
+import config from './config';
+
+console.log(`[+] Enabling <%= name %> PG SQL client pool ...`);
+const <%= camelCase %>PgPool = new pg.Pool(config);
+<%= camelCase %>PgPool.on('error', (err, client) => {
+  console.log(`[!] Unexpected PostgreSQL error on idle client: ${err}`);
+});
+
+export default <%= camelCase %>PgPool;
+<% } else if (type === 'mssql') { %>
+// https://www.npmjs.com/package/mssql
+import sql from 'mssql';
+import config from './config';
+
+console.log(`[+] Enabling <%= name %> MS SQL client pool ...`);
+const <%= camelCase %>MsPool = new sql.ConnectionPool(config, err => {
+  if (err) {
+    console.log(`[-] <%= name %> connection NOT established.  ${err}`);
+    console.log(`[!] Check configuration /imports/startup/server/dbc/<%=fileName%>/config.<%=engine%>`);
+  } else {
+    console.log(`[+] Connection to <%= name %> SQL Server established.`);
+  }
+});
+
+export default <%= camelCase %>MsPool;
+<% } else if (type === 'sqlite') { %>
+// https://github.com/JoshuaWise/better-sqlite
+import Database from 'better-sqlite3';
+import config from './config';
+
+console.log(`[+] Enabling <%= name %> SQL LITE3 database ...`);
+const <%= camelCase %>SqlLiteDB = new Database(`${process.env['PWD']}/private/<%= camelCase %>.db`, config);
+export default <%= camelCase %>SqlLiteDB;
+<% } %>

package/bundle/typescript/src/templates/meteor/dbc/register-dbc.js

@@ -1,3 +1,3 @@
-import './dbc/<%= fileName %>/config';
-import './dbc/<%= fileName %>/conn';
-
+import './dbc/<%= fileName %>/config';
+import './dbc/<%= fileName %>/conn';
+

package/bundle/typescript/src/templates/meteor/dbc/register-dbc.js.ts

@@ -1,3 +1,3 @@
-import './dbc/<%= fileName %>/config';
-import './dbc/<%= fileName %>/conn';
-
+import './dbc/<%= fileName %>/config';
+import './dbc/<%= fileName %>/conn';
+