create-powerapps-project 0.17.2 → 0.19.1

package/lib/packageManager.js

@@ -25,9 +25,9 @@ const install = (cwd, type) => {
         }
     }
     else {
-        (0, child_process_1.spawnSync)(getNpm(), ['add', ...packages.devDependencies], { stdio: 'inherit', cwd });
+        (0, child_process_1.spawnSync)(getNpm(), ['install', ...packages.devDependencies], { stdio: 'inherit', cwd });
         if (packages.dependencies) {
-            (0, child_process_1.spawnSync)(getNpm(), ['add', ...packages.dependencies], { stdio: 'inherit', cwd });
+            (0, child_process_1.spawnSync)(getNpm(), ['install', ...packages.dependencies], { stdio: 'inherit', cwd });
         }
     }
 };
@@ -36,16 +36,17 @@ 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/xrm'
+                '@types/react@17.0.39',
+                '@types/react-dom@17.0.11',
+                '@types/xrm',
+                '-D'
             ]
         };
     }

package/lib/plopfile.js

@@ -224,7 +224,9 @@ exports.default = (plop) => {
                 destination: `${process.cwd()}/{{ name }}`,
                 force: true,
                 skip: (answers) => {
-                    return !answers.react;
+                    if (!answers.react) {
+                        return 'react not included';
+                    }
                 }
             },
             {
@@ -233,20 +235,26 @@ exports.default = (plop) => {
                 path: path_1.default.resolve(process.cwd(), 'tsconfig.json'),
                 force: true,
                 skip: (answers) => {
-                    return !answers.react;
+                    if (!answers.react) {
+                        return 'react not included';
+                    }
                 }
             },
             {
                 type: 'addGenScript',
                 skip: (answers) => {
-                    return !answers.react;
+                    if (!answers.react) {
+                        return 'react not included';
+                    }
                 }
             },
             {
                 type: 'npmInstall',
                 projectType: 'pcf',
                 skip: (answers) => {
-                    return !answers.react;
+                    if (!answers.react) {
+                        return 'react not included';
+                    }
                 }
             }
         ]
@@ -274,13 +282,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.17.2",
+  "version": "0.19.1",
   "license": "MIT",
   "type": "commonjs",
   "main": "lib/index.js",

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

@@ -7,6 +7,7 @@ import { App, AppProps } from './App';
 
 export class {{name}} implements ComponentFramework.StandardControl<IInputs, IOutputs> {
   container: HTMLDivElement;
+  root: Root;
   context: ComponentFramework.Context<IInputs>;
   isTestHarness: boolean;
   props: AppProps;