create-powerapps-project 0.18.0 → 0.20.0

package/lib/packageManager.js

@@ -36,15 +36,15 @@ function getPackages(type) {
     if (type === 'pcf') {
         return {
             dependencies: [
-                'react',
-                'react-dom',
+                'react@17.0.2',
+                'react-dom@17.0.2',
                 '@fluentui/react',
                 '@fluentui/font-icons-mdl2'
             ],
             devDependencies: [
                 //`powerapps-project-${type}`,
-                '@types/react',
-                '@types/react-dom',
+                '@types/react@17.0.39',
+                '@types/react-dom@17.0.11',
                 '@types/xrm',
                 '-D'
             ]

package/lib/plopfile.js

@@ -90,9 +90,9 @@ exports.default = (plop) => {
         nuget.install(answers.name, answers.sdkVersion, xrmVersion);
         return 'installed nuget packages';
     });
-    plop.setActionType('npmInstall', (_answers, config) => {
-        if (config?.projectType) {
-            pkg.install(process.cwd(), config.projectType);
+    plop.setActionType('npmInstall', (answers) => {
+        if (answers.projectType) {
+            pkg.install(process.cwd(), answers.projectType);
         }
         return 'installed npm packages';
     });
@@ -178,7 +178,9 @@ exports.default = (plop) => {
             },
             {
                 type: 'npmInstall',
-                projectType: 'assembly'
+                data: {
+                    projectType: 'assembly'
+                }
             }
         ]
     });
@@ -224,7 +226,10 @@ exports.default = (plop) => {
                 destination: `${process.cwd()}/{{ name }}`,
                 force: true,
                 skip: (answers) => {
-                    return !answers.react;
+                    if (!answers.react) {
+                        return 'react not included';
+                    }
+                    return;
                 }
             },
             {
@@ -233,20 +238,22 @@ exports.default = (plop) => {
                 path: path_1.default.resolve(process.cwd(), 'tsconfig.json'),
                 force: true,
                 skip: (answers) => {
-                    return !answers.react;
-                }
-            },
-            {
-                type: 'addGenScript',
-                skip: (answers) => {
-                    return !answers.react;
+                    if (!answers.react) {
+                        return 'react not included';
+                    }
+                    return;
                 }
             },
             {
                 type: 'npmInstall',
-                projectType: 'pcf',
+                data: {
+                    projectType: 'pcf'
+                },
                 skip: (answers) => {
-                    return !answers.react;
+                    if (!answers.react) {
+                        return 'react not included';
+                    }
+                    return;
                 }
             }
         ]
@@ -274,13 +281,6 @@ exports.default = (plop) => {
                 base: '../plop-templates/webresource',
                 destination: process.cwd(),
                 force: true
-            },
-            {
-                type: 'npmInstall',
-                projectType: 'webresource',
-                skip: (answers) => {
-                    return !answers.react;
-                }
             }
         ]
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-powerapps-project",
   "description": "💧 plop generator for Dataverse development",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "license": "MIT",
   "type": "commonjs",
   "main": "lib/index.js",

package/plop-templates/pcf/index.ts.hbs

@@ -1,6 +1,6 @@
 import { IInputs, IOutputs } from "./generated/ManifestTypes";
 import React from 'react';
-import { createRoot, Root } from 'react-dom/client';
+import ReactDOM from 'react-dom';
 import { initializeIcons } from '@fluentui/font-icons-mdl2';
 
 import { App, AppProps } from './App';
@@ -33,7 +33,6 @@ export class {{name}} implements ComponentFramework.StandardControl<IInputs, IOu
     this.container = container;
     this.context = context;
     this.isTestHarness = document.getElementById('control-dimensions') !== null;
-    this.root = createRoot(this.container);
   }
 
 
@@ -46,8 +45,9 @@ export class {{name}} implements ComponentFramework.StandardControl<IInputs, IOu
       isTestHarness: this.isTestHarness
     };
 
-    this.root.render(
-      React.createElement(App, this.props)
+    ReactDOM.render(
+      React.createElement(App, this.props),
+      this.container
     );
   }
 
@@ -64,7 +64,7 @@ export class {{name}} implements ComponentFramework.StandardControl<IInputs, IOu
    * i.e. cancelling any pending remote calls, removing listeners, etc.
    */
   public destroy(): void {
-    this.root.unmount();
+    ReactDOM.unmountComponentAtNode(this.container);
   }
 
 }