@corva/create-app 0.34.0-7 → 0.35.0-2

package/lib/bump-version.option.js

@@ -1,5 +1,6 @@
 const { Option, InvalidArgumentError } = require('commander');
 const chalk = require('chalk');
+const semver = require('semver');
 
 const flags = '--bump-version <string>';
 const description = 'Bump version';

package/lib/constants/package.js

@@ -18,6 +18,12 @@ const uiDependencies = {
 };
 
 const jsUiDevDependencies = {
+  '@testing-library/jest-dom': '^5.16.4',
+  '@testing-library/react': '12.1.5',
+  '@testing-library/react-hooks': '^8.0.1',
+  '@testing-library/user-event': '^14.3.0',
+  'react-scripts': '4.0.3',
+  'eslint': '7.32.0',
   'postcss-loader': '4.1.0',
 };
 
@@ -26,6 +32,7 @@ const tsUiDevDependencies = {
   '@tsconfig/create-react-app': '1.0.2',
   '@types/material-ui': '0.21.9',
   '@types/react': '^17.0.22',
+  '@types/jest': '26.0.24',
   '@types/react-dom': '^17.0.9',
   '@typescript-eslint/eslint-plugin': '^4.31.2',
   '@typescript-eslint/parser': '^4.31.2',
@@ -39,6 +46,7 @@ const uiScripts = {
   zip: 'create-corva-app zip .',
   lint: 'eslint --cache ./src/',
   release: 'create-corva-app release .',
+  test: 'react-scripts test',
 };
 
 const uiPackage = {
@@ -47,6 +55,11 @@ const uiPackage = {
   scripts: uiScripts,
   dependencies: uiDependencies,
   devDependencies: jsUiDevDependencies,
+  // TODO: This is a temporary workaround. Should be removed once
+  // this ticket is resolved: https://corvaqa.atlassian.net/browse/DC-3982
+  jest: {
+    transformIgnorePatterns: ['/node_modules/(?!@babel/runtime|@corva/ui)', '\\.pnp\\.[^\\/]+$'],
+  },
 };
 
 const tsUiPackage = {

package/lib/flows/lib/manifest.js

@@ -19,6 +19,11 @@ class Manifest {
     return this.manifest.application.name
   }
 
+  get unix_name() {
+    // todo: npm scopes?
+    return this.manifest.application.key.replace(/\W+/gi, '_').toLowerCase();
+  }
+
   get description() {
     return this.manifest.application.description
   }

package/lib/flows/steps/zip-file-list-resolve.js

@@ -64,9 +64,16 @@ const transformPatternsIntoFileNames = async (dirName, patterns, ignoredFiles =
   return filesFromPatterns;
 };
 
-const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName }) => {
+/**
+ * 
+ * @param {string[]} itemsToZip 
+ * @param {object} param1 
+ * @param {import('../lib/manifest').Manifest} param1.manifest
+ * @returns 
+ */
+const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName, manifest }) => {
   const version = await getIncreasedVersion(pkg.version, options);
-  const zipFileName = `${pkg.name}-${version}.zip`;
+  const zipFileName = `${manifest.unix_name}-${version}.zip`;
   const itemsToSave = [];
   const shouldUpdateVersion = version !== pkg.version;
 
@@ -114,9 +121,16 @@ const resolveDataToZipUiApp = async (itemsToZip = [], { options, pkg, dirName })
   };
 };
 
-const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirName }) => {
+/**
+ * 
+ * @param {string[]} itemsToZip 
+ * @param {object} param1 
+ * @param {import('../lib/manifest').Manifest} param1.manifest
+ * @returns 
+ */
+const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirName, manifest }) => {
   const version = await getIncreasedVersion(pkg.version, options);
-  const zipFileName = `${pkg.name}-${version}.zip`;
+  const zipFileName = `${manifest.unix_name}-${version}.zip`;
   const itemsToSave = [];
   const shouldUpdateVersion = version !== pkg.version;
 
@@ -135,7 +149,7 @@ const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirNa
   const packageDirContent = await fs.readdir(dirName);
   const shouldPushDefaultSrc = !itemsToZip.length;
 
-  itemsToZip.push('config', 'manifest.json', 'package.json');
+  itemsToZip.push('config', 'manifest.json', 'package.json', '.nvmrc', '.npmrc');
 
   if (packageDirContent.includes('package-lock.json')) {
     itemsToZip.push('package-lock.json');
@@ -176,8 +190,15 @@ const resolveDataForZipNodeJsApp = async (itemsToZip = [], { options, pkg, dirNa
   };
 };
 
+/**
+ * 
+ * @param {string[]} itemsToZip 
+ * @param {object} param1 
+ * @param {import('../lib/manifest').Manifest} param1.manifest
+ * @returns 
+ */
 const resolveDataForZipPythonApp = async (itemsToZip = [], { manifest, dirName, options }) => {
-  const zipFileName = `${manifest.manifest.application.name}.zip`;
+  const zipFileName = `${manifest.unix_name}.zip`;
 
   if (!itemsToZip.length) {
     itemsToZip.push(...(await glob('**/*.py', { cwd: dirName, ignore: [...(options.ignoredFiles || []), 'venv/**/*'] })));

package/lib/helpers/resolve-app-runtime.js

@@ -5,7 +5,7 @@ const resolveAppRuntime = (opts) => {
     return {
       language: opts.useTypescript ? "typescript" : "javascript",
       packageManager: opts.packageManager,
-      version: process.version.replace(/^v/, ""),
+      version: 16,
     }
   }
 

package/lib/index.js

@@ -351,11 +351,11 @@ async function addTemplate(root, manifest, runtime) {
  */
 async function configureApp(root, manifest, runtime) {
   if (manifest.isJs()) {
+    await addNvmRc(root, manifest, runtime);
     await addPackageJSON(root, manifest, runtime);
   }
 
   if (manifest.isNode()) {
-    await addNvmRc(root, manifest, runtime);
     await addTsConfigs(root, manifest, runtime);
   }
 
@@ -431,7 +431,7 @@ function addPackageJSON(root, manifest, runtime) {
   const defaults = getDefaultsForPackageJson(manifest, runtime);
 
   const packageJson = {
-    name: manifest.name.replace(/\W/g, ''),
+    name: manifest.unix_name,
     version: defaults.version,
     description: manifest.description || defaults.description,
     engines: {
@@ -441,6 +441,7 @@ function addPackageJSON(root, manifest, runtime) {
     scripts: defaults.scripts,
     dependencies: defaults.dependencies,
     devDependencies: defaults.devDependencies,
+    ...(defaults.jest && {jest: defaults.jest})
   };
 
   return fs.writeJSON(path.join(root, 'package.json'), packageJson, writejsonOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@corva/create-app",
-    "version": "0.34.0-7",
+    "version": "0.35.0-2",
     "private": false,
     "description": "Create app to use it in CORVA.AI",
     "keywords": [

package/templates/javascript/ui/src/__tests__/TestExample.test.js

@@ -0,0 +1,31 @@
+import { useState } from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import { Button } from '@corva/ui/components';
+import userEvent from '@testing-library/user-event';
+
+const Toggle = () => {
+  const [isOn, setIsOn] = useState(false);
+
+  return (
+    <>
+      {isOn ? 'ON' : 'OFF'}
+      <Button onClick={() => setIsOn(value => !value)}>toggle</Button>
+    </>
+  );
+};
+
+describe('<Toggle />', () => {
+  it('should be OFF by default', () => {
+    render(<Toggle />);
+
+    expect(screen.getByText('OFF')).toBeInTheDocument();
+  });
+
+  it('should switch to ON after a single press', async () => {
+    render(<Toggle />);
+
+    userEvent.click(screen.getByText('toggle'));
+
+    await waitFor(() => screen.getByText('ON'));
+  });
+});

package/templates/javascript/ui/src/setupTests.js

@@ -0,0 +1,2 @@
+// eslint-disable-next-line
+import '@testing-library/jest-dom/extend-expect';

package/templates/typescript/ui/src/AppSettings.tsx

@@ -2,6 +2,18 @@ import { Checkbox, FormControlLabel } from '@material-ui/core';
 
 import { DEFAULT_SETTINGS } from './constants';
 
+/* Types */
+interface AppSettingsProps {
+  app: { [key: string]: any };
+  appData: { [key: string]: any };
+  company: { [key: string]: any };
+  onSettingChange: (key: string, value: any) => void;
+  settings: {
+    isExampleCheckboxChecked: boolean;
+  };
+  user: { [key: string]: any };
+}
+
 const AppSettings = (props: AppSettingsProps): JSX.Element => {
   const { settings: apiSettings, onSettingChange } = props;
   const settings = { ...DEFAULT_SETTINGS, ...apiSettings };
@@ -25,18 +37,6 @@ AppSettings.defaultProps = {
   company: {},
 };
 
-/* Types */
-interface AppSettingsProps {
-  app: { [key: string]: any };
-  appData: { [key: string]: any };
-  company: { [key: string]: any };
-  onSettingChange: (key: string, value: any) => void;
-  settings: {
-    isExampleCheckboxChecked: boolean;
-  };
-  user: { [key: string]: any };
-}
-
 // Important: Do not change root component default export (AppSettings.js). Use it as container
 //  for your App Settings. It's required to make build and zip scripts work as expected;
 export default AppSettings;

package/templates/typescript/ui/src/__tests__/TestExample.test.tsx

@@ -0,0 +1,31 @@
+import { useState } from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import { Button } from '@corva/ui/components';
+import userEvent from '@testing-library/user-event';
+
+const Toggle = () => {
+  const [isOn, setIsOn] = useState<boolean>(false);
+
+  return (
+    <>
+      {isOn ? 'ON' : 'OFF'}
+      <Button onClick={() => setIsOn(value => !value)}>toggle</Button>
+    </>
+  );
+};
+
+describe('<Toggle />', () => {
+  it('should be OFF by default', () => {
+    render(<Toggle />);
+
+    expect(screen.getByText('OFF')).toBeInTheDocument();
+  });
+
+  it('should switch to ON after a single press', async () => {
+    render(<Toggle />);
+
+    userEvent.click(screen.getByText('toggle'));
+
+    await waitFor(() => screen.getByText('ON'));
+  });
+});

package/templates/typescript/ui/src/custom.d.ts

@@ -1,4 +1,4 @@
-declare module "*.svg" {
+declare module '*.svg' {
   const content: string;
   export default content;
 }

package/templates/typescript/ui/src/setupTests.ts

@@ -0,0 +1,2 @@
+// eslint-disable-next-line
+import '@testing-library/jest-dom/extend-expect';

package/templates/javascript/ui/.nvmrc

@@ -1 +0,0 @@
-16.*

package/templates/typescript/ui/.nvmrc

@@ -1 +0,0 @@
-16.*