@maka/maka-cli 5.122.1 → 5.123.1

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

@@ -1,5 +1,5 @@
-<% if (client === 'vanilla') { %>if (this.window.location.pathname === '<%= url %>') {
-  import <%= camelCaseName %>Page from '/imports/ui/pages/<%= fileCase %>/<%= fileCase %>';
-}<% } else { %>
-  <Route path="<%= url %>" element={Component.<%= templateName %>}/>
-<% } %>
+<% if (client === 'vanilla') { %>if (this.window.location.pathname === '<%= url %>') {
+  import <%= camelCaseName %>Page from '/imports/ui/pages/<%= fileCase %>/<%= fileCase %>';
+}<% } else { %>
+  <Route path="<%= url %>" element={Component.<%= templateName %>}/>
+<% } %>

package/bundle/typescript/src/templates/react/route/route.js.ts

@@ -1,8 +1,8 @@
-<% if (client === 'vanilla') { %>if (this.window.location.pathname === '<%= url %>') {
-  import <%= camelCaseName %>Page from '/imports/ui/pages/<%= fileCase %>/<%= fileCase %>';
-}<% } else { %>
-<% if (newForm) { %>const <%= templateName %> = (<% } %>
-  <Route path="<%= url %>" component={Component.<%= layout %>}>
-    <IndexRoute component={Component.<%= templateName %>}/>
-  </Route>
-<% if (newForm) { %>);<% } %><% } %>
+<% if (client === 'vanilla') { %>if (this.window.location.pathname === '<%= url %>') {
+  import <%= camelCaseName %>Page from '/imports/ui/pages/<%= fileCase %>/<%= fileCase %>';
+}<% } else { %>
+<% if (newForm) { %>const <%= templateName %> = (<% } %>
+  <Route path="<%= url %>" component={Component.<%= layout %>}>
+    <IndexRoute component={Component.<%= templateName %>}/>
+  </Route>
+<% if (newForm) { %>);<% } %><% } %>

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

@@ -1,5 +1,5 @@
-<% if (client === 'vanilla') { %>if (this.window.location.pathname === '<%= url %>') {
-  import <%= camelCaseName %>Page from '/imports/ui/pages/<%= fileCase %>/<%= fileCase %>';
-}<% } else { %>
-  <Route path="<%= url %>" element={Component.<%= templateName %>}/>
-<% } %>
+<% if (client === 'vanilla') { %>if (this.window.location.pathname === '<%= url %>') {
+  import <%= camelCaseName %>Page from '/imports/ui/pages/<%= fileCase %>/<%= fileCase %>';
+}<% } else { %>
+  <Route path="<%= url %>" element={Component.<%= templateName %>}/>
+<% } %>

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

@@ -1 +1 @@
-
+

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

@@ -1,40 +1,40 @@
-import { Meteor } from 'meteor/meteor';
-import { render } from '@testing-library/react';
-<% if (test === 'mocha') { %>import { expect } from 'chai';<% } %>
-
-if (Meteor.isClient) {<% if(clientGraphql === 'apollo') { %>
-  const { MockedProvider } = require('@apollo/client/testing/react');
-  const gql = require('graphql-tag');
-  const mocks = [
-    {
-      request: {
-        query: gql`query { trucks }`, // consider importing the query from the actual component
-        variables: {
-          sample: 'variable'
-        },
-      },
-      result: {
-        data: {
-          trucks: 'hello trucks'
-        }
-      }
-    }
-  ];
-<% } %>
-  const { <%=className%>%> } = require('./<%= fileName %>');
-  describe('<<%= className %>/>', function() {
-
-   it('did render', () => {
-   <%if(clientGraphql === 'apollo') { %>
-     const <%=camelCaseName%> = render(
-        <MockedProvider mocks={mocks}>
-         <<%= className %>/>
-       </MockedProvider>
-     );<% } else { %>
-     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);<% } %>
-    });
-  });
-}
+import { Meteor } from 'meteor/meteor';
+import { render } from '@testing-library/react';
+<% if (test === 'mocha') { %>import { expect } from 'chai';<% } %>
+
+if (Meteor.isClient) {<% if(clientGraphql === 'apollo') { %>
+  const { MockedProvider } = require('@apollo/client/testing/react');
+  const gql = require('graphql-tag');
+  const mocks = [
+    {
+      request: {
+        query: gql`query { trucks }`, // consider importing the query from the actual component
+        variables: {
+          sample: 'variable'
+        },
+      },
+      result: {
+        data: {
+          trucks: 'hello trucks'
+        }
+      }
+    }
+  ];
+<% } %>
+  const { <%=className%>%> } = require('./<%= fileName %>');
+  describe('<<%= className %>/>', function() {
+
+   it('did render', () => {
+   <%if(clientGraphql === 'apollo') { %>
+     const <%=camelCaseName%> = render(
+        <MockedProvider mocks={mocks}>
+         <<%= className %>/>
+       </MockedProvider>
+     );<% } else { %>
+     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);<% } %>
+    });
+  });
+}

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

