Merge branch 'release/2.2.0'

hso-nn · Dec 15, 2020 · 2ff5a4a · 2ff5a4a
2 parents 3aaa345 + 642713e
commit 2ff5a4a
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 25 deletions.
diff --git a/bin/main.js b/bin/main.js
diff --git a/bin/root/package.json b/bin/root/package.json
@@ -6,7 +6,6 @@
   "scripts": {
     "build": "npm run clean && webpack",
     "build:prod": "npm run clean && cross-env NODE_ENV=production webpack --bail --progress",
-    "deploy": "node tools/deploy.js",
     "resx": "node tools/resx.js",
     "setFormCustomizable:true": "node tools/setFormCustomizable.js --customizable true",
     "setFormCustomizable:false": "node tools/setFormCustomizable.js --customizable false",

diff --git a/bin/root/tools/deploy.js b/bin/root/tools/deploy.js
diff --git a/bin/root/tools/resx.js b/bin/root/tools/resx.js
diff --git a/bin/root/tools/setFormCustomizable.js b/bin/root/tools/setFormCustomizable.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hso/d365-cli",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "author": "HSO Innovation <[email protected]> (http://www.hso.com)",
   "description": "HSO D365 Command Line Interface",
   "repository": {

diff --git a/src/Update.ts b/src/Update.ts
@@ -20,6 +20,7 @@ export class Update {
         console.log(`Updating D365 Project...`);
         const variables = await Variables.get();
         Update.updateWebresources();
+        Update.updateToolsFolder();
         Update.updateSrcFolder();
         Update.updateProjectRootFolder();
         Update.updatePackageJson(variables);
@@ -64,6 +65,12 @@ export class Update {
         });
     }
 
+    private static updateToolsFolder(): void {
+        console.log('Updating tools folder...');
+        shell.rm('-rf', `tools/deploy.js`);
+        shell.exec('git rm tools/deploy.js');
+    }
+
     private static updateSrcFolder(): void {
         if (shell.ls(['./tsconfig.json']).length !== 1) {
             console.log(`Remove src/tsconfig.json...`);

diff --git a/src/main.ts b/src/main.ts
@@ -4,6 +4,7 @@ import {Create} from './Create';
 import {Update} from './update';
 import {Generator} from './generator/Generator';
 import {Variables} from './Variables';
+import {Deploy} from './root/tools/Deploy';
 
 program
     .version('1.8.0') // .version(require('../package').version)
@@ -86,24 +87,14 @@ program
 
 program
     .command('deploy')
-    .alias('d')
+    .option('-f, --force', 'Force unmodified files as well')
     .description('Invokes the deploy builder')
-    .action(() => {
-        shell.exec('npm run deploy');
-    })
-    .on('--help', () => {
+    .action(({force}) => {
+        Deploy.deployProject(force);
+    }).on('--help', () => {
         console.log(`Distributes the project to the D365 environment. You need to run the 'build' command first`);
     });
 
-/* easy debugging/programming
-program
-    .command('deploy')
-    .description('Invokes the deploy builder')
-    .action(() => {
-        console.log(Deploy);
-    });
-*/
-
 program
     .command('update')
     .alias('u')

diff --git a/src/root/tools/Deploy.ts b/src/root/tools/Deploy.ts
@@ -5,6 +5,7 @@ import {AdalRouter} from './AdalRouter';
 import * as crypto from 'crypto';
 import * as xml2js from 'xml2js';
 import * as shell from 'shelljs';
+import * as colors from 'colors';
 
 interface LibraryItem {
     name: string;
@@ -28,7 +29,21 @@ interface XmlDoc {
 }
 
 export class Deploy extends AdalRouter {
+    public static async deployProject(force: boolean): Promise<void> {
+        if (process.argv[4]) {
+            console.log(colors.red(`No spaces allowed after update command!`));
+        } else {
+            new Deploy(force);
+        }
+    }
+
     private md5 = (contents: string): string => crypto.createHash('md5').update(contents).digest('hex');
+    private force: boolean;
+
+    constructor(force: boolean) {
+        super();
+        this.force = force;
+    }
 
     protected onAuthenticated(): Promise<void> {
         return this.deploy();
@@ -78,7 +93,7 @@ export class Deploy extends AdalRouter {
             base64 = data.toString('base64'),
             dependencyXML = await this.generateDependencyXML(filepath, webresource, data),
             md5New = this.md5(base64);
-        if (md5Orig !== md5New || dependencyXML && dependencyXML !== webresource?.dependencyxml) {
+        if (this.force || md5Orig !== md5New || dependencyXML && dependencyXML !== webresource?.dependencyxml) {
             webresource.content = base64;
             webresource.dependencyxml = dependencyXML;
             try {
@@ -257,4 +272,4 @@ export class Deploy extends AdalRouter {
         });
     }
 }
-new Deploy();
+// new Deploy();
diff --git a/webpack.config.js b/webpack.config.js
@@ -17,9 +17,6 @@ module.exports = {
     },
     externals: [nodeExternals()],
     entry: {
-        "root/tools/deploy": [
-            path.resolve(__dirname, "src/root/tools/Deploy.ts")
-        ],
         "root/tools/resx": [
             path.resolve(__dirname, "src/root/tools/Resx.ts")
         ],