@wavemaker/angular-codegen 11.2.0-next.140951 → 11.2.0-next.140952

angular-codegen/angular-app/build-scripts/post-build.js

@@ -28,6 +28,8 @@ const generateHash = async (filepath) => {
     return hash.digest('hex');
 };
 const generateHashForScripts = (updatedFilenames) => {
+    //from angular 12(IVY), scripts array in angular json, doesn't allow `@` symbol in the name/value
+    //so removed `@` from wavemaker.com in the file name and adding it back in the post-build.js file
     const scriptsMap = {};
     return new Promise(resolve => {
         fs.readdir(opPath, (err, items) => {

angular-codegen/angular-app/package.json

@@ -3,32 +3,31 @@
     "version": "0.0.0",
     "scripts": {
         "ng": "ng",
-        "start": "./node_modules/@angular/cli/bin/ng serve",
-        "build": "./node_modules/@angular/cli/bin/ng build",
+        "start": "./node_modules/.bin/ng serve",
+        "build": "./node_modules/.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": "./node_modules/.bin/ng test",
+        "test_components": "./node_modules/.bin/ng t @wm/components/base",
+        "test_mobile": "./node_modules/.bin/ng t @wm/mobile/components/basic",
+        "test_variables": "./node_modules/.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": "./node_modules/@angular/cli/bin/ng lint",
-        "e2e": "./node_modules/@angular/cli/bin/ng e2e",
+        "lint": "./node_modules/.bin/ng lint",
+        "e2e": "./node_modules/.bin/ng e2e",
         "optimizecss": "gulp --gulpfile build-scripts/optimize-css.gulpfile.js",
         "owasp": "owasp-dependency-check --project \"wavemaker-ng-runtime\" -f \"ALL\""
     },
     "private": true,
     "dependencies": {
-        "@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",
+        "@angular/animations": "14.2.12",
+        "@angular/common": "14.2.12",
+        "@angular/compiler": "14.2.12",
+        "@angular/core": "14.2.12",
+        "@angular/forms": "14.2.12",
+        "@angular/platform-browser": "14.2.12",
+        "@angular/platform-browser-dynamic": "14.2.12",
+        "@angular/router": "14.2.12",
+        "@angular/service-worker": "14.2.12",
         "@awesome-cordova-plugins/app-version": "5.39.1",
         "@awesome-cordova-plugins/barcode-scanner": "5.39.1",
         "@awesome-cordova-plugins/calendar": "5.39.1",
@@ -44,14 +43,15 @@
         "@awesome-cordova-plugins/network": "5.39.1",
         "@awesome-cordova-plugins/sqlite": "5.39.1",
         "@awesome-cordova-plugins/vibration": "5.39.1",
+        "@babel/runtime": "^7.14.8",
         "@metrichor/jmespath": "^0.3.1",
         "@wavemaker.com/nvd3": "1.0.0",
         "@wavemaker/focus-trap": "^1.0.0",
-        "angular-imask": "6.0.4",
+        "angular-imask": "6.3.0",
         "angular2-websocket": "0.9.7",
         "core-js": "2.5.4",
         "d3": "3.5.17",
-        "fullcalendar": "5.3.1",
+        "fullcalendar": "5.0.0",
         "hammerjs": "2.0.8",
         "he": "1.2.0",
         "iscroll": "5.2.0",
@@ -60,36 +60,36 @@
         "js-cookie": "2.2.0",
         "jssha": "^3.1.2",
         "lodash": "4.17.21",
-        "ng-circle-progress": "1.6.0",
-        "ngx-bootstrap": "6.2.0",
-        "ngx-color-picker": "10.1.0",
-        "ngx-toastr": "13.2.1",
+        "ng-circle-progress": "1.5.1",
+        "ngx-bootstrap": "8.0.0",
+        "ngx-color-picker": "12.0.1",
+        "ngx-toastr": "14.3.0",
         "rxjs": "6.6.0",
         "rxjs-compat": "6.4.0",
         "summernote": "0.8.11",
-        "tslib": "^2.0.0",
-        "x2js": "3.2.6",
+        "tslib": "2.4.1",
+        "x2js": "^3.4.4",
         "zone.js": "~0.11.4",
-        "@wavemaker/app-ng-runtime": "11.2.0-next.140951"
+        "@wavemaker/app-ng-runtime": "11.2.0-next.140952"
     },
     "devDependencies": {
-        "@ampproject/rollup-plugin-closure-compiler": "0.8.5",
-        "@angular-builders/custom-webpack": "11.1.1",
-        "@angular-devkit/build-angular": "12.2.16",
-        "@angular/cli": "12.2.16",
-        "@angular/compiler-cli": "12.2.16",
-        "@angular/language-service": "12.2.16",
+        "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
+        "@angular-builders/custom-webpack": "14.1.0",
+        "@angular-devkit/build-angular": "14.2.10",
+        "@angular/cli": "14.2.10",
+        "@angular/compiler-cli": "14.2.12",
+        "@angular/language-service": "14.2.12",
         "@babel/plugin-transform-runtime": "^7.14.5",
-        "@compodoc/compodoc": "1.1.11",
+        "@compodoc/compodoc": "^1.1.19",
         "@types/jasmine": "2.8.8",
         "@types/jasminewd2": "2.0.3",
         "@types/jquery": "3.3.22",
         "@types/node": "12.11.1",
         "@types/sizzle": "^2.3.3",
-        "brotli-webpack-plugin": "1.1.0",
-        "cheerio": "1.0.0-rc.2",
+        "babel-loader": "^9.1.2",
+        "cheerio": "^1.0.0-rc.12",
         "codelyzer": "5.1.2",
-        "compression-webpack-plugin": "4.0.1",
+        "compression-webpack-plugin": "10.0.0",
         "core-js-builder": "2.5.7",
         "fs": "0.0.1-security",
         "fs-extra": "7.0.1",
@@ -106,21 +106,27 @@
         "karma-mocha-reporter": "2.2.5",
         "moment": "2.29.4",
         "moment-timezone": "^0.5.34",
-        "ng-packagr": "12.2.7",
+        "ng-packagr": "14.2.0",
         "npm-run-all": "4.1.5",
         "owasp-dependency-check": "0.0.21",
         "rimraf": "2.6.3",
-        "rollup": "0.65.2",
-        "rollup-plugin-alias": "1.4.0",
-        "rollup-plugin-commonjs": "9.2.0",
+        "rollup": "3.9.1",
+        "@rollup/plugin-alias": "4.0.2",
+        "@rollup/plugin-commonjs": "24.0.0",
         "rollup-plugin-includepaths": "0.2.3",
-        "rollup-plugin-multi-entry": "2.1.0",
-        "rollup-plugin-node-resolve": "3.4.0",
+        "@rollup/plugin-multi-entry": "6.0.0",
+        "@rollup/plugin-node-resolve": "15.0.1",
+        "terser": "^5.15.1",
         "sonarqube-scanner": "^2.8.2",
         "ts-node": "7.0.1",
         "tslint": "~6.1.0",
-        "typescript": "4.3.5",
+        "typescript": "4.6.4",
         "util": "0.11.1",
         "yargs": "^17.3.1"
-    }
+    },
+    "engines": {
+        "node": "~16.15.1",
+        "npm": "~8.11.0"
+    },
+    "engineStrict": true
 }

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

@@ -8,56 +8,40 @@
  *      file.
  *
  * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
- * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
- * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ * automatically update themselves. This includes recent versions of Safari, Chrome (including
+ * Opera), Edge on the desktop, and iOS and Chrome on mobile.
  *
  * Learn more in https://angular.io/guide/browser-support
  */
 
 /***************************************************************************************************
-* BROWSER POLYFILLS
-*/
-
-
-/** need for 'includes' etc... in IE 11**/
-import 'core-js/es7/array';
-import 'core-js/es7/object';
-
-/**
- * If the application will be indexed by Google Search, the following is required.
- * Googlebot uses a renderer based on Chrome 41.
- * https://developers.google.com/search/docs/guides/rendering
- **/
-// import 'core-js/es6/array';
-
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js';  // Run `npm install --save classlist.js`.
-
-/** IE10 and IE11 requires the following for the Reflect API. */
-import 'core-js/es6/reflect';
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- **/
-// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+ * BROWSER POLYFILLS
+ */
 
 /**
  * By default, zone.js will patch all possible macroTask and DomEvents
  * user can disable parts of macroTask/DomEvents patch by setting following flags
+ * because those flags need to be set before `zone.js` being loaded, and webpack
+ * will put import in the top of bundle, so user need to create a separate file
+ * in this directory (for example: zone-flags.ts), and put the following flags
+ * into that file, and then add the following code before importing zone.js.
+ * import './zone-flags';
+ *
+ * The flags allowed in zone-flags.ts are listed here.
+ *
+ * The following flags will work for all browsers.
+ *
+ * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ *
+ *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ *  with the following flag, it will bypass `zone.js` patch for IE/Edge
+ *
+ *  (window as any).__Zone_enable_cross_context_check = true;
+ *
  */
 
- // (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
- // (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
- // (window as any).__zone_symbol__BLACK_LISTED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
-
- /*
- * in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
- * with the following flag, it will bypass `zone.js` patch for IE/Edge
- */
-// (window as any).__Zone_enable_cross_context_check = true;
-
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */

angular-codegen/angular-app/tsconfig.json

@@ -6,7 +6,7 @@
         "outDir": "./dist/out-tsc",
         "sourceMap": true,
         "declaration": false,
-        "target": "es2015",
+        "target": "es2020",
         "module": "es2020",
         "moduleResolution": "node",
         "emitDecoratorMetadata": true,
@@ -109,6 +109,6 @@
         }
     },
     "angularCompilerOptions": {
-        "enableIvy": false
+        "compilationMode": "full"
     }
 }

angular-codegen/angular-app/tsconfig.web-app.json

@@ -6,7 +6,7 @@
         "outDir": "./dist/out-tsc",
         "sourceMap": true,
         "declaration": false,
-        "target": "es2015",
+        "target": "es2020",
         "module": "es2020",
         "moduleResolution": "node",
         "emitDecoratorMetadata": true,
@@ -97,6 +97,6 @@
         }
     },
     "angularCompilerOptions": {
-        "enableIvy": false
+        "compilationMode": "full"
     }
 }

angular-codegen/angular-app/wm-custom-webpack.config.js

@@ -1,6 +1,6 @@
 const CompressionPlugin = require(`compression-webpack-plugin`);
-const BrotliPlugin = require(`brotli-webpack-plugin`);
 const path = require(`path`);
+
 module.exports = {
     resolve:{
         alias:{
@@ -8,19 +8,16 @@ module.exports = {
         }
     },
     plugins:[
-        new BrotliPlugin({
-            asset: '[fileWithoutExt].br.[ext]',
-            test: /\.(js|css|html|svg|txt|eot|otf|ttf|gif)$/
+        new CompressionPlugin({
+            test: /\.(js|css|html|svg|txt|eot|otf|ttf|gif)$/,
+            filename: "[name].gzip[ext]",
+            algorithm: "gzip"
         }),
         new CompressionPlugin({
             test: /\.(js|css|html|svg|txt|eot|otf|ttf|gif)$/,
-            filename(info){
-                let opFile= info.path.split('.'),
-                opFileType =  opFile.pop(),
-                opFileName = opFile.join('.');
-                return `${opFileName}.gzip.${opFileType}`;
-            }
-        })
+            filename: "[name].br[ext]",
+            algorithm: "brotliCompress"
+        }),
     ],
     optimization: {
         splitChunks: {