@@ -1 +1 @@
-
+

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

@@ -1,40 +1,40 @@
-import { Meteor } from 'meteor/meteor';
-import { render } from '@testing-library/react';
-<% if (test === 'mocha') { %>import { expect } from 'chai';<% } %>
-
-if (Meteor.isClient) {<% if(clientGraphql === 'apollo') { %>
-  const { MockedProvider } = require('@apollo/client/testing/react');
-  const gql = require('graphql-tag');
-  const mocks = [
-    {
-      request: {
-        query: gql`query { trucks }`, // consider importing the query from the actual component
-        variables: {
-          sample: 'variable'
-        },
-      },
-      result: {
-        data: {
-          trucks: 'hello trucks'
-        }
-      }
-    }
-  ];
-<% } %>
-  const { <%=className%>%> } = require('./<%= fileName %>');
-  describe('<<%= className %>/>', function() {
-
-   it('did render', () => {
-   <%if(clientGraphql === 'apollo') { %>
-     const <%=camelCaseName%> = render(
-        <MockedProvider mocks={mocks}>
-         <<%= className %>/>
-       </MockedProvider>
-     );<% } else { %>
-     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);<% } %>
-    });
-  });
-}
+import { Meteor } from 'meteor/meteor';
+import { render } from '@testing-library/react';
+<% if (test === 'mocha') { %>import { expect } from 'chai';<% } %>
+
+if (Meteor.isClient) {<% if(clientGraphql === 'apollo') { %>
+  const { MockedProvider } = require('@apollo/client/testing/react');
+  const gql = require('graphql-tag');
+  const mocks = [
+    {
+      request: {
+        query: gql`query { trucks }`, // consider importing the query from the actual component
+        variables: {
+          sample: 'variable'
+        },
+      },
+      result: {
+        data: {
+          trucks: 'hello trucks'
+        }
+      }
+    }
+  ];
+<% } %>
+  const { <%=className%>%> } = require('./<%= fileName %>');
+  describe('<<%= className %>/>', function() {
+
+   it('did render', () => {
+   <%if(clientGraphql === 'apollo') { %>
+     const <%=camelCaseName%> = render(
+        <MockedProvider mocks={mocks}>
+         <<%= className %>/>
+       </MockedProvider>
+     );<% } else { %>
+     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);<% } %>
+    });
+  });
+}

package/bundle/typescript/src/templates/service/docker/Dockerfile

