@wavemaker/angular-codegen 11.10.0-next.47275 → 11.10.0-rc.198

{angular-codegen → package}/download-packages.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const { executeSyncCmd } = require('./build-util');
 const os = require('os');
+const path = require('path');
 
 
 /**
@@ -40,8 +41,19 @@ const downloadNPMPackage = (packageInfo) => {
         let npmInstallCMD = 'npm install --legacy-peer-deps ';
         if (packageInfo.packageJsonFile && fs.existsSync(packageInfo.packageJsonFile)) {
             fs.copyFileSync(packageInfo.packageJsonFile, PATH_NPM_PACKAGE + '/package.json');
+            try {
+                //expecting this lock file to be present for exact versions to be downloaded from private registry
+                fs.copyFileSync(`${path.dirname(packageInfo.packageJsonFile)} + /package-lock.json`, `${PATH_NPM_PACKAGE} + /package-lock.json`);
+            } catch (err) {
+                if (err.code === 'ENOENT') {
+                    console.error(`Info: package-lock.json file not found at ${path.dirname(packageInfo.packageJsonFile)}`);
+                }
+            }
         } else {
-            npmInstallCMD = 'npm init -y &&  ' + npmInstallCMD + packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
+            npmInstallCMD = 'npm init -y && ' + npmInstallCMD;
+            npmInstallCMD += packageInfo.skipPackageVersion === true
+                ? packageInfo.name
+                : packageInfo.scope + '/' + packageInfo.name + '@' + packageInfo.version;
         }
 
         executeSyncCmd('cd ' + PATH_NPM_PACKAGE + ' && ' + npmInstallCMD, (errMsg) => {

{angular-codegen → package}/generate-angular-app.js

@@ -12,6 +12,7 @@
  */
 
 const {args, executeSyncCmd, MSG_CODEGEN_LOG, getArgs} = require('./build-util');
+const { generateRandomHash } = require('./src/wm-utils');
 
 /**
  * From codegen-cli generate angular app into the target directory
@@ -19,7 +20,8 @@ const {args, executeSyncCmd, MSG_CODEGEN_LOG, getArgs} = require('./build-util')
 const generateAngularApp = () => {
     console.log(MSG_CODEGEN_LOG + 'Generating the angular App...');
     let buildArgs = getArgs(args.ngBuildParams.split(' '));
-    let deployUrl = 'ng-bundle/';
+    global.randomHash = global.randomHash ? global.randomHash : generateRandomHash();
+    let deployUrl = `ng-bundle/${global.randomHash}/`;
     if(buildArgs && buildArgs["deploy-url"]){
         deployUrl = buildArgs["deploy-url"];
     }