RELEASE - 25.2 push to production

README.md

@@ -64,7 +64,7 @@ git clone https://github.com/IgniteUI/igniteui-angular-examples.git
 ```
 ./samples/charts/category-chart/axis-options/
 ```
-- type `npm install --legacy-peer-deps` command in terminal window
+- type `npm install` command in terminal window
 
 - type `npm run start` command in terminal window
 
@@ -86,7 +86,7 @@ C:\GitHub\igniteui-angular-examples\
 
 - select **View** - **Terminal** menu item
 
-- type `npm install --legacy-peer-deps` command in terminal window
+- type `npm install` command in terminal window
 
 This will install required packages and [Ignite UI for Angular](https://www.infragistics.com/products/ignite-ui-angular/angular/components/general-getting-started) packages
 
@@ -125,7 +125,7 @@ Wait until the build is completed and then open [http://localhost:4200](http://l
 
 - rename class to the name of .tsx file
 
-- type `npm install --legacy-peer-deps` command in terminal window
+- type `npm install` command in terminal window
 
 - type `npm run start` command in terminal window
 
@@ -183,6 +183,6 @@ NOTE Do NOT find replace version of packages in package.json files.
 - open terminal window
 - run `cd browser` command
 - run the `gulp updateIG` command
-- run `npm install --legacy-peer-deps` command
+- run `npm install` command
 - create AND merge a pull request with changes in all package.json files in this repository
-- create 2nd pull request with similar changes in `/editor-templates/angular/main-template/package.json` of the [igniteui-xplat-examples](https://github.com/IgniteUI/igniteui-xplat-examples) repository.
+- create 2nd pull request with similar changes in `/editor-templates/angular/main-template/package.json` of the [igniteui-xplat-examples](https://github.com/IgniteUI/igniteui-xplat-examples) repository.

azure-pipelines/build-pipeline.yml

@@ -2,7 +2,6 @@ trigger:
   branches:
     include:
     - 'vnext'
-    - 'btraykov-azure-pipeline'
     - 'master'
 
 # This pipeline is meant to run on changes pushed to the vnext branch only.
@@ -16,6 +15,10 @@ parameters:
   displayName: 'Get verbose output from steps - where configurable'
   type: boolean
   default: false
+- name: shouldCleanPostExectuion
+  displayName: 'Clean all pipeline dirs after the pipeline finishes?'
+  type: boolean
+  default: true
 
 pool:
   name: BuildAgentOnPrem
@@ -41,7 +44,7 @@ jobs:
     inputs:
       command: 'custom'
       workingDir: '$(Build.SourcesDirectory)\browser'
-      customCommand: 'install --legacy-peer-deps'
+      customCommand: 'install'
 
   - task: PowerShell@2
     displayName: 'Apply very special configuration'
@@ -76,3 +79,6 @@ jobs:
 
     # TODO Once the project can adhere to the IG Angular schematic, 
     #  use it or use npx to call igniteui-cli to apply the Angular schematic (trial -> licensed)
+
+  - ${{ if eq(parameters.shouldCleanPostExectuion, true) }}:
+    - task: PostBuildCleanup@4

browser/.browserslistrc

@@ -5,9 +5,7 @@
 # You can see what browsers were selected by your queries by running:
 #   npx browserslist
 
-Firefox ESR
-not > 0.5%
-not last 2 versions
-not dead
-not IE 9-11
-Safari >=15
+last 2 Chrome versions
+last 2 Firefox versions
+last 2 Edge versions
+Safari >= 16

browser/gulpfile.js

@@ -44,6 +44,7 @@ gulp.task('updateBrowser', gulp.series(
 // NOTE you can call each function in terminal: "gulp findSamples"
 gulp.task('findSamples', browser.findSamples);
 gulp.task('copySamples', gulp.series(browser.findSamples, browser.copySamples));
+gulp.task('gitAcceptCurrent', browser.gitAcceptCurrent);
 
 gulp.task('generateSampleRouting', browser.generateSampleRouting);
 gulp.task('updateCodeViewer', gulp.series(browser.findSamples, browser.updateCodeViewer));

browser/package.json

@@ -36,25 +36,25 @@
     "@types/file-saver": "2.0.5",
     "@types/hammerjs": "2.0.40",
     "ajv": "8.6.2",
-    "angular-in-memory-web-api": "0.9.0",
+    "angular-in-memory-web-api": "0.20.0",
     "classlist.js": "1.1.20150312",
     "core-js": "3.21.0",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-     "igniteui-angular": "20.0.0-rc.0",
-    "igniteui-angular-charts": "20.0.0",
-    "igniteui-angular-core": "20.0.0",
-    "igniteui-angular-dashboards": "20.0.0",
-    "igniteui-angular-data-grids": "20.0.0",
-    "igniteui-angular-excel": "20.0.0",
-    "igniteui-angular-gauges": "20.0.0",
-    "igniteui-angular-inputs": "20.0.0",
-    "igniteui-angular-layouts": "20.0.0",
-    "igniteui-angular-maps": "20.0.0",
-    "igniteui-angular-spreadsheet": "20.0.0",
-    "igniteui-angular-spreadsheet-chart-adapter": "20.0.0",
-    "igniteui-theming": "18.1.0",
-    "igniteui-webcomponents": "6.0.0",
+    "igniteui-angular": "20.1.0-rc.2",
+    "igniteui-angular-charts": "20.2.0-beta.0",
+    "igniteui-angular-core": "20.2.0-beta.0",
+    "igniteui-angular-dashboards": "20.2.0-beta.0",
+    "igniteui-angular-data-grids": "20.2.0-beta.0",
+    "igniteui-angular-excel": "20.2.0-beta.0",
+    "igniteui-angular-gauges": "20.2.0-beta.0",
+    "igniteui-angular-inputs": "20.2.0-beta.0",
+    "igniteui-angular-layouts": "20.2.0-beta.0",
+    "igniteui-angular-maps": "20.2.0-beta.0",
+    "igniteui-angular-spreadsheet": "20.2.0-beta.0",
+    "igniteui-angular-spreadsheet-chart-adapter": "20.2.0-beta.0",
+    "igniteui-theming": "20.0.0",
+    "igniteui-webcomponents": "6.3.1",
     "immediate": "3.2.3",
     "intl": "1.2.5",
     "jszip": "3.8.0",

browser/scripts/browser.js

@@ -1093,6 +1093,79 @@ function sortByKeys(dependencies)
     }
     return sorted;
 }
+
+function gitAcceptCurrent(cb) {
+
+     var packagePaths = [
+        // './package.json', // browser
+        '../samples/**/package.json',
+        // '../samples/charts/category-chart/column-chart-multiple-sources/package.json',
+        // '../samples/charts/**/package.json',
+        // '../samples/gauges/**/package.json',
+
+        // skip packages in node_modules folders
+        '!../samples/**/node_modules/**/package.json',
+        '!../samples/**/node_modules/**',
+        '!../samples/**/node_modules',
+    ];
+
+    let updatedPackages = 0;
+    // gulp all package.json files in samples/browser
+    gulp.src(packagePaths, {allowEmpty: true})
+    .pipe(es.map(function(file, fileCallback) {
+        // let filePath = file.dirname + "/" + file.basename;
+
+        var filePath = file.dirname + "\\" + file.basename
+
+        var fileContent = file.contents.toString();
+        var fileLines = fileContent.split('\n');
+
+        var fileChanged = false;
+
+        var gitCurrentTag = "<<<<<<< HEAD\r\n";
+        var gitIncomingTag = ">>>>>>> master\r\n";
+
+        var gitCurrentStart = fileContent.indexOf(gitCurrentTag);
+        var gitCurrentEnd = fileContent.indexOf("=======");
+        var gitIncomingStart = fileContent.indexOf("=======");
+        var gitIncomingEnd = fileContent.indexOf(gitIncomingTag);
+
+        if (gitCurrentStart > 0 && gitIncomingStart > 0 && gitIncomingEnd){
+            // var current = fileContent.substring(gitCurrentStart, gitCurrentEnd);
+            var incoming = fileContent.substring(gitIncomingStart, gitIncomingEnd);
+            // console.log("current");
+            // console.log(current);
+            // console.log("incoming");
+            // console.log(incoming);
+            fileContent = fileContent.replace(incoming, "");        
+            fileContent = fileContent.replace(gitCurrentTag, "");
+            fileContent = fileContent.replace(gitIncomingTag, "");
+
+                // console.log("fileContent");
+                // console.log(fileContent); 
+            fs.writeFileSync(filePath, fileContent);
+
+            console.log("changed " + filePath);
+        } 
+        else {
+
+        }
+
+        // if (fileChanged) {
+        //     updatedPackages++;
+        //     // fs.writeFileSync(filePath, newContent);
+        //     console.log("updated: " + filePath);
+        // }
+        fileCallback(null, file);
+    }))
+    .on("end", function() {
+        console.log("git updated: " + updatedPackages + " package files");
+        cb();
+    });
+
+} exports.gitAcceptCurrent = gitAcceptCurrent;
+
+
 function updateIG(cb) {
 
     // cleanup packages to speedup this gulp script
@@ -1106,22 +1179,22 @@ function updateIG(cb) {
     // { version: "14.1.0",  name:               "igniteui-angular-charts" },  // NPM
     let packageUpgrades = [
         // these IG packages are often updated:
-        { version: "20.0.0", name: "igniteui-angular-core" },
-        { version: "20.0.0", name: "igniteui-angular-charts" },
-        { version: "20.0.0", name: "igniteui-angular-excel" },
-        { version: "20.0.0", name: "igniteui-angular-gauges" },
-        { version: "20.0.0", name: "igniteui-angular-data-grids" },
-        { version: "20.0.0", name: "igniteui-angular-inputs" },
-        { version: "20.0.0", name: "igniteui-angular-layouts" },
-        { version: "20.0.0", name: "igniteui-angular-maps" },
-        { version: "20.0.0", name: "igniteui-angular-spreadsheet-chart-adapter"  },
-        { version: "20.0.0", name: "igniteui-angular-spreadsheet" },
-        { version: "20.0.0", name: "igniteui-angular-datasources" },
-        { version: "20.0.0", name: "igniteui-angular-dashboards" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-core" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-charts" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-excel" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-gauges" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-data-grids" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-inputs" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-layouts" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-maps" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-spreadsheet-chart-adapter"  },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-spreadsheet" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-datasources" },
+        { version: "20.2.0-beta.0", name: "igniteui-angular-dashboards" },
         // these IG packages are sometimes updated:
-        { version: "6.0.0" , name: "igniteui-webcomponents" },
-        { version: "18.1.0", name: "igniteui-theming" },
-        { version: "20.0.0-rc.0", name: "igniteui-angular" },
+        { version: "6.3.1" , name: "igniteui-webcomponents" },
+        { version: "20.0.0", name: "igniteui-theming" },
+        { version: "20.1.0-rc.2", name: "igniteui-angular" },
         { version: "20.0.1", name: "@angular/animations" },
         { version: "20.0.1", name: "@angular/common" },
         { version: "20.0.1", name: "@angular/compiler" },