@@ -1,54 +1,54 @@
-FROM ubuntu
-
-# Replace shell with bash so we can source files
-RUN rm /bin/sh && ln -s /bin/bash /bin/sh
-
-# make sure apt is up to date
-RUN apt-get update --fix-missing
-RUN apt-get install -y curl
-RUN apt-get install -y build-essential libssl-dev
-
-ENV NVM_DIR /usr/local/nvm
-ARG NODE_VERSION
-
-<% if (useCert) {%>COPY /cert.pem .
-ENV CURL_CA_BUNDLE cert.pem
-ENV NODE_EXTRA_CA_CERTS /cert.pem<% } %>
-
-# Install nvm with node and npm
-RUN curl https://gist.githubusercontent.com/maka-io/c427ccd6f4377b39299b9d402f5d51fe/raw/0846e668ae334cf3782ce6f9ba5f5dd6c07a69c0/nvm-install.sh | bash \
-    && source $NVM_DIR/nvm.sh \
-    && nvm install $NODE_VERSION \
-    && nvm alias default $NODE_VERSION \
-    && nvm use default \
-    && npm install -g pm2
-
-ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
-ENV PATH      $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
-
-RUN mkdir /usr/app
-RUN mkdir /usr/app/log
-
-WORKDIR /usr/app
-
-# log dir
-VOLUME /usr/app/log
-
-# Copy and unpack bundle
-WORKDIR /home/ubuntu
-COPY build/app.tar.gz .
-RUN tar xzvf app.tar.gz
-
-# Install the app dependencies
-WORKDIR /home/ubuntu/bundle/programs/server
-RUN npm install --silent
-RUN npm run install --silent
-RUN npm audit fix --force --silent
-
-# Remove setup packages
-RUN apt-get remove -y build-essential libssl-dev curl
-
-WORKDIR /home/ubuntu
-EXPOSE 3000
-
-CMD ["pm2-runtime", "pm2.config.js"]
+FROM ubuntu
+
+# Replace shell with bash so we can source files
+RUN rm /bin/sh && ln -s /bin/bash /bin/sh
+
+# make sure apt is up to date
+RUN apt-get update --fix-missing
+RUN apt-get install -y curl
+RUN apt-get install -y build-essential libssl-dev
+
+ENV NVM_DIR /usr/local/nvm
+ARG NODE_VERSION
+
+<% if (useCert) {%>COPY /cert.pem .
+ENV CURL_CA_BUNDLE cert.pem
+ENV NODE_EXTRA_CA_CERTS /cert.pem<% } %>
+
+# Install nvm with node and npm
+RUN curl https://gist.githubusercontent.com/maka-io/c427ccd6f4377b39299b9d402f5d51fe/raw/0846e668ae334cf3782ce6f9ba5f5dd6c07a69c0/nvm-install.sh | bash \
+    && source $NVM_DIR/nvm.sh \
+    && nvm install $NODE_VERSION \
+    && nvm alias default $NODE_VERSION \
+    && nvm use default \
+    && npm install -g pm2
+
+ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules
+ENV PATH      $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH
+
+RUN mkdir /usr/app
+RUN mkdir /usr/app/log
+
+WORKDIR /usr/app
+
+# log dir
+VOLUME /usr/app/log
+
+# Copy and unpack bundle
+WORKDIR /home/ubuntu
+COPY build/app.tar.gz .
+RUN tar xzvf app.tar.gz
+
+# Install the app dependencies
+WORKDIR /home/ubuntu/bundle/programs/server
+RUN npm install --silent
+RUN npm run install --silent
+RUN npm audit fix --force --silent
+
+# Remove setup packages
+RUN apt-get remove -y build-essential libssl-dev curl
+
+WORKDIR /home/ubuntu
+EXPOSE 3000
+
+CMD ["pm2-runtime", "pm2.config.js"]

package/bundle/typescript/src/templates/service/eslint/babel.config.js

@@ -1,16 +1,16 @@
-// babel.config.js
-module.exports = {
-  presets: [
-    'meteor',
-    '@babel/preset-env',
-    ['@babel/preset-react', { runtime: 'automatic' }],<% if (isTypescript) { %>
-    '@babel/preset-typescript',<% } %>
-  ],
-  plugins: [
-    '@babel/plugin-syntax-jsx',
-    '@loadable/babel-plugin',
-    ['@babel/plugin-transform-runtime', { regenerator: true }],
-    ['@babel/plugin-transform-react-jsx', { runtime: 'automatic' }],
-  ],
-};
-
+// babel.config.js
+module.exports = {
+  presets: [
+    'meteor',
+    '@babel/preset-env',
+    ['@babel/preset-react', { runtime: 'automatic' }],<% if (isTypescript) { %>
+    '@babel/preset-typescript',<% } %>
+  ],
+  plugins: [
+    '@babel/plugin-syntax-jsx',
+    '@loadable/babel-plugin',
+    ['@babel/plugin-transform-runtime', { regenerator: true }],
+    ['@babel/plugin-transform-react-jsx', { runtime: 'automatic' }],
+  ],
+};
+

package/bundle/typescript/src/templates/service/eslint/config.eslint.js

@@ -1,69 +1,69 @@
-const path = require("path");
-const reactPlugin = require("eslint-plugin-react");
-const cssPlugin = require("eslint-plugin-css");
-const prettierPlugin = require("eslint-plugin-prettier");
-const unusedImportsPlugin = require("eslint-plugin-unused-imports");
-// @babel/eslint-parser is installed into app/node_modules (alongside the
-// rest of the app's babel toolchain), not into config/node_modules or its
-// ancestors, so it's outside Node's normal upward module-resolution path
-// from this file. Resolve it explicitly, the same way babelOptions.configFile
-// below points at app/babel.config.js.
-const babelParser = require(path.join(__dirname, "../app/node_modules/@babel/eslint-parser"));
-
-module.exports = [
-  {
-    files: ["**/*.js", "**/*.ts", "**/*.tsx", "**/*.jsx"],
-    plugins: {
-      react: reactPlugin,
-      css: cssPlugin,
-      prettier: prettierPlugin,
-      "unused-imports": unusedImportsPlugin,
-    },
-    languageOptions: {
-      ecmaVersion: "latest",
-      sourceType: "module",
-      parser: babelParser,
-      parserOptions: {
-        ecmaFeatures: { jsx: true },
-        babelOptions: {
-          configFile: path.join(__dirname, "../app/babel.config.js"),
-        },
-        requireConfigFile: true,
-      },
-    },
-    rules: {
-      // ESLint rules
-      "react/prop-types": "off",
-      "import/no-absolute-path": "off",
-      "func-style": "off",
-      "prefer-arrow-callback": "off",
-      "import/prefer-default-export": "off",
-      "import/extensions": "off",
-      "react/static-property-placement": "off",
-      //'import/no-unresolved': 'off',
-      "max-len": "off",
-      "react/no-unescaped-entities": "off",
-      "jsx-a11y/anchor-is-valid": "off",
-      "func-names": "off",
-      "react/destructuring-assignment": "off",
-      "react/jsx-no-useless-fragment": "off",
-
-      // Prettier integration
-      "prettier/prettier": "error", // Enforce Prettier formatting
-    },
-    settings: {
-      react: {
-        createClass: "createReactClass",
-        pragma: "React",
-        fragment: "Fragment",
-        version: "detect",
-      },
-      "import/resolver": {
-        node: {
-          paths: ["app"],
-          extensions: [".js", ".jsx", ".ts", ".tsx"],
-        },
-      },
-    },
-  },
-];
+const path = require("path");
+const reactPlugin = require("eslint-plugin-react");
+const cssPlugin = require("eslint-plugin-css");
+const prettierPlugin = require("eslint-plugin-prettier");
+const unusedImportsPlugin = require("eslint-plugin-unused-imports");
+// @babel/eslint-parser is installed into app/node_modules (alongside the
+// rest of the app's babel toolchain), not into config/node_modules or its
+// ancestors, so it's outside Node's normal upward module-resolution path
+// from this file. Resolve it explicitly, the same way babelOptions.configFile
+// below points at app/babel.config.js.
+const babelParser = require(path.join(__dirname, "../app/node_modules/@babel/eslint-parser"));
+
+module.exports = [
+  {
+    files: ["**/*.js", "**/*.ts", "**/*.tsx", "**/*.jsx"],
+    plugins: {
+      react: reactPlugin,
+      css: cssPlugin,
+      prettier: prettierPlugin,
+      "unused-imports": unusedImportsPlugin,
+    },
+    languageOptions: {
+      ecmaVersion: "latest",
+      sourceType: "module",
+      parser: babelParser,
+      parserOptions: {
+        ecmaFeatures: { jsx: true },
+        babelOptions: {
+          configFile: path.join(__dirname, "../app/babel.config.js"),
+        },
+        requireConfigFile: true,
+      },
+    },
+    rules: {
+      // ESLint rules
+      "react/prop-types": "off",
+      "import/no-absolute-path": "off",
+      "func-style": "off",
+      "prefer-arrow-callback": "off",
+      "import/prefer-default-export": "off",
+      "import/extensions": "off",
+      "react/static-property-placement": "off",
+      //'import/no-unresolved': 'off',
+      "max-len": "off",
+      "react/no-unescaped-entities": "off",
+      "jsx-a11y/anchor-is-valid": "off",
+      "func-names": "off",
+      "react/destructuring-assignment": "off",
+      "react/jsx-no-useless-fragment": "off",
+
+      // Prettier integration
+      "prettier/prettier": "error", // Enforce Prettier formatting
+    },
+    settings: {
+      react: {
+        createClass: "createReactClass",
+        pragma: "React",
+        fragment: "Fragment",
+        version: "detect",
+      },
+      "import/resolver": {
+        node: {
+          paths: ["app"],
+          extensions: [".js", ".jsx", ".ts", ".tsx"],
+        },
+      },
+    },
+  },
+];

package/bundle/typescript/src/templates/service/i18n/i18n.js

@@ -1,33 +1,33 @@
-import i18n from 'i18next';
-import { initReactI18next } from 'react-i18next';
-import LanguageDetector from 'i18next-browser-languagedetector';
-import * as resources from './locales'
-
-i18n
-// detect user language
-// learn more: https://github.com/i18next/i18next-browser-languageDetector
-  .use(LanguageDetector)
-// pass the i18n instance to react-i18next.
-  .use(initReactI18next)
-// init i18next
-// for all options read: https://www.i18next.com/overview/configuration-options
-  .init({
-    debug: false,
-    fallbackLng: 'en',
-    interpolation: {
-      escapeValue: false, // not needed for react as it escapes by default
-    },
-    resources: {
-      ...Object.entries(resources).reduce(
-        (acc, [key, value]) => ({
-          ...acc,
-          [key]: {
-            translation: value,
-          },
-        }),
-        {},
-      ),
-    },
-  });
-
-export default i18n;
+import i18n from 'i18next';
+import { initReactI18next } from 'react-i18next';
+import LanguageDetector from 'i18next-browser-languagedetector';
+import * as resources from './locales'
+
+i18n
+// detect user language
+// learn more: https://github.com/i18next/i18next-browser-languageDetector
+  .use(LanguageDetector)
+// pass the i18n instance to react-i18next.
+  .use(initReactI18next)
+// init i18next
+// for all options read: https://www.i18next.com/overview/configuration-options
+  .init({
+    debug: false,
+    fallbackLng: 'en',
+    interpolation: {
+      escapeValue: false, // not needed for react as it escapes by default
+    },
+    resources: {
+      ...Object.entries(resources).reduce(
+        (acc, [key, value]) => ({
+          ...acc,
+          [key]: {
+            translation: value,
+          },
+        }),
+        {},
+      ),
+    },
+  });
+
+export default i18n;

package/bundle/typescript/src/templates/service/i18n/i18n.js.ts

@@ -1,33 +1,33 @@
-import i18n from 'i18next';
-import { initReactI18next } from 'react-i18next';
-import LanguageDetector from 'i18next-browser-languagedetector';
-import * as resources from './locales'
-
-i18n
-// detect user language
-// learn more: https://github.com/i18next/i18next-browser-languageDetector
-  .use(LanguageDetector)
-// pass the i18n instance to react-i18next.
-  .use(initReactI18next)
-// init i18next
-// for all options read: https://www.i18next.com/overview/configuration-options
-  .init({
-    debug: false,
-    fallbackLng: 'en',
-    interpolation: {
-      escapeValue: false, // not needed for react as it escapes by default
-    },
-    resources: {
-      ...Object.entries(resources).reduce(
-        (acc, [key, value]) => ({
-          ...acc,
-          [key]: {
-            translation: value,
-          },
-        }),
-        {},
-      ),
-    },
-  });
-
-export default i18n;
+import i18n from 'i18next';
+import { initReactI18next } from 'react-i18next';
+import LanguageDetector from 'i18next-browser-languagedetector';
+import * as resources from './locales'
+
+i18n
+// detect user language
+// learn more: https://github.com/i18next/i18next-browser-languageDetector
+  .use(LanguageDetector)
+// pass the i18n instance to react-i18next.
+  .use(initReactI18next)
+// init i18next
+// for all options read: https://www.i18next.com/overview/configuration-options
+  .init({
+    debug: false,
+    fallbackLng: 'en',
+    interpolation: {
+      escapeValue: false, // not needed for react as it escapes by default
+    },
+    resources: {
+      ...Object.entries(resources).reduce(
+        (acc, [key, value]) => ({
+          ...acc,
+          [key]: {
+            translation: value,
+          },
+        }),
+        {},
+      ),
+    },
+  });
+
+export default i18n;

package/bundle/typescript/src/templates/service/i18n/locales.js

@@ -1,3 +1,3 @@
-export default {
-  example: 'Find me in {{page}}'
-}
+export default {
+  example: 'Find me in {{page}}'
+}

package/bundle/typescript/src/templates/service/i18n/locales.js.ts

@@ -1,3 +1,3 @@
-export default {
-  example: 'Find me in {{page}}'
-}
+export default {
+  example: 'Find me in {{page}}'
+}