create-powerapps-project 2.3.0 → 2.3.1

package/lib/plopActions.js

@@ -58,7 +58,7 @@ export default (plop) => {
     plop.setActionType('runPcf', async (answers) => {
         const args = ['pcf', 'init', '-ns', answers.namespace, '-n', answers.name, '-t', answers.template, '-npm', 'false'];
         // Set framework to React if selected
-        if (answers.react && answers.fluentVersion === 8) {
+        if (answers.react) {
             args.push('-fw', 'react');
         }
         console.log('running pac pcf command with args');

package/lib/plopfile.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import fs from 'node:fs';
 import { getNugetPackageVersions } from './nuget.js';
 /* eslint-disable @typescript-eslint/no-explicit-any */
 export default async (plop) => {
@@ -327,23 +328,16 @@ export default async (plop) => {
                 },
                 {
                     type: 'append',
-                    path: `${process.cwd()}/{{name}}.pcfproj`,
-                    pattern: "</PowerAppsTargetsPath>",
-                    template: `<PcfEnableAutoNpmInstall Condition=" '$(PcfEnableAutoNpmInstall)' == '' ">false</PcfEnableAutoNpmInstall>`,
-                    separator: '\n'
-                },
-                {
-                    type: 'append',
-                    path: `${process.cwd()}/{{name}}.pcfproj`,
-                    pattern: "</PowerAppsTargetsPath>",
-                    template: `<PcfAlwaysNpmInstall Condition=" '$(PcfAlwaysNpmInstall)' == '' ">false</PcfAlwaysNpmInstall>`,
+                    path: `${process.cwd()}/${path.basename(process.cwd())}.pcfproj`,
+                    pattern: '</PowerAppsTargetsPath>',
+                    template: `\t\t<PcfEnableAutoNpmInstall Condition=" '$(PcfEnableAutoNpmInstall)' == '' ">false</PcfEnableAutoNpmInstall>\r\n\t\t<PcfAlwaysNpmInstall Condition=" '$(PcfAlwaysNpmInstall)' == '' ">false</PcfAlwaysNpmInstall>`,
                     separator: '\n'
                 },
                 {
                     type: 'append',
                     path: `${process.cwd()}/eslint.config.mjs`,
-                    pattern: "reactPlugin.configs.flat.recommended,",
-                    template: "reactHooks.configs.flat.recommended,",
+                    pattern: 'reactPlugin.configs.flat.recommended,',
+                    template: '\treactHooks.configs.flat.recommended,',
                     separator: '\n'
                 },
                 {
@@ -355,9 +349,9 @@ export default async (plop) => {
                 },
                 {
                     type: 'append',
-                    path: `${process.cwd()}/{{name}}.pcfproj`,
-                    pattern: "</OutputPath>",
-                    template: `<PcfBuildMode>development</PcfBuildMode>`,
+                    path: `${process.cwd()}/${path.basename(process.cwd())}.pcfproj`,
+                    pattern: '</OutputPath>',
+                    template: `\t\t<PcfBuildMode>development</PcfBuildMode>`,
                     separator: '\n'
                 },
                 {
@@ -372,6 +366,13 @@ export default async (plop) => {
                     pattern: `const props: IHelloWorldProps = { name: 'Power Apps' };`,
                     template: ''
                 },
+                async (answers) => {
+                    if (answers.react) {
+                        await fs.promises.rm(path.resolve(process.cwd(), answers.name, 'HelloWorld.tsx'));
+                        return 'removed default HelloWorld component';
+                    }
+                    return 'react not included';
+                },
                 {
                     type: 'addScript',
                     data: {
@@ -414,11 +415,7 @@ export default async (plop) => {
                     type: 'npmInstall',
                     data: {
                         packages: {
-                            devDependencies: [
-                                'powerapps-project-pcf',
-                                'eslint-plugin-react-hooks',
-                                '@types/xrm'
-                            ],
+                            devDependencies: ['powerapps-project-pcf', 'eslint-plugin-react-hooks', '@types/xrm'],
                             dependencies: ['@fluentui/react-icons']
                         }
                     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-powerapps-project",
   "description": "💧 plop generator for Dataverse development",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "license": "MIT",
   "exports": "./lib/index.js",
   "engines": {

package/plop-templates/pcf/App.tsx

@@ -4,7 +4,7 @@ import { AppContext } from './contexts/AppContext';
 
 export const App = ({ context }: { context: ComponentFramework.Context<IInputs>; }) => {
   return (
-    <AppContext.Provider value={{{ context }}}>
+    <AppContext.Provider value=\{{ context }}>
     </AppContext.Provider>
   );
 };

package/plop-templates/pcf/AppContext.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { IInputs } from '../generated/ManifestTypes';
 
-interface IAppContext {
+export interface IAppContext {
   context: ComponentFramework.Context<IInputs>;
 }