create-powerapps-project 2.2.2 → 2.2.4

package/lib/plopfile.js

@@ -199,7 +199,7 @@ export default async (plop) => {
                         '../plop-templates/assembly/plopfile.js',
                         '../plop-templates/assembly/.gitignore',
                         '../plop-templates/assembly/.gitattributes',
-                        '../plop-templates/assembly/builderSettings.json',
+                        '../plop-templates/assembly/builderSettings.json.hbs',
                         '../plop-templates/assembly/.vscode/tasks.json.hbs',
                         '../plop-templates/assembly/.editorconfig'
                     ],
@@ -563,6 +563,8 @@ export default async (plop) => {
                                 'webpack',
                                 'webpack-cli',
                                 'cross-spawn',
+                                'esbuild-loader',
+                                'ts-loader',
                                 '@microsoft/eslint-plugin-power-apps',
                                 '-D'
                             ],

package/package.json

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

package/plop-templates/assembly/{builderSettings.json → builderSettings.json.hbs}

@@ -1,7 +1,7 @@
 {
   "suppressINotifyPattern": true,
   "suppressGeneratedCodeAttribute": true,
-  "namespace": "PowerPlatform",
+  "namespace": "{{name}}.PowerPlatform",
   "serviceContextName": "CrmServiceContext",
   "generateSdkMessages": true,
   "emitFieldsClasses": true,

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

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

package/plop-templates/assembly/plopfile.js

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

package/plop-templates/pcf/plopfile.js

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

package/plop-templates/pcf/tsconfig.json

@@ -1,10 +1,10 @@
 {
-    "extends": "./node_modules/pcf-scripts/tsconfig_base.json",
-    "compilerOptions": {
-        "typeRoots": ["node_modules/@types"],
-        "esModuleInterop": true,
-        "target": "ES6",
-        "module": "es2015",
-        "moduleResolution": "node"
-    }
-}
+  "extends": "./node_modules/pcf-scripts/tsconfig_base.json",
+  "compilerOptions": {
+    "typeRoots": ["node_modules/@types"],
+    "esModuleInterop": true,
+    "target": "ES6",
+    "module": "es2015",
+    "moduleResolution": "node"
+  }
+}

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

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

package/plop-templates/webresource/plopfile.js

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

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

@@ -1,10 +1,14 @@
-const config = require('./dataverse.config.json');
-const path = require('path');
-const spawn = require('cross-spawn');
-const WebpackEventPlugin = require('webpack-event-plugin');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
+import config from './dataverse.config.json' with { type: 'json' };
+import path, { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import spawn from 'cross-spawn';
+import WebpackEventPlugin from 'webpack-event-plugin';
+import { CleanWebpackPlugin } from 'clean-webpack-plugin';
+import { EsbuildPlugin } from 'esbuild-loader';
 
-module.exports = (env, argv) => {
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export default function (env, argv) {
   const webpackConfig = {
     entry: config.entries,
 
@@ -21,12 +25,15 @@ module.exports = (env, argv) => {
     module: {
       rules: [
         {
-          test: /\.[jt]s?$/,
-          loader: 'esbuild-loader',
-          options: {
-            target: 'es2020'
-          }
-        }
+          test: /\.ts(x?)$/,
+          exclude: /node_modules/,
+          use: ['esbuild-loader', 'ts-loader']
+        },
+        {
+          test: /\.js$/,
+          exclude: /node_modules/,
+          use: ['esbuild-loader']
+        },
       ]
     },
 
@@ -49,9 +56,17 @@ module.exports = (env, argv) => {
     ]
   };
 
+  config.optimization = {
+    minimizer: [
+      new EsbuildPlugin({
+        target: 'es2020'
+      })
+    ]
+  };
+
   if (argv.mode === 'development') {
     config.devtool = 'eval-source-map';
   }
 
   return webpackConfig;
-};
+}