@dhis2/create-app 5.3.0-alpha.4 → 5.3.0-alpha.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/create-app",
-    "version": "5.3.0-alpha.4",
+    "version": "5.3.0-alpha.6",
     "description": "",
     "main": "src/index.js",
     "bin": {

package/src/index.js

@@ -42,13 +42,11 @@ const commandHandler = {
         typescript: {
             description: 'Use TypeScript or JS',
             type: 'boolean',
-            default: true,
             alias: ['ts', 'typeScript'],
         },
         template: {
             description: 'Which template to use (Basic, With React Router)',
             type: 'string',
-            default: 'basic',
         },
         packageManager: {
             description: 'Package Manager',
@@ -58,7 +56,7 @@ const commandHandler = {
     },
 }
 
-const getTemplateFile = (templateName) => {
+const getTemplateDirectory = (templateName) => {
     return templateName === 'react-router'
         ? templates.templateWithReactRouter
         : templates.templateWithList
@@ -85,37 +83,41 @@ const command = {
         }
 
         const selectedOptions = {
-            typeScript: argv.typescript,
+            typeScript: argv.typescript ?? true,
             packageManager:
                 argv.packageManager ?? getPackageManager() ?? 'pnpm',
-            templateName: argv.template,
+            templateName: argv.template ?? 'basic',
         }
 
         if (!useDefauls) {
-            const language = await select({
-                message: 'Select a language',
-                default: 'ts',
-                choices: [
-                    { name: 'JavaScript', value: 'js' },
-                    { name: 'TypeScript', value: 'ts' },
-                ],
-            })
-
-            selectedOptions.typeScript = language === 'ts'
-
-            const template = await select({
-                message: 'Select a template',
-                default: 'ts',
-                choices: [
-                    { name: 'Basic Template', value: 'basic' },
-                    {
-                        name: 'Template with React Router',
-                        value: 'react-router',
-                    },
-                ],
-            })
+            if (argv.typeScript === undefined) {
+                const language = await select({
+                    message: 'Select a language',
+                    default: 'ts',
+                    choices: [
+                        { name: 'JavaScript', value: 'js' },
+                        { name: 'TypeScript', value: 'ts' },
+                    ],
+                })
+
+                selectedOptions.typeScript = language === 'ts'
+            }
 
-            selectedOptions.templateName = template
+            if (argv.template === undefined) {
+                const template = await select({
+                    message: 'Select a template',
+                    default: 'ts',
+                    choices: [
+                        { name: 'Basic Template', value: 'basic' },
+                        {
+                            name: 'Template with React Router',
+                            value: 'react-router',
+                        },
+                    ],
+                })
+
+                selectedOptions.templateName = template
+            }
         }
 
         reporter.info(
@@ -156,7 +158,7 @@ const command = {
         }
 
         reporter.info('Copying template files')
-        const templateFiles = getTemplateFile(selectedOptions.templateName)
+        const templateFiles = getTemplateDirectory(selectedOptions.templateName)
         fs.copySync(templateFiles, cwd)
 
         const paths = {
@@ -166,6 +168,7 @@ const command = {
             pnpmLock: path.join(cwd, 'pnpm-lock.yaml'),
             pnpmWorkspace: path.join(cwd, 'pnpm-workspace.yaml'),
             appRootFile: path.join(cwd, 'src/App.tsx'),
+            appRootWrapperFile: path.join(cwd, 'src/AppWrapper.tsx'),
             initYarnLock: path.join(__dirname, '../templates/yarn.lock'),
             initNpmLock: path.join(__dirname, '../templates/package-lock.json'),
         }
@@ -179,6 +182,12 @@ const command = {
         // Default template is with PNPM with TypeScript - some modifications here for yarn/npm/JS
         const templateModifications = [
             [paths.package, true, (f) => f.replace('{{template-name}}', name)],
+            [
+                paths.appRootWrapperFile,
+                true,
+                (f) => f.replace('{{template-name}}', name),
+            ],
+
             // [
             //     path.join(paths.base, '.husky/pre-commit'),
             //     !pnpm,
@@ -249,14 +258,14 @@ const command = {
         // convert to JS
         if (!typeScript) {
             reporter.info('Preparing JavaScript template')
-            reporter.info(` running '${pkgManager} install'`)
+            reporter.info(`    Running '${pkgManager} install'`)
 
             await exec({
                 cmd: pkgManager,
                 args: ['install'],
                 cwd: paths.base,
             })
-            reporter.info(' convert template to JS with tsc')
+            reporter.info('    Converting template to JS with tsc')
             await exec({
                 cmd: 'npx',
                 args: [
@@ -274,7 +283,7 @@ const command = {
                 pipe: argv.debug,
             })
 
-            reporter.info(' Deleting TS files')
+            reporter.debug('    Deleting TS files')
             const filePathsToRemove = path.join(paths.base, '/src/**/*.ts[x]')
             const filesToRemove = await fg.glob(filePathsToRemove)
 
@@ -320,6 +329,14 @@ const command = {
             )} to launch your new DHIS2 application`
         )
 
+        reporter.print(
+            `${chalk.gray(
+                `You can also run the web application with ${chalk.bold(
+                    `${pkgManager} start --proxy https://YOUR_DHIS2_INSTANCE_URL`
+                )} to create a proxy on localhost to a remote DHIS2 instance. Check https://developers.dhis2.org/docs/quickstart/quickstart-web#connecting-your-web-app-to-dhis2 for more information.`
+            )}`
+        )
+
         return
     },
 }