create-powerapps-project 0.16.2 → 0.16.6

package/CHANGELOG.json

@@ -2,7 +2,67 @@
   "name": "create-powerapps-project",
   "entries": [
     {
-      "date": "Tue, 08 Feb 2022 18:47:00 GMT",
+      "date": "Wed, 16 Feb 2022 00:36:07 GMT",
+      "tag": "create-powerapps-project_v0.16.6",
+      "version": "0.16.6",
+      "comments": {
+        "patch": [
+          {
+            "author": "derek.finlinson@journeyteam.com",
+            "package": "create-powerapps-project",
+            "commit": "96abb993cc017edf436a612281ef7a5d3346023b",
+            "comment": "Re-add sn.exe; React PCF updates"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 14 Feb 2022 23:29:54 GMT",
+      "tag": "create-powerapps-project_v0.16.5",
+      "version": "0.16.5",
+      "comments": {
+        "patch": [
+          {
+            "author": "derek.finlinson@journeyteam.com",
+            "package": "create-powerapps-project",
+            "commit": "361a315823b5558a96c191850c2fcf8863653e5b",
+            "comment": "Set class name from prompts"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 11 Feb 2022 16:59:23 GMT",
+      "tag": "create-powerapps-project_v0.16.4",
+      "version": "0.16.4",
+      "comments": {
+        "patch": [
+          {
+            "author": "derek.finlinson@journeyteam.com",
+            "package": "create-powerapps-project",
+            "commit": "19a5d1442fef02d2f260e59d2779d6f85df51630",
+            "comment": "Comment out pcf plop for now"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 09 Feb 2022 16:19:05 GMT",
+      "tag": "create-powerapps-project_v0.16.3",
+      "version": "0.16.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "derek.finlinson@journeyteam.com",
+            "package": "create-powerapps-project",
+            "commit": "cdab4698564ece9f40c5a45327a38270a6d1c16d",
+            "comment": "Catch errors on commands"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 08 Feb 2022 18:47:13 GMT",
       "tag": "create-powerapps-project_v0.16.2",
       "version": "0.16.2",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,49 @@
 # Change Log - create-powerapps-project
 
-This log was last generated on Tue, 08 Feb 2022 18:47:00 GMT and should not be manually modified.
+This log was last generated on Wed, 16 Feb 2022 00:36:07 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.16.2
+## 0.16.6
 
-Tue, 08 Feb 2022 18:47:00 GMT
+Wed, 16 Feb 2022 00:36:07 GMT
 
 ### Patches
 
-- Update symbols (derek.finlinson@journeyteam.com)
+- Re-add sn.exe; React PCF updates (derek.finlinson@journeyteam.com)
 
+## 0.16.5
+
+Mon, 14 Feb 2022 23:29:54 GMT
+
+### Patches
+
+- Set class name from prompts (derek.finlinson@journeyteam.com)
+
+## 0.16.4
+
+Fri, 11 Feb 2022 16:59:23 GMT
+
+### Patches
+
+- Comment out pcf plop for now (derek.finlinson@journeyteam.com)
+
+## 0.16.3
+
+Wed, 09 Feb 2022 16:19:05 GMT
+
+### Patches
+
+- Catch errors on commands (derek.finlinson@journeyteam.com)
+
+## 0.16.2
+
+Tue, 08 Feb 2022 18:47:13 GMT
+
+### Patches
+
+- Update symbols (derek.finlinson@journeyteam.com)
+
 ## 0.16.1
 
 Tue, 08 Feb 2022 18:13:53 GMT

package/bin/sn.exe.config

@@ -0,0 +1,6 @@
+<?xml version ="1.0"?>
+<configuration>
+    <startup useLegacyV2RuntimeActivationPolicy="true">
+        <requiredRuntime safemode="true" imageVersion="v4.0.30319" version="v4.0.30319"/>
+    </startup>
+</configuration>

package/lib/createDataverseProject.js

@@ -54,10 +54,18 @@ exports.default = async (type) => {
         const xrmVersions = await (0, nuget_1.getNugetPackageVersions)('JourneyTeam.Xrm');
         config.xrmVersion = xrmVersions.shift();
     }
-    logger_1.logger.info('get plop generator');
+    else if (type === 'webresource') {
+        config.name = name;
+    }
     const generator = await (0, plop_1.getGenerator)(type, name);
     logger_1.logger.info(`run powerapps-project-${type} code generator`);
-    await (0, plop_1.runGenerator)(generator, config);
+    try {
+        await (0, plop_1.runGenerator)(generator, config);
+    }
+    catch (ex) {
+        logger_1.logger.error(ex.message);
+        return;
+    }
     logger_1.logger.info('initialize project');
     if (type !== 'pcf' || config.react) {
         pkg.install(process.cwd(), type);

package/lib/logger.js

@@ -30,7 +30,7 @@ exports.logger = {
     },
     done(...args) {
         if (!isTest) {
-            console.info(exports.icons.info, ...args);
+            console.info(exports.icons.done, ...args);
         }
     },
 };

package/lib/packageManager.js

@@ -38,12 +38,14 @@ function getPackages(type) {
             dependencies: [
                 'react',
                 'react-dom',
-                '@fluentui/react'
+                '@fluentui/react',
+                '@fluentui/font-icons-mdl2'
             ],
             devDependencies: [
-                `powerapps-project-${type}`,
+                //`powerapps-project-${type}`,
                 '@types/react',
-                '@types/react-dom'
+                '@types/react-dom',
+                '@types/xrm'
             ]
         };
     }

package/lib/plop.js

@@ -21,11 +21,11 @@ exports.getGenerator = getGenerator;
 const runGenerator = async (generator, args) => {
     const results = await generator.runActions(args, {
         onComment: (comment) => {
-            logger_1.logger.done(comment);
+            logger_1.logger.info(comment);
         }
     });
     if (results.failures && results.failures.length > 0) {
-        throw new Error('Error: ' + results.failures[0].error);
+        throw new Error(results.failures[0].error);
     }
     // do something after the actions have run
     for (const change of results.changes) {

package/lib/plopfile.js

@@ -6,13 +6,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
+const didSucceed = (code) => `${code}` === '0';
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 exports.default = (plop) => {
     plop.setActionType('signAssembly', (answers) => {
         const keyPath = path_1.default.resolve(process.cwd(), `${answers.name}.snk`);
-        (0, child_process_1.spawnSync)(path_1.default.resolve(__dirname, '../', 'bin', 'sn.exe'), ['-q', '-k', keyPath], { stdio: 'inherit' });
-        return 'signed assembly';
+        return new Promise((resolve, reject) => {
+            if (process.env.JEST_WORKER_ID !== undefined) {
+                resolve('Testing so no need to sign');
+            }
+            const sign = (0, child_process_1.spawn)(path_1.default.resolve(__dirname, '../', 'bin', 'sn.exe'), ['-q', '-k', keyPath], { stdio: 'inherit' });
+            sign.on('close', (code) => {
+                if (didSucceed(code)) {
+                    resolve('signed assembly');
+                }
+                else {
+                    reject('Failed to sign assembly');
+                }
+            });
+        });
     });
     plop.setActionType('runPcf', (answers) => {
         const args = ['pcf', 'init', '-ns', answers.namespace, '-n', answers.name, '-t', answers.template];
@@ -23,15 +36,24 @@ exports.default = (plop) => {
         if (process.env.JEST_WORKER_ID !== undefined) {
             args.push('-npm', 'false');
         }
-        (0, child_process_1.spawnSync)('pac', args, { stdio: 'inherit' });
-        return 'pcf project created';
+        return new Promise((resolve, reject) => {
+            const pac = (0, child_process_1.spawn)('pac', args, { stdio: 'inherit' });
+            pac.on('close', (code) => {
+                if (didSucceed(code)) {
+                    resolve('pcf project created');
+                }
+                else {
+                    reject('Ensure the Power Platform CLI is installed. Command must be run from within VS Code if using the Power Platform Extension');
+                }
+            });
+        });
     });
-    plop.setActionType('addGenScript', () => {
+    plop.setActionType('addGenScript', async () => {
         const packagePath = path_1.default.resolve(process.cwd(), 'package.json');
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const packageJson = require(packagePath);
         packageJson.scripts.gen = 'plop';
-        fs_1.default.writeFileSync(packagePath, JSON.stringify(packageJson, null, 4), 'utf8');
+        await fs_1.default.promises.writeFile(packagePath, JSON.stringify(packageJson, null, 4), 'utf8');
         return 'added plop script to package.json';
     });
     plop.setGenerator('webresource', {
@@ -54,7 +76,7 @@ exports.default = (plop) => {
                 type: 'addMany',
                 templateFiles: [
                     '../plop-templates/pcf/App.tsx',
-                    '../plop-templates/pcf/index.ts'
+                    '../plop-templates/pcf/index.ts.hbs'
                 ],
                 base: '../plop-templates/pcf',
                 destination: `${process.cwd()}/{{ name }}`,
@@ -63,11 +85,26 @@ exports.default = (plop) => {
                     return !answers.react;
                 }
             },
+            {
+                type: 'add',
+                templateFile: '../plop-templates/pcf/tsconfig.json',
+                path: path_1.default.resolve(process.cwd(), 'tsconfig.json'),
+                force: true,
+                skip: (answers) => {
+                    return !answers.react;
+                }
+            },
             {
                 type: 'addGenScript',
                 skip: (answers) => {
                     return !answers.react;
                 }
+            },
+            {
+                type: 'updateTsConfig',
+                skip: (answers) => {
+                    return !answers.react;
+                }
             }
         ]
     });

package/package.json

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

package/plop-templates/pcf/{index.ts → index.ts.hbs}

@@ -3,12 +3,13 @@ import React from 'react';
 import ReactDOM from 'react-dom';
 import { initializeIcons } from '@fluentui/font-icons-mdl2';
 
-import { App } from './App';
+import { App, AppProps } from './App';
 
-export class ReportDashboard implements ComponentFramework.StandardControl<IInputs, IOutputs> {
+export class {{name}} implements ComponentFramework.StandardControl<IInputs, IOutputs> {
   container: HTMLDivElement;
   context: ComponentFramework.Context<IInputs>;
   isTestHarness: boolean;
+  props: AppProps;
 
   /**
    * Empty constructor.
@@ -39,10 +40,12 @@ export class ReportDashboard implements ComponentFramework.StandardControl<IInpu
    * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to names defined in the manifest, as well as utility functions
    */
   public updateView(context: ComponentFramework.Context<IInputs>): void {
+    this.props = {
+      isTestHarness: this.isTestHarness
+    };
+
     ReactDOM.render(
-      React.createElement(App, {
-        isTestHarness: this.isTestHarness
-      }),
+      React.createElement(App, AppProps),
       this.container
     );
   }
@@ -60,7 +63,7 @@ export class ReportDashboard implements ComponentFramework.StandardControl<IInpu
    * i.e. cancelling any pending remote calls, removing listeners, etc.
    */
   public destroy(): void {
-    // Add code to cleanup control if necessary
+    ReactDOM.unmountComponentAtNode(this.container);
   }
 
 }

package/plop-templates/pcf/tsconfig.json

@@ -0,0 +1,7 @@
+{
+    "extends": "./node_modules/pcf-scripts/tsconfig_base.json",
+    "compilerOptions": {
+        "target": "ES6",
+        "esModuleInterop": true
+    }
+}