@wavemaker/angular-codegen 11.1.0-next.24306 → 11.1.0-next.24310

angular-codegen/angular-app/package.json

@@ -3,30 +3,30 @@
     "version": "0.0.0",
     "scripts": {
         "ng": "ng",
-        "start": "ng serve",
-        "build": "ng build",
-        "test": "ng test",
-        "test_components": "ng t @wm/components/base",
-        "test_mobile": "ng t @wm/mobile/components/basic",
-        "test_variables": "ng t @wm/variables",
+        "start": "./node_modules/@angular/cli/bin/ng serve",
+        "build": "./node_modules/@angular/cli/bin/ng build",
+        "postbuild": "node build-scripts/post-build.js",
+        "test": "./node_modules/@angular/cli/bin/ng test",
+        "test_components": "./node_modules/@angular/cli/bin/ng t @wm/components/base",
+        "test_mobile": "./node_modules/@angular/cli/bin/ng t @wm/mobile/components/basic",
+        "test_variables": "./node_modules/@angular/cli/bin/ng t @wm/variables",
         "test-all": "npm run test_variables && npm run test_components",
         "test-prod": "npm run test-all > karma-test-report.txt; node combine-coverage.js >> karma-test-report.txt",
-        "lint": "ng lint",
-        "e2e": "ng e2e",
-        "optimizecss": "gulp --gulpfile build-scripts/optimize-css.gulpfile.js",
-        "postbuild": "node build-scripts/post-build.js"
+        "lint": "./node_modules/@angular/cli/bin/ng lint",
+        "e2e": "./node_modules/@angular/cli/bin/ng e2e",
+        "optimizecss": "gulp --gulpfile build-scripts/optimize-css.gulpfile.js"
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "11.2.14",
-        "@angular/common": "11.2.14",
-        "@angular/compiler": "11.2.14",
-        "@angular/core": "11.2.14",
-        "@angular/forms": "11.2.14",
-        "@angular/platform-browser": "11.2.14",
-        "@angular/platform-browser-dynamic": "11.2.14",
-        "@angular/router": "11.2.14",
-        "@angular/service-worker": "11.2.14",
+        "@angular/animations": "12.2.16",
+        "@angular/common": "12.2.16",
+        "@angular/compiler": "12.2.16",
+        "@angular/core": "12.2.16",
+        "@angular/forms": "12.2.16",
+        "@angular/platform-browser": "12.2.16",
+        "@angular/platform-browser-dynamic": "12.2.16",
+        "@angular/router": "12.2.16",
+        "@angular/service-worker": "12.2.16",
         "@babel/runtime": "^7.14.8",
         "@awesome-cordova-plugins/app-version": "5.39.1",
         "@awesome-cordova-plugins/barcode-scanner": "5.39.1",
@@ -53,11 +53,11 @@
         "hammerjs": "2.0.8",
         "he": "1.2.0",
         "iscroll": "5.2.0",
-        "jquery": "3.4.1",
+        "jquery": "3.6.0",
         "jquery-ui": "1.13.0",
         "js-cookie": "2.2.0",
         "jssha": "^3.1.2",
-        "lodash": "4.17.19",
+        "lodash": "4.17.21",
         "ng-circle-progress": "1.6.0",
         "ngx-bootstrap": "6.2.0",
         "ngx-color-picker": "10.1.0",
@@ -67,16 +67,16 @@
         "summernote": "0.8.11",
         "tslib": "^2.0.0",
         "x2js": "3.2.6",
-        "zone.js": "~0.10.3",
-        "@wavemaker/app-ng-runtime": "11.1.0-next.24306"
+        "zone.js": "~0.11.4",
+        "@wavemaker/app-ng-runtime": "11.1.0-next.24310"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "0.8.5",
         "@angular-builders/custom-webpack": "11.1.1",
-        "@angular-devkit/build-angular": "0.1102.15",
-        "@angular/cli": "11.2.15",
-        "@angular/compiler-cli": "11.2.14",
-        "@angular/language-service": "11.2.14",
+        "@angular-devkit/build-angular": "12.2.16",
+        "@angular/cli": "12.2.16",
+        "@angular/compiler-cli": "12.2.16",
+        "@angular/language-service": "12.2.16",
         "@babel/plugin-transform-runtime": "^7.14.5",
         "@compodoc/compodoc": "1.1.11",
         "@types/jasmine": "2.8.8",
@@ -96,14 +96,14 @@
         "jasmine": "3.5.0",
         "jasmine-core": "~3.5.0",
         "jasmine-spec-reporter": "~5.0.0",
-        "karma": "~5.0.0",
+        "karma": "~6.3.15",
         "karma-chrome-launcher": "~3.1.0",
         "karma-coverage-istanbul-reporter": "~3.0.2",
         "karma-jasmine": "~4.0.0",
         "karma-jasmine-html-reporter": "^1.5.0",
         "karma-mocha-reporter": "2.2.5",
-        "moment": "2.24.0",
-        "ng-packagr": "11.2.4",
+        "moment": "2.29.0",
+        "ng-packagr": "12.2.7",
         "npm-run-all": "4.1.5",
         "rimraf": "2.6.3",
         "rollup": "0.65.2",
@@ -114,7 +114,7 @@
         "rollup-plugin-node-resolve": "3.4.0",
         "ts-node": "7.0.1",
         "tslint": "~6.1.0",
-        "typescript": "4.1.6",
+        "typescript": "4.3.5",
         "util": "0.11.1",
         "yargs": "^17.3.1"
     }

angular-codegen/angular-app/src/.browserslistrc

@@ -9,4 +9,4 @@ last 2 versions
 Firefox ESR
 not dead
 not IE 9-10
-IE 11
+not IE 11

angular-codegen/angular-app/src/environments/environment.ts

@@ -13,4 +13,4 @@ export const environment = {
  * This import should be commented out in production mode because it will have a negative impact
  * on performance if an error is thrown.
  */
-// import 'zone.js/dist/zone-error';  // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.

angular-codegen/angular-app/src/polyfills.ts

@@ -61,7 +61,7 @@ import 'core-js/es6/reflect';
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
+import 'zone.js';  // Included with Angular CLI.
 
 
 /***************************************************************************************************

angular-codegen/build-angular-app.js

@@ -20,10 +20,13 @@ const { executeSyncCmd,  MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require(
 /**
  * @TODO: This is a temporary workaround to extract deploy-url from 'ngBuildParams', need to be replaced in future.
  */
-const getDeployUrl = (ngBuildParams) => {
+const updateDeployUrl = (ngBuildParams) => {
     let buildArgs = ngBuildParams.split(' ');
     const deployParam = buildArgs.find(i => i.startsWith("--deploy-url="));
-    return deployParam ? deployParam.split("=")[1] : 'ng-bundle/';
+    if(!deployParam) {
+        buildArgs.push("--deploy-url=ng-bundle/");
+    }
+    return ngBuildParams = buildArgs.join(" ");
 };
 
 /**
@@ -56,10 +59,10 @@ const buildAngularApp = (args) => {
         process.exit(err.code || err.pid);
     }
 
-    const deployUrl = getDeployUrl(args.ngBuildParams);
+    let ngBuildParams = updateDeployUrl(args.ngBuildParams);
     const NG_BUILD_MSG = 'NG BUILD MIGHT HAVE FAILED WITH HEAP OUT OF MEMORY, RE-EXECUTE THE BUILD BY INCREASING THE MAX-OLD-SPACE-SIZE ARGUMENT VALUE FOR BUILD.UI.NODE.ARGS PROPERTY IN DEPLOYMENT PROFILE';
     // Generating the angular build and post build process.
-    executeSyncCmd('cd ' + args.appTarget + ' && node ' + args.nodeVMArgs + ' ' + './node_modules/@angular/cli/bin/ng build ' + args.ngBuildParams + ' && node build-scripts/post-build.js --deploy-url=' + deployUrl, null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
+    executeSyncCmd('cd ' + args.appTarget + ' && node ' + args.nodeVMArgs + ' `which npm`' + ' run build -- ' + ngBuildParams, null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
 }