create-powerapps-project 0.24.5 → 0.25.1

package/lib/plopActions.js

@@ -79,17 +79,11 @@ exports.default = (plop) => {
         });
     });
     plop.setActionType('runPcf', async (answers) => {
-        const args = ['pcf', 'init', '-ns', answers.namespace, '-n', answers.name, '-t', answers.template];
+        const args = ['pcf', 'init', '-ns', answers.namespace, '-n', answers.name, '-t', answers.template, '-npm', 'false'];
         // Set framework to React if selected
         if (answers.react) {
             args.push('-fw', 'react');
         }
-        if (process.env.JEST_WORKER_ID !== undefined || answers.package !== 'npm') {
-            args.push('-npm', 'false');
-        }
-        else {
-            args.push('-npm', 'true');
-        }
         return new Promise((resolve, reject) => {
             const pac = (0, child_process_1.spawn)('pac', args, { stdio: 'inherit' });
             pac.on('close', (code) => {

package/lib/plopfile.js

@@ -28,9 +28,9 @@ exports.default = (plop) => {
             type: 'input',
             name: 'server',
             message: 'enter dataverse url (https://org.crm.dynamics.com):',
-            validate: (server) => {
+            validate: (answer) => {
                 try {
-                    const url = new URL(server);
+                    const url = new URL(answer);
                     if (url.protocol !== 'https:') {
                         return 'server should begin with https';
                     }
@@ -65,8 +65,8 @@ exports.default = (plop) => {
                 type: 'input',
                 name: 'prefix',
                 message: 'publisher prefix (no underscore):',
-                validate: (prefix) => {
-                    if (prefix.slice(-1) === '_') {
+                validate: (answer) => {
+                    if (answer.slice(-1) === '_') {
                         return 'enter publisher prefix without the underscore';
                     }
                     return true;
@@ -102,14 +102,14 @@ exports.default = (plop) => {
                 type: 'input',
                 name: 'name',
                 message: 'default C# namespace (Company.Crm.Plugins):',
-                validate: (name) => {
-                    const validNamespace = name.replace(/[^a-zA-Z.]+/g, '');
-                    if (validNamespace !== name) {
+                validate: (answer) => {
+                    const validNamespace = answer.replace(/[^a-zA-Z.]+/g, '');
+                    if (validNamespace !== answer) {
                         return 'namespace must contain only alpha characters and periods';
                     }
-                    const namespace = name.split('.');
+                    const namespace = answer.split('.');
                     for (const item of namespace) {
-                        const title = plop.renderString('{{titleCase name}}', { name: item });
+                        const title = plop.renderString('{{pascalCase name}}', { name: item });
                         if (title !== item) {
                             return `enter namespace using PascalCase`;
                         }
@@ -258,6 +258,11 @@ exports.default = (plop) => {
                 name: 'name',
                 message: 'name'
             },
+            {
+                type: 'input',
+                name: 'prefix',
+                message: 'publisher prefix'
+            },
             {
                 type: 'confirm',
                 name: 'react',
@@ -276,6 +281,18 @@ exports.default = (plop) => {
                     path: path_1.default.resolve(process.cwd(), 'tsconfig.json'),
                     force: true
                 },
+                {
+                    type: 'add',
+                    templateFile: '../plop-templates/pcf/plopfile.js',
+                    path: path_1.default.resolve(process.cwd(), 'plopfile.js'),
+                    force: true
+                },
+                {
+                    type: 'add',
+                    templateFile: '../plop-templates/pcf/.gitattributes',
+                    path: path_1.default.resolve(process.cwd(), '.gitattributes'),
+                    force: true
+                },
                 {
                     type: 'addMany',
                     templateFiles: [
@@ -316,6 +333,13 @@ exports.default = (plop) => {
                         scriptValue: 'pcf-scripts build --buildMode production'
                     }
                 },
+                {
+                    type: 'addScript',
+                    data: {
+                        scriptKey: 'push',
+                        scriptValue: `pac pcf version --strategy manifest && pac pcf push -pp ${data.prefix}`
+                    }
+                },
                 {
                     type: 'addScript',
                     data: {
@@ -327,11 +351,16 @@ exports.default = (plop) => {
                     await fs_1.default.promises.rm(path_1.default.resolve(process.cwd(), answers.name, 'HelloWorld.tsx'));
                     return 'removed HelloWorld component';
                 },
+                {
+                    type: 'npmInstall'
+                },
                 {
                     type: 'npmInstall',
-                    skip: (answers) => {
-                        if (answers.package === 'npm') {
-                            return 'npm packages already installed';
+                    data: {
+                        packages: {
+                            devDependencies: [
+                                'powerapps-project-pcf'
+                            ]
                         }
                     }
                 }
@@ -359,7 +388,7 @@ exports.default = (plop) => {
             return [
                 {
                     type: 'addMany',
-                    templateFiles: ['../plop-templates/webresource/*', '../plop-templates/webresource/.*'],
+                    templateFiles: ['../plop-templates/webresource/*', '../plop-templates/webresource/.*', '.gitignore'],
                     base: '../plop-templates/webresource',
                     destination: process.cwd(),
                     force: true

package/package.json

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

package/plop-templates/assembly/.gitattributes

@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf

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

@@ -25,7 +25,7 @@
                 "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
-        }
+        },
         {
             "label": "deploy",
             "type":"npm",

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

@@ -8,5 +8,6 @@
     "isolationmode": "{{isolation}}",
     "version": "1.0.0.0",
     "publickeytoken": "{{name}}.snk",
-    "types": []
+    "types": [],
+    "customApis": []
 }

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

@@ -12,6 +12,7 @@
         "isolationmode": "{{isolation}}",
         "version": "1.0.0.0",
         "publickeytoken": "{{name}}.snk",
-        "types": []
+        "types": [],
+        "customApis": []
     }
 }

package/plop-templates/pcf/.gitattributes

@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf

package/plop-templates/pcf/App.tsx.hbs

@@ -1,6 +1,6 @@
 import React from 'react';
 import { IInputs } from './generated/ManifestTypes';
-import AppContext from './AppContext';
+import { AppContextProvider } from './AppContext';
 
 export interface IAppProps {
   context: ComponentFramework.Context<IInputs>;
@@ -12,8 +12,8 @@ export const App = React.memo((props: IAppProps) => {
   } = props;
 
   return (
-    <AppContext.Provider value=\{{ context: context }}>
-    </AppContext.Provider>
+    <AppContextProvider value=\{{ context: context }}>
+    </AppContextProvider>
   );
 });
 

package/plop-templates/pcf/AppContext.ts

@@ -1,10 +1,17 @@
 import React from 'react';
 import { IInputs } from './generated/ManifestTypes';
 
-interface IAppContext {
+const AppContext = React.createContext<ComponentFramework.Context<IInputs>>({} as ComponentFramework.Context<IInputs>);
+
+interface IAppContextProviderProps {
   context: ComponentFramework.Context<IInputs>;
+  children?: React.ReactNode;
 }
 
-const AppContext = React.createContext<IAppContext>({} as IAppContext);
+export const AppContextProvider = (props: IAppContextProviderProps): JSX.Element => {
+  const { context, children } = props;
+
+  return <AppContext.Provider value={context}>{children}</AppContext.Provider>;
+};
 
-export default AppContext;
+export const useAppContext = (): ComponentFramework.Context<IInputs> => React.useContext(AppContext);

package/plop-templates/pcf/plopfile.js

@@ -0,0 +1,3 @@
+module.exports = function (plop) {
+  plop.load('powerapps-project-pcf');
+};

package/plop-templates/webresource/.gitattributes

@@ -0,0 +1,3 @@
+* text=auto eol=lf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf