create-powerapps-project 0.16.6 → 0.17.0

package/CHANGELOG.json

@@ -2,7 +2,22 @@
   "name": "create-powerapps-project",
   "entries": [
     {
-      "date": "Wed, 16 Feb 2022 00:36:07 GMT",
+      "date": "Thu, 17 Feb 2022 01:02:44 GMT",
+      "tag": "create-powerapps-project_v0.17.0",
+      "version": "0.17.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "derek.finlinson@journeyteam.com",
+            "package": "create-powerapps-project",
+            "commit": "205f5973d29c92d19c7e2f5154e01a784c2fe58b",
+            "comment": "Switch to wrapping plop"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 16 Feb 2022 00:36:25 GMT",
       "tag": "create-powerapps-project_v0.16.6",
       "version": "0.16.6",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,25 @@
 # Change Log - create-powerapps-project
 
-This log was last generated on Wed, 16 Feb 2022 00:36:07 GMT and should not be manually modified.
+This log was last generated on Thu, 17 Feb 2022 01:02:44 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.16.6
+## 0.17.0
 
-Wed, 16 Feb 2022 00:36:07 GMT
+Thu, 17 Feb 2022 01:02:44 GMT
 
-### Patches
+### Minor changes
 
-- Re-add sn.exe; React PCF updates (derek.finlinson@journeyteam.com)
+- Switch to wrapping plop (derek.finlinson@journeyteam.com)
 
+## 0.16.6
+
+Wed, 16 Feb 2022 00:36:25 GMT
+
+### Patches
+
+- Re-add sn.exe; React PCF updates (derek.finlinson@journeyteam.com)
+
 ## 0.16.5
 
 Mon, 14 Feb 2022 23:29:54 GMT

package/lib/getEnvInfo.js

@@ -23,7 +23,6 @@ const initialize = async () => {
     if (envInfoCache.Binaries.npm) {
         envInfoCache.Binaries.npm.path = expandHome(envInfoCache.Binaries.npm.path);
     }
-    return envInfoCache;
 };
 exports.initialize = initialize;
 const expandHome = (pathString) => {

package/lib/index.js

@@ -4,20 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const createDataverseProject_1 = __importDefault(require("./createDataverseProject"));
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const packageJson = require('../package');
-const program = new commander_1.Command(packageJson.name);
-program
-    .version(packageJson.version)
-    .description('Create new Dataverse project')
-    .usage('[type]')
-    .argument('[type]', 'Type of project to generate')
-    .action(type => {
-    (0, createDataverseProject_1.default)(type);
+const node_path_1 = __importDefault(require("node:path"));
+const plop_1 = require("plop");
+plop_1.Plop.launch({
+    cwd: process.cwd(),
+    configPath: node_path_1.default.join(__dirname, 'plopfile.js')
+}, env => {
+    const options = {
+        ...env,
+        dest: process.cwd() // this will make the destination path to be based on the cwd when calling the wrapper
+    };
+    return (0, plop_1.run)(options, undefined, true);
 });
-program.parse(process.argv);
-if (!process.argv.slice(1).length) {
-    program.outputHelp();
-}

package/lib/nuget.js

@@ -37,12 +37,10 @@ const install = (project, sdkVersion, xrmVersion) => {
         stdio: 'inherit'
     });
     // Install nuget packages
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     (0, child_process_1.spawnSync)('dotnet', ['add', 'package', 'Microsoft.CrmSdk.Workflow', '-v', sdkVersion, '-n'], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     (0, child_process_1.spawnSync)('dotnet', ['add', 'package', 'JourneyTeam.Xrm', '-v', xrmVersion, '-n'], {
         cwd: process.cwd(),
         stdio: 'inherit'

package/lib/plopfile.js

@@ -1,4 +1,23 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -6,10 +25,14 @@ 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 nuget = __importStar(require("./nuget"));
+const pkg = __importStar(require("./packageManager"));
+const getEnvInfo_1 = require("./getEnvInfo");
 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) => {
+    void (0, getEnvInfo_1.initialize)();
     plop.setActionType('signAssembly', (answers) => {
         const keyPath = path_1.default.resolve(process.cwd(), `${answers.name}.snk`);
         return new Promise((resolve, reject) => {
@@ -22,9 +45,12 @@ exports.default = (plop) => {
                     resolve('signed assembly');
                 }
                 else {
-                    reject('Failed to sign assembly');
+                    reject('failed to sign assembly');
                 }
             });
+            sign.on('error', () => {
+                reject('failed to sign assembly');
+            });
         });
     });
     plop.setActionType('runPcf', (answers) => {
@@ -46,6 +72,9 @@ exports.default = (plop) => {
                     reject('Ensure the Power Platform CLI is installed. Command must be run from within VS Code if using the Power Platform Extension');
                 }
             });
+            pac.on('error', () => {
+                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', async () => {
@@ -56,7 +85,52 @@ exports.default = (plop) => {
         await fs_1.default.promises.writeFile(packagePath, JSON.stringify(packageJson, null, 4), 'utf8');
         return 'added plop script to package.json';
     });
+    plop.setActionType('nugetInstall', async (answers) => {
+        const xrmVersions = await nuget.getNugetPackageVersions('JourneyTeam.Xrm');
+        const xrmVersion = xrmVersions.shift();
+        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);
+        }
+        return 'installed npm packages';
+    });
+    const connectionQuestions = [
+        {
+            type: 'input',
+            name: 'server',
+            message: 'enter dataverse url (https://org.crm.dynamics.com):'
+        },
+        {
+            type: 'input',
+            name: 'tenant',
+            message: 'enter azure ad tenant (org.onmicrosoft.com):',
+            default: 'common'
+        },
+        {
+            type: 'input',
+            name: 'solution',
+            message: 'dataverse solution unique name:'
+        }
+    ];
     plop.setGenerator('webresource', {
+        description: 'generate dataverse web resource project',
+        prompts: [
+            {
+                type: 'input',
+                name: 'name',
+                message: 'project name',
+                default: path_1.default.basename(process.cwd())
+            },
+            {
+                type: 'input',
+                name: 'namespace',
+                message: 'namespace for form and ribbon scripts:'
+            },
+            ...connectionQuestions
+        ],
         actions: [
             {
                 type: 'addMany',
@@ -64,10 +138,44 @@ exports.default = (plop) => {
                 base: '../plop-templates/webresource',
                 destination: process.cwd(),
                 force: true
+            },
+            {
+                type: 'npmInstall',
+                projectType: 'webresource',
+                skip: (answers) => {
+                    return !answers.react;
+                }
             }
         ]
     });
     plop.setGenerator('pcf', {
+        description: 'generate dataverse pcf project',
+        prompts: [
+            {
+                type: 'list',
+                name: 'template',
+                message: 'template',
+                choices: [
+                    { name: 'field', value: 'field' },
+                    { name: 'dataset', value: 'dataset' }
+                ]
+            },
+            {
+                type: 'input',
+                name: 'namespace',
+                message: 'namespace'
+            },
+            {
+                type: 'input',
+                name: 'name',
+                message: 'name'
+            },
+            {
+                type: 'confirm',
+                name: 'react',
+                message: 'use react?'
+            }
+        ],
         actions: [
             {
                 type: 'runPcf'
@@ -101,7 +209,8 @@ exports.default = (plop) => {
                 }
             },
             {
-                type: 'updateTsConfig',
+                type: 'npmInstall',
+                projectType: 'pcf',
                 skip: (answers) => {
                     return !answers.react;
                 }
@@ -109,6 +218,40 @@ exports.default = (plop) => {
         ]
     });
     plop.setGenerator('assembly', {
+        description: 'generate dataverse assembly project',
+        prompts: [
+            {
+                type: 'list',
+                name: 'sdkVersion',
+                message: 'select sdk version',
+                choices: async () => {
+                    const versions = await nuget.getNugetPackageVersions('Microsoft.CrmSdk.Workflow');
+                    return versions.map(v => ({ name: v, value: v }));
+                }
+            },
+            {
+                type: 'input',
+                name: 'name',
+                message: 'default C# namespace (Company.Crm.Plugins):'
+            },
+            {
+                type: 'list',
+                name: 'isolation',
+                message: 'select isolation mode',
+                default: 2,
+                choices: [
+                    {
+                        name: 'sandbox',
+                        value: 2
+                    },
+                    {
+                        name: 'none',
+                        value: 1
+                    }
+                ]
+            },
+            ...connectionQuestions,
+        ],
         actions: [
             {
                 type: 'add',
@@ -132,6 +275,13 @@ exports.default = (plop) => {
             },
             {
                 type: 'signAssembly'
+            },
+            {
+                type: 'nugetInstall'
+            },
+            {
+                type: 'npmInstall',
+                projectType: 'assembly'
             }
         ]
     });

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "create-powerapps-project",
   "description": "💧 plop generator for Dataverse development",
-  "version": "0.16.6",
+  "version": "0.17.0",
   "license": "MIT",
+  "type": "commonjs",
   "main": "lib/index.js",
   "bin": {
     "create-powerapps-project": "lib/index.js"
@@ -22,15 +23,11 @@
     "clean": "rimraf lib"
   },
   "dependencies": {
-    "commander": "^8.3.0",
     "envinfo": "^7.8.1",
-    "kleur": "^4.1.4",
-    "node-plop": "^0.26.3",
-    "prompts": "^2.4.2"
+    "plop": "^2.7.6"
   },
   "devDependencies": {
     "@types/envinfo": "^7.8.1",
-    "@types/node": "^14.14.21",
-    "@types/prompts": "^2.0.14"
+    "@types/node": "^14.14.21"
   }
 }

package/plop-templates/assembly/package.json.hbs

@@ -2,6 +2,7 @@
   "version": "1.0.0",
   "name": "{{kebabCase name}}",
   "private": true,
+  "type": "commonjs",
   "scripts": {
     "gen": "plop",
     "deploy": "dataverse-utils deploy assembly"

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

@@ -45,7 +45,7 @@ export class {{name}} implements ComponentFramework.StandardControl<IInputs, IOu
     };
 
     ReactDOM.render(
-      React.createElement(App, AppProps),
+      React.createElement(App, this.props),
       this.container
     );
   }

package/plop-templates/webresource/package.json.hbs

@@ -2,6 +2,7 @@
   "version": "1.0.0",
   "name": "{{kebabCase name}}",
   "private": true,
+  "type": "commonjs",
   "scripts": {
     "build": "webpack --mode=production",
     "start": "webpack --mode=development --watch",

package/lib/createDataverseProject.js

@@ -1,220 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.done = void 0;
-const prompts_1 = __importDefault(require("prompts"));
-const nuget_1 = require("./nuget");
-const path_1 = __importDefault(require("path"));
-const plop_1 = require("./plop");
-const pkg = __importStar(require("./packageManager"));
-const getEnvInfo_1 = require("./getEnvInfo");
-const logger_1 = require("./logger");
-exports.default = async (type) => {
-    await (0, getEnvInfo_1.initialize)();
-    const name = path_1.default.basename(process.cwd());
-    if (!type || (type !== 'webresource' && type !== 'assembly' && type !== 'pcf')) {
-        const invalid = type !== undefined && type !== 'webresource' && type !== 'assembly' && type !== 'pcf';
-        const invalidMessage = invalid ? `${type} is not a valid project type.` : '';
-        const { promptType } = await (0, prompts_1.default)({
-            type: 'select',
-            name: 'promptType',
-            message: `${invalidMessage} Select dataverse project to create?`,
-            choices: [
-                { title: 'web resource', value: 'webresource' },
-                { title: 'plugin or workflow activity', value: 'assembly' },
-                { title: 'powerapps component framework control', value: 'pcf' }
-            ]
-        });
-        type = promptType;
-    }
-    const questions = await getAnswers(type);
-    const config = (await (0, prompts_1.default)(questions));
-    if (type === 'assembly') {
-        const xrmVersions = await (0, nuget_1.getNugetPackageVersions)('JourneyTeam.Xrm');
-        config.xrmVersion = xrmVersions.shift();
-    }
-    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`);
-    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);
-    }
-    if (type === 'assembly') {
-        logger_1.logger.info('add nuget packages');
-        (0, nuget_1.install)(config.name, config.sdkVersion, config.xrmVersion);
-    }
-    (0, exports.done)(type);
-};
-const getAnswers = async (type) => {
-    let questions = [];
-    if (type === 'pcf') {
-        questions = [
-            {
-                type: 'select',
-                name: 'template',
-                message: 'template',
-                choices: [
-                    { title: 'field', value: 'field' },
-                    { title: 'dataset', value: 'dataset' }
-                ]
-            },
-            {
-                type: 'text',
-                name: 'namespace',
-                message: 'namespace'
-            },
-            {
-                type: 'text',
-                name: 'name',
-                message: 'name'
-            },
-            {
-                type: 'confirm',
-                name: 'react',
-                message: 'install react?'
-            }
-        ];
-        return questions;
-    }
-    if (type === 'webresource') {
-        questions.push({
-            type: 'text',
-            name: 'namespace',
-            message: 'namespace for form and ribbon scripts:'
-        });
-    }
-    else {
-        const versions = await (0, nuget_1.getNugetPackageVersions)('Microsoft.CrmSdk.Workflow');
-        questions = [
-            {
-                type: 'select',
-                name: 'sdkVersion',
-                message: 'select sdk version',
-                choices: versions.map(v => ({ title: v, value: v }))
-            },
-            {
-                type: 'text',
-                name: 'name',
-                message: 'default namespace'
-            },
-            {
-                type: 'select',
-                name: 'isolation',
-                message: 'select isolation mode',
-                initial: 0,
-                choices: [
-                    {
-                        title: 'sandbox',
-                        value: 2
-                    },
-                    {
-                        title: 'none',
-                        value: 1
-                    }
-                ]
-            }
-        ];
-    }
-    questions = [
-        ...questions,
-        {
-            type: 'text',
-            name: 'server',
-            message: 'enter dataverse url (https://org.crm.dynamics.com):'
-        },
-        {
-            type: 'text',
-            name: 'tenant',
-            message: 'enter azure ad tenant (org.onmicrosoft.com):'
-        },
-        {
-            type: 'text',
-            name: 'solution',
-            message: 'dataverse solution unique name:'
-        }
-    ];
-    return questions;
-};
-const done = (type) => {
-    if (process.env.JEST_WORKER_ID !== undefined) {
-        return;
-    }
-    let message;
-    if (type === 'pcf') {
-        message = `
-
-  ${logger_1.icons.done} ${type} project created!
-  
-    keep your build tools up-to-date by updating these two devDependencies:
-      ${logger_1.icons.info} powerapps-project-${type}
-  
-    build your project in watch mode with this command:
-      ${logger_1.icons.info} npm start watch
-    build your project in production mode with this command:
-      ${logger_1.icons.info} npm run build
-  
-    run code generator with this command:
-      ${logger_1.icons.info} npm run gen
-  
-  `;
-    }
-    else {
-        message = `
-
-  ${logger_1.icons.done} ${type} project created!
-  
-    keep your build tools up-to-date by updating these two devDependencies:
-      ${logger_1.icons.info} dataverse-utils
-      ${logger_1.icons.info} powerapps-project-${type}
-  
-    ${type === 'webresource' ?
-            `build your project in watch mode with this command:
-      ${logger_1.icons.info} ${pkg.getYarn() ? 'yarn' : 'npm run'} start
-    build your project in production mode with this command:
-      ${logger_1.icons.info} ${pkg.getYarn() ? 'yarn' : 'npm run'} build
-    generate table definition files with this command:
-      ${logger_1.icons.info} ${pkg.getYarn() ? 'yarn' : 'npm run'} generate` :
-            `build your project with this command:
-        dotnet build
-    deploy your project with this command:
-      ${logger_1.icons.info} ${pkg.getYarn() ? 'yarn' : 'npm run'} deploy`}
-  
-    run code generator with this command:
-      ${logger_1.icons.info} ${pkg.getYarn() ? 'yarn' : 'npm run'} gen
-  
-  `;
-    }
-    console.info(message);
-};
-exports.done = done;

package/lib/logger.js

@@ -1,36 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = exports.icons = void 0;
-const kleur_1 = __importDefault(require("kleur"));
-const isTest = process.env.JEST_WORKER_ID !== undefined;
-exports.icons = {
-    done: kleur_1.default.green('◉'),
-    info: kleur_1.default.cyan('◎'),
-    error: kleur_1.default.red('⨂'),
-    warn: kleur_1.default.yellow('⨁')
-};
-exports.logger = {
-    info(...args) {
-        if (!isTest) {
-            console.info(exports.icons.info, ...args);
-        }
-    },
-    warn(...args) {
-        if (!isTest) {
-            console.warn(exports.icons.warn, ...args);
-        }
-    },
-    error(...args) {
-        if (!isTest) {
-            console.error(exports.icons.error, ...args);
-        }
-    },
-    done(...args) {
-        if (!isTest) {
-            console.info(exports.icons.done, ...args);
-        }
-    },
-};

package/lib/plop.js

@@ -1,37 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.runGenerator = exports.getGenerator = void 0;
-const node_plop_1 = __importDefault(require("node-plop"));
-const path_1 = __importDefault(require("path"));
-const logger_1 = require("./logger");
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const getGenerator = async (type, name) => {
-    let plopFile = path_1.default.resolve(__dirname, 'plopfile.js');
-    if (process.env.JEST_WORKER_ID !== undefined) {
-        plopFile = path_1.default.resolve(__dirname, 'plopfile.ts');
-    }
-    const plop = (0, node_plop_1.default)(plopFile, { destBasePath: name, force: false });
-    const generator = plop.getGenerator(type);
-    return generator;
-};
-exports.getGenerator = getGenerator;
-const runGenerator = async (generator, args) => {
-    const results = await generator.runActions(args, {
-        onComment: (comment) => {
-            logger_1.logger.info(comment);
-        }
-    });
-    if (results.failures && results.failures.length > 0) {
-        throw new Error(results.failures[0].error);
-    }
-    // do something after the actions have run
-    for (const change of results.changes) {
-        if (change.path) {
-            logger_1.logger.done(change.path);
-        }
-    }
-};
-exports.runGenerator = runGenerator;