create-powerapps-project 0.14.0 → 0.14.4

package/README.md

@@ -1,36 +1,36 @@
-# create-powerapps-project
-| NPM |
-| --- |
-| [![npm](https://img.shields.io/npm/v/create-powerapps-project.svg?style=flat-square)](https://www.npmjs.com/package/create-powerapps-project) |
-
-Project generator for Dataverse development
-
-# Generators
-
-* Web resource project scaffolding
-  * [Typescript](https://www.typescriptlang.org/index.html) for JavaScript files
-  * [Webpack](https://webpack.js.org/) for bundling
-  * [Babel](https://babeljs.io/) for polyfills and compiling ES2015+  
-  * Unit tests using [xrm-mock](https://github.com/camelCaseDave/xrm-mock) and [Jest](https://jestjs.io/)
-  * Deploy web resources
-* Plugin project scaffolding
-  * Base plugin classes
-  * No ILMerge needed
-  * Deploy plugin assemblies and types
-  * Deploy plugin steps
-* Workflow project scaffolding
-  * Workflow activity base class
-  * No ILMerge needed
-  * Deploy workflow assemblies and types
-
-# Create project
-
-```sh
-npm init powerapps-project
-```
-
-# Add files to project
-
-```sh
-npm run gen
+# create-powerapps-project
+| NPM |
+| --- |
+| [![npm](https://img.shields.io/npm/v/create-powerapps-project.svg?style=flat-square)](https://www.npmjs.com/package/create-powerapps-project) |
+
+Project generator for Dataverse development
+
+# Generators
+
+* Web resource project scaffolding
+  * [Typescript](https://www.typescriptlang.org/index.html) for JavaScript files
+  * [Webpack](https://webpack.js.org/) for bundling
+  * [Babel](https://babeljs.io/) for polyfills and compiling ES2015+  
+  * Unit tests using [xrm-mock](https://github.com/camelCaseDave/xrm-mock) and [Jest](https://jestjs.io/)
+  * Deploy web resources
+* Plugin project scaffolding
+  * Base plugin classes
+  * No ILMerge needed
+  * Deploy plugin assemblies and types
+  * Deploy plugin steps
+* Workflow project scaffolding
+  * Workflow activity base class
+  * No ILMerge needed
+  * Deploy workflow assemblies and types
+
+# Create project
+
+```sh
+npm init powerapps-project
+```
+
+# Add files to project
+
+```sh
+npm run gen
 ```

package/lib/createDataverseProject.js

@@ -30,12 +30,12 @@ const pkg = __importStar(require("./packageManager"));
 const just_scripts_utils_1 = require("just-scripts-utils");
 const getEnvInfo_1 = require("./getEnvInfo");
 async function create(argv) {
-    await getEnvInfo_1.initialize();
+    await (0, getEnvInfo_1.initialize)();
     argv.name = path_1.default.basename(process.cwd());
     if (!argv.type || (argv.type !== 'webresource' && argv.type !== 'assembly')) {
         const invalid = argv.type !== undefined && argv.type !== 'webresource' && argv.type !== 'assembly';
         const invalidMessage = invalid ? `${argv.type} is not a valid project type.` : '';
-        const { type } = await prompts_1.default({
+        const { type } = await (0, prompts_1.default)({
             type: 'select',
             name: 'type',
             message: `${invalidMessage} Select dataverse project to create?`,
@@ -47,20 +47,20 @@ async function create(argv) {
         argv.type = type;
     }
     const questions = await getAnswers(argv.type);
-    const config = (await prompts_1.default(questions));
+    const config = (await (0, prompts_1.default)(questions));
     if (argv.type === 'assembly') {
-        const xrmVersions = await nuget_1.getNugetPackageVersions('JourneyTeam.Xrm');
+        const xrmVersions = await (0, nuget_1.getNugetPackageVersions)('JourneyTeam.Xrm');
         config.xrmVersion = xrmVersions.shift();
     }
     just_scripts_utils_1.logger.info('get plop generator');
-    const generator = plop_1.getGenerator(argv);
+    const generator = await (0, plop_1.getGenerator)(argv);
     just_scripts_utils_1.logger.info(`run powerapps-project-${argv.type} code generator`);
-    await plop_1.runGenerator(generator, config);
+    await (0, plop_1.runGenerator)(generator, config);
     just_scripts_utils_1.logger.info('initialize project');
     pkg.install(process.cwd(), argv.type);
     if (argv.type === 'assembly') {
         just_scripts_utils_1.logger.info('add nuget packages');
-        nuget_1.install(config.name, config.sdkVersion, config.xrmVersion);
+        (0, nuget_1.install)(config.name, config.sdkVersion, config.xrmVersion);
     }
     done(argv);
 }
@@ -75,7 +75,7 @@ async function getAnswers(type) {
         });
     }
     else {
-        const versions = await nuget_1.getNugetPackageVersions('Microsoft.CrmSdk.Workflow');
+        const versions = await (0, nuget_1.getNugetPackageVersions)('Microsoft.CrmSdk.Workflow');
         questions = [
             {
                 type: 'select',
@@ -148,5 +148,5 @@ function done(argv) {
   run code generator with this command:
       ${pkg.getYarn() ? 'yarn' : 'npm run'} gen
   `;
-    just_scripts_utils_1.logger.info(just_scripts_utils_1.prettyPrintMarkdown(message));
+    just_scripts_utils_1.logger.info((0, just_scripts_utils_1.prettyPrintMarkdown)(message));
 }

package/lib/index.js

@@ -13,4 +13,4 @@ const options = {
     describe: 'Create new dataverse project',
     handler: createDataverseProject_1.default
 };
-yargs_1.command(options).help().argv;
+(0, yargs_1.command)(options).help().argv;

package/lib/nuget.js

@@ -28,26 +28,26 @@ const getNugetPackageVersions = (name) => {
 exports.getNugetPackageVersions = getNugetPackageVersions;
 const install = (project, sdkVersion, xrmVersion) => {
     // Add solution
-    child_process_1.spawnSync('dotnet', ['new', 'sln', '-n', project], {
+    (0, child_process_1.spawnSync)('dotnet', ['new', 'sln', '-n', project], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });
-    child_process_1.spawnSync('dotnet', ['sln', 'add', `${project}.csproj`], {
+    (0, child_process_1.spawnSync)('dotnet', ['sln', 'add', `${project}.csproj`], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });
     // Install nuget packages
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    child_process_1.spawnSync('dotnet', ['add', 'package', 'Microsoft.CrmSdk.Workflow', '-v', sdkVersion, '-n'], {
+    (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
-    child_process_1.spawnSync('dotnet', ['add', 'package', 'JourneyTeam.Xrm', '-v', xrmVersion, '-n'], {
+    (0, child_process_1.spawnSync)('dotnet', ['add', 'package', 'JourneyTeam.Xrm', '-v', xrmVersion, '-n'], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });
-    child_process_1.spawnSync('dotnet', ['restore'], {
+    (0, child_process_1.spawnSync)('dotnet', ['restore'], {
         cwd: process.cwd(),
         stdio: 'inherit'
     });

package/lib/packageManager.js

@@ -5,26 +5,26 @@ exports.install = exports.getYarn = void 0;
 const child_process_1 = require("child_process");
 const getEnvInfo_1 = require("./getEnvInfo");
 const getYarn = () => {
-    const yarnInfo = getEnvInfo_1.getEnvInfo().Binaries.Yarn;
+    const yarnInfo = (0, getEnvInfo_1.getEnvInfo)().Binaries.Yarn;
     return yarnInfo && yarnInfo.path;
 };
 exports.getYarn = getYarn;
 const getNpm = () => {
-    const npmInfo = getEnvInfo_1.getEnvInfo().Binaries.npm;
+    const npmInfo = (0, getEnvInfo_1.getEnvInfo)().Binaries.npm;
     return npmInfo && npmInfo.path;
 };
 const install = (cwd, type) => {
     const packages = getPackages(type);
-    if (exports.getYarn()) {
-        child_process_1.spawnSync(exports.getYarn(), ['add', ...packages.devDependencies], { stdio: 'inherit', cwd });
+    if ((0, exports.getYarn)()) {
+        (0, child_process_1.spawnSync)((0, exports.getYarn)(), ['add', ...packages.devDependencies], { stdio: 'inherit', cwd });
         if (packages.dependencies) {
-            child_process_1.spawnSync(exports.getYarn(), ['add', ...packages.dependencies], { stdio: 'inherit', cwd });
+            (0, child_process_1.spawnSync)((0, exports.getYarn)(), ['add', ...packages.dependencies], { stdio: 'inherit', cwd });
         }
     }
     else {
-        child_process_1.spawnSync(getNpm(), ['add', ...packages.devDependencies], { stdio: 'inherit', cwd });
+        (0, child_process_1.spawnSync)(getNpm(), ['add', ...packages.devDependencies], { stdio: 'inherit', cwd });
         if (packages.dependencies) {
-            child_process_1.spawnSync(getNpm(), ['add', ...packages.dependencies], { stdio: 'inherit', cwd });
+            (0, child_process_1.spawnSync)(getNpm(), ['add', ...packages.dependencies], { stdio: 'inherit', cwd });
         }
     }
 };

package/lib/plop.d.ts

@@ -1,5 +1,5 @@
 import { PlopGenerator } from 'node-plop';
 import yargs from 'yargs';
 import { Config } from './createDataverseProject';
-export declare const getGenerator: (argv: yargs.Arguments) => PlopGenerator;
+export declare const getGenerator: (argv: yargs.Arguments) => Promise<PlopGenerator>;
 export declare const runGenerator: (generator: PlopGenerator, args: Config) => Promise<void>;

package/lib/plop.js

@@ -8,9 +8,9 @@ const node_plop_1 = __importDefault(require("node-plop"));
 const path_1 = __importDefault(require("path"));
 const just_scripts_utils_1 = require("just-scripts-utils");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const getGenerator = (argv) => {
+const getGenerator = async (argv) => {
     const plopFile = path_1.default.resolve(__dirname, 'plopfile.js');
-    const plop = node_plop_1.default(plopFile, { destBasePath: argv.destination, force: false });
+    const plop = await (0, node_plop_1.default)(plopFile, { destBasePath: argv.destination, force: false });
     const generator = plop.getGenerator(argv.type);
     return generator;
 };

package/lib/plopfile.js

@@ -10,7 +10,7 @@ const child_process_1 = require("child_process");
 exports.default = (plop) => {
     plop.setActionType('signAssembly', (answers) => {
         const keyPath = path_1.default.resolve(process.cwd(), `${answers.name}.snk`);
-        child_process_1.spawnSync(path_1.default.resolve(__dirname, '../', 'bin', 'sn.exe'), ['-q', '-k', keyPath], { stdio: 'inherit' });
+        (0, child_process_1.spawnSync)(path_1.default.resolve(__dirname, '../', 'bin', 'sn.exe'), ['-q', '-k', keyPath], { stdio: 'inherit' });
         return 'signed assembly';
     });
     plop.setGenerator('webresource', {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-powerapps-project",
-  "version": "0.14.0",
+  "version": "0.14.4",
   "license": "MIT",
   "main": "lib/index.js",
   "bin": {
@@ -22,15 +22,15 @@
   },
   "dependencies": {
     "envinfo": "^7.8.1",
-    "node-plop": "^0.26.2",
-    "prompts": "^2.4.0",
-    "just-scripts-utils": "^1.1.1",
-    "yargs": "^16.2.0"
+    "node-plop": "^0.30.0",
+    "prompts": "^2.4.2",
+    "just-scripts-utils": "^1.1.4",
+    "yargs": "^17.3.0"
   },
   "devDependencies": {
-    "@types/envinfo": "^7.8.0",
+    "@types/envinfo": "^7.8.1",
     "@types/node": "^14.14.21",
-    "@types/prompts": "^2.0.9",
-    "@types/yargs": "^15.0.12"
+    "@types/prompts": "^2.0.14",
+    "@types/yargs": "^17.0.7"
   }
 }

package/plop-templates/assembly/.vscode/tasks.json

@@ -1,25 +1,25 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "label": "build",
-            "command": "dotnet",
-            "type": "shell",
-            "args": [
-                "build",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
-            "presentation": {
-                "reveal": "silent"
-            },
-            "problemMatcher": "$msCompile"
-        }
-    ]
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        }
+    ]
 }

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

@@ -2,9 +2,9 @@
   "version": "1.0.0",
   "name": "{{kebabCase name}}",
   "private": true,
+  "type": "module",
   "scripts": {
     "gen": "plop",
-    "auth": "dataverse-deploy auth",
-    "deploy": "npm run auth && dataverse-deploy deploy assembly"
+    "deploy": "dataverse-utils deploy assembly"
   }
 }

package/plop-templates/assembly/plopfile.js

@@ -1,3 +1,3 @@
-module.exports = function (plop) {
+export default function (plop) {
   plop.load('powerapps-project-assembly/plopfile.js');
 }

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

@@ -2,11 +2,12 @@
   "version": "1.0.0",
   "name": "{{kebabCase name}}",
   "private": true,
+  "type": "module",
   "scripts": {
     "build": "webpack --mode=production",
     "start": "webpack --mode=development --watch",
     "gen": "plop",
-    "auth": "dataverse-deploy auth",
-    "deploy": "npm run auth && dataverse-deploy deploy webresource"
+    "deploy": "dataverse-utils deploy webresource",
+    "generate": "dataverse-utils generate"
   }
 }

package/plop-templates/webresource/plopfile.js

@@ -1,3 +1,3 @@
-module.exports = function (plop) {
+export default function (plop) {
   plop.load('powerapps-project-webresource/plopfile.js');
 }