create-powerapps-project 1.7.0 → 1.7.2

package/lib/plopfile.js

@@ -403,21 +403,28 @@ export default async (plop) => {
                     type: 'addScript',
                     data: {
                         scriptKey: 'authenticate',
-                        scriptValue: `pac auth create -env ${data.server} -n ${data.org} -dc`
+                        scriptValue: `pac auth create -n ${data.org} -dc`
+                    }
+                },
+                {
+                    type: 'addScript',
+                    data: {
+                        scriptKey: 'select-auth',
+                        scriptValue: `pac auth select -n ${data.org}`
                     }
                 },
                 {
                     type: 'addScript',
                     data: {
                         scriptKey: 'push',
-                        scriptValue: `pac auth select -n ${data.org} && pac pcf version -s manifest && pac pcf push -pp ${data.prefix} -env ${data.server}`
+                        scriptValue: `npm run select-auth && pac pcf version -s manifest && pac pcf push -pp ${data.prefix} -env ${data.server}`
                     }
                 },
                 {
                     type: 'addScript',
                     data: {
                         scriptKey: 'push-inc',
-                        scriptValue: `pac auth select -n ${data.org} && pac pcf version -s manifest && pac pcf push -pp ${data.prefix} -inc -env ${data.server}`
+                        scriptValue: `npm run build && npm run select-auth && pac pcf version -s manifest && pac pcf push -pp ${data.prefix} -inc -env ${data.server}`
                     }
                 },
                 {
@@ -504,7 +511,12 @@ export default async (plop) => {
                 message: 'namespace for form and ribbon scripts:'
             },
             packageQuestion,
-            ...sharedQuestions
+            ...sharedQuestions,
+            {
+                type: 'confirm',
+                name: 'deploy',
+                message: 'deploy via Azure DevOps Pipelines?'
+            }
         ],
         actions: (data) => {
             return [
@@ -522,6 +534,19 @@ export default async (plop) => {
                     destination: process.cwd(),
                     force: true
                 },
+                {
+                    type: 'addMany',
+                    templateFiles: ['../plop-templates/webresource-deploy/.*'],
+                    base: '../plop-templates/webresource',
+                    destination: process.cwd(),
+                    force: true,
+                    skip: (answers) => {
+                        if (!answers.deploy) {
+                            return 'deployment files not included';
+                        }
+                        return;
+                    }
+                },
                 {
                     type: 'addScript',
                     data: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "create-powerapps-project",
   "description": "💧 plop generator for Dataverse development",
-  "version": "1.7.0",
+  "version": "1.7.2",
   "license": "MIT",
   "exports": "./lib/index.js",
   "engines": {

package/plop-templates/webresource/webpack.config.js.hbs

@@ -4,54 +4,62 @@ const spawn = require('cross-spawn');
 const WebpackEventPlugin = require('webpack-event-plugin');
 const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 
-module.exports = {
-  entry: config.entries,
+module.exports = (env, argv) => {
+  const webpackConfig = {
+    entry: config.entries,
 
-  output: {
-    filename: '[name].js',
-    library: ['{{namespace}}', '[name]'],
-    path: path.resolve(__dirname, 'lib')
-  },
-  
-  resolve: {
-    extensions: ['.tsx', '.ts', '.js'],
-  },
-  
-  module: {
-    rules: [
-      {
-        test: /\.ts(x?)$/,
-        exclude: /node_modules/,
-        use: ['babel-loader', 'ts-loader']
-      },
-      {
-        test: /\.js$/,
-        exclude: /node_modules/,
-        use: ['babel-loader']
-      },
-      {
-        enforce: 'pre',
-        test: /\.(ts)|(js)$/,
-        loader: 'source-map-loader'
-      }
-    ]
-  },
+    output: {
+      filename: '[name].js',
+      library: ['{{namespace}}', '[name]'],
+      path: path.resolve(__dirname, 'lib')
+    },
+    
+    resolve: {
+      extensions: ['.tsx', '.ts', '.js'],
+    },
+    
+    module: {
+      rules: [
+        {
+          test: /\.ts(x?)$/,
+          exclude: /node_modules/,
+          use: ['babel-loader', 'ts-loader']
+        },
+        {
+          test: /\.js$/,
+          exclude: /node_modules/,
+          use: ['babel-loader']
+        },
+        {
+          enforce: 'pre',
+          test: /\.(ts)|(js)$/,
+          loader: 'source-map-loader'
+        }
+      ]
+    },
 
-  plugins: [
-    new CleanWebpackPlugin(),
-    new WebpackEventPlugin([
-      {
-        hook: 'afterEmit',
-        callback: compilation => {
-          if (compilation.errors != null && compilation.errors.length > 0) {
-            return;
-          } else {
-            const assets = Array.from(compilation.emittedAssets || compilation.assets).map(asset => path.basename(asset));
+    plugins: [
+      new CleanWebpackPlugin(),
+      new WebpackEventPlugin([
+        {
+          hook: 'afterEmit',
+          callback: compilation => {
+            if (compilation.errors != null && compilation.errors.length > 0) {
+              return;
+            } else {
+              const assets = Array.from(compilation.emittedAssets || compilation.assets).map(asset => path.basename(asset));
 
-            spawn('npm', ['run', 'deploy', '-- --files=', assets.join(',')], { cwd: process.cwd(), stdio: 'inherit' });
+              spawn('npm', ['run', 'deploy', '-- --files=', assets.join(',')], { cwd: process.cwd(), stdio: 'inherit' });
+            }
           }
         }
-      }
-    ])
-  ]
-}
+      ])
+    ]
+  };
+
+  if (argv.mode === 'development') {
+    config.devtool = 'eval-source-map';
+  }
+
+  return webpackConfig;
+};

package/plop-templates/webresource-deploy/azure-pipelines.yml.hbs

@@ -0,0 +1,51 @@
+name: Build and deploy web resources
+
+trigger:
+  branches:
+    include:
+      - dev
+
+pool:
+  vmImage: windows-latest
+
+variables:
+  serviceConnectionUrl: '{{server}}'
+
+steps:
+- task: PowerPlatformToolInstaller@2
+  inputs:
+    DefaultVersion: true
+
+- task: PowerPlatformSetConnectionVariables@2
+  displayName: 'set power platform connection variables'
+  name: buildConnectionVariables
+  inputs:
+    authenticationType: 'PowerPlatformSPN'
+    PowerPlatformSPN: ''
+
+- template: set-spn-token.yml
+  parameters:
+    serviceConnection: $(serviceConnectionUrl)
+    tenantId: $(buildConnectionVariables.BuildTools.TenantId)
+    clientId: $(buildConnectionVariables.BuildTools.ApplicationId)
+    clientSecret: $(buildConnectionVariables.BuildTools.ClientSecret)
+
+- task: NodeTool@0
+  inputs:
+    versionSpec: "20.x"
+  displayName: "install node"
+
+- script: |
+    {{package}} install
+  displayName: {{package}} install
+
+- script: |
+    {{package}} run build
+  displayName: build web resources
+
+- script: 
+    {{package}} run deploy
+  displayName: deploy web resources
+  env:
+    ACCESSTOKEN: $(SpnToken)
+  

package/plop-templates/webresource-deploy/entra-authentication.ps1

@@ -0,0 +1,34 @@
+function Get-SpnToken {
+    param (
+        [Parameter(Mandatory)] [String]$tenantId,
+        [Parameter(Mandatory)] [String]$clientId,
+        [Parameter(Mandatory)] [String]$clientSecret,
+        [Parameter(Mandatory)] [String]$dataverseHost
+    )
+    $body = @{client_id = $clientId; client_secret = $clientSecret; grant_type = "client_credentials"; scope = "https://$dataverseHost/.default"; }
+    $OAuthReq = Invoke-RestMethod -Method Post -Uri "https://login.microsoftonline.com/$tenantId/oauth2/v2.0/token" -Body $body
+
+    return $OAuthReq.access_token
+}
+
+function Get-HostFromUrl {
+    param (
+        [Parameter(Mandatory)] [String]$url
+    )
+    $options = [System.StringSplitOptions]::RemoveEmptyEntries
+    return $url.Split("://", $options)[1].Split("/")[0]
+}
+
+function Set-SpnTokenVariableWithinAgent {    
+    param (
+        [Parameter(Mandatory)] [String]$tenantId,
+        [Parameter(Mandatory)] [String]$clientId,
+        [Parameter(Mandatory)] [String]$clientSecret,
+        [Parameter(Mandatory)] [String]$serviceConnection
+    )
+    $dataverseHost = Get-HostFromUrl $serviceConnection
+      
+    $spnToken = Get-SpnToken $tenantId $clientId $clientSecret $dataverseHost
+
+    Write-Host "##vso[task.setvariable variable=SpnToken;issecret=true]$spnToken"
+}

package/plop-templates/webresource-deploy/set-spn-token.yml

@@ -0,0 +1,18 @@
+parameters:
+  - name: serviceConnection
+    type: string
+  - name: tenantId
+    type: string
+  - name: clientId
+    type: string
+  - name: clientSecret
+    type: string
+
+steps:
+- pwsh: |
+    $path = "$(Build.SourcesDirectory)"
+
+    . "$path\entra-authentication.ps1"
+    Set-SpnTokenVariableWithinAgent "${{parameters.tenantId}}" "${{parameters.clientId}}" "${{parameters.clientSecret}}" "${{parameters.serviceConnection}}"
+
+  displayName: "Get access token for use by other tasks"