[RELEASE] merging improvements to production

.gitignore

@@ -10,6 +10,13 @@
 # /samples-tmp/
 # /samples-tmp/**/node_modules/
 
+/tests/**/build/
+/tests/**/dist/
+/tests/**/node_modules/
+/tests/**/package-lock.json
+/tests/**/.angular
+/tests/**/.git
+
 # browser auto-generated files:
 # /porting/**
 # /browser/**

azure-pipelines/build-pipeline.yml

@@ -39,9 +39,9 @@ jobs:
   - task: Npm@1
     displayName: 'npm install'
     inputs:
-      command: 'install'
+      command: 'custom'
       workingDir: '$(Build.SourcesDirectory)\browser'
-      verbose: ${{ parameters.isVerbose }}
+      customCommand: 'install --legacy-peer-deps'
 
   - task: PowerShell@2
     displayName: 'Apply very special configuration'

browser/gulpfile.js

@@ -47,7 +47,9 @@ gulp.task('copySamples', gulp.series(browser.findSamples, browser.copySamples));
 
 gulp.task('generateSampleRouting', browser.generateSampleRouting);
 gulp.task('updateCodeViewer', gulp.series(browser.findSamples, browser.updateCodeViewer));
+gulp.task('updateCodeSandbox', browser.updateCodeSandbox);
 gulp.task('listSamples', browser.listSamples);
+gulp.task('moveAppFiles', browser.moveAppFiles);
 
 gulp.task("overwrite-package-json", (done) => {
     const packagesPaths = [

browser/package.json

@@ -38,18 +38,18 @@
     "core-js": "3.21.0",
     "file-saver": "2.0.5",
     "hammerjs": "2.0.8",
-    "igniteui-angular": "17.0.0",
-    "igniteui-angular-charts": "17.3.0-beta.0",
-    "igniteui-angular-core": "17.3.0-beta.0",
-    "igniteui-angular-excel": "17.3.0-beta.0",
-    "igniteui-angular-gauges": "17.3.0-beta.0",
-    "igniteui-angular-inputs": "17.3.0-beta.0",
-    "igniteui-angular-layouts": "17.3.0-beta.0",
-    "igniteui-angular-maps": "17.3.0-beta.0",
-    "igniteui-angular-spreadsheet": "17.3.0-beta.0",
-    "igniteui-angular-spreadsheet-chart-adapter": "17.3.0-beta.0",
-    "igniteui-theming": "3.3.1",
-    "igniteui-webcomponents": "4.7.0",
+    "igniteui-angular": "17.2.3",
+    "igniteui-angular-charts": "17.3.1-alpha.0",
+    "igniteui-angular-core": "17.3.1-alpha.0",
+    "igniteui-angular-excel": "17.3.1-alpha.0",
+    "igniteui-angular-gauges": "17.3.1-alpha.0",
+    "igniteui-angular-inputs": "17.3.1-alpha.0",
+    "igniteui-angular-layouts": "17.3.1-alpha.0",
+    "igniteui-angular-maps": "17.3.1-alpha.0",
+    "igniteui-angular-spreadsheet": "17.3.1-alpha.0",
+    "igniteui-angular-spreadsheet-chart-adapter": "17.3.1-alpha.0",
+    "igniteui-theming": "6.4.0-beta.2",
+    "igniteui-webcomponents": "4.9.0",
     "immediate": "3.2.3",
     "intl": "1.2.5",
     "jszip": "3.8.0",

browser/scripts/browser.js

@@ -725,6 +725,7 @@ function copySamples(cb) {
         for (let i = appIndexRoutingImportStart+1; i < appIndexRoutingImportEnd; i++) {
             appIndexLines[i] = ""; // clearing previously auto-generated inserts
         }
+        routingDataImports = routingDataImports.sort();
         // adding latest auto-generated inserts for JS files
         appIndexLines[appIndexRoutingImportStart + 1] = routingDataImports.join('\r\n');
         appIndexChanged = true;
@@ -734,6 +735,7 @@ function copySamples(cb) {
         for (let i = appIndexRoutingArrayStart+1; i < appIndexRoutingArrayEnd; i++) {
             appIndexLines[i] = ""; // clearing previously auto-generated inserts
         }
+        routingDataArray = routingDataArray.sort();
         // adding latest auto-generated inserts for JS files
         appIndexLines[appIndexRoutingArrayStart + 1] = routingDataArray.join(',\r\n');
         appIndexChanged = true;
@@ -1071,20 +1073,20 @@ function updateIG(cb) {
     // { name:               "igniteui-angular-charts", version: "14.1.0" },  // NPM
     let packageUpgrades = [
         // these IG packages are often updated:
-        { name: "igniteui-angular-core"                     , version: "17.3.0-beta.0" },
-        { name: "igniteui-angular-charts"                   , version: "17.3.0-beta.0" },
-        { name: "igniteui-angular-excel"                    , version: "17.3.0-beta.0" },
-        { name: "igniteui-angular-gauges"                   , version: "17.3.0-beta.0" },
-        { name: "igniteui-angular-inputs"                   , version: "17.3.0-beta.0" },
-        { name: "igniteui-angular-layouts"                  , version: "17.3.0-beta.0" },
-        { name: "igniteui-angular-maps"                     , version: "17.3.0-beta.0" },
-        { name: "igniteui-angular-spreadsheet-chart-adapter", version: "17.3.0-beta.0" },
-        { name: "igniteui-angular-spreadsheet"              , version: "17.3.0-beta.0" },
-        { name: "igniteui-angular-datasources"              , version: "17.3.0-beta.0" },
+        { name: "igniteui-angular-core"                     , version: "17.3.1-alpha.0" },
+        { name: "igniteui-angular-charts"                   , version: "17.3.1-alpha.0" },
+        { name: "igniteui-angular-excel"                    , version: "17.3.1-alpha.0" },
+        { name: "igniteui-angular-gauges"                   , version: "17.3.1-alpha.0" },
+        { name: "igniteui-angular-inputs"                   , version: "17.3.1-alpha.0" },
+        { name: "igniteui-angular-layouts"                  , version: "17.3.1-alpha.0" },
+        { name: "igniteui-angular-maps"                     , version: "17.3.1-alpha.0" },
+        { name: "igniteui-angular-spreadsheet-chart-adapter", version: "17.3.1-alpha.0" },
+        { name: "igniteui-angular-spreadsheet"              , version: "17.3.1-alpha.0" },
+        { name: "igniteui-angular-datasources"              , version: "17.3.1-alpha.0" },
         // these IG packages are sometimes updated:
-        { name: "igniteui-webcomponents",            version: "4.7.0" },
-        { name: "igniteui-theming",                  version: "3.3.1" },
-        { name: "igniteui-angular",                  version: "17.0.0" },
+        { name: "igniteui-webcomponents",            version: "4.9.0" },
+        { name: "igniteui-theming",                  version: "6.4.0-beta.2" },
+        { name: "igniteui-angular",                  version: "17.2.3" },
         { name: "@angular/animations",               version: "17.0.0" },
         { name: "@angular/common",                   version: "17.0.0" },
         { name: "@angular/compiler",                 version: "17.0.0" },
@@ -1298,3 +1300,113 @@ function logVersionIgniteUI(cb) {
 } exports.logVersionIgniteUI = logVersionIgniteUI;
 
 
+// move samples files up one level, e.g. /scr/app/*.* to /scr/*.* 
+exports.moveAppFiles = function moveAppFiles(cb) {
+    var appFolders = [];
+
+    gulp.src(
+        "../samples/**/src/app/*.*", 
+        "../samples/**/type-scatter-symbol-series/src/app/*.*", 
+    {allowEmpty: true})
+    .pipe(es.map(function(file, fileCallback) {
+
+        var fileContent = file.contents.toString();
+        let fileOutput = file.dirname.replace("\\app", "") + "\\" + file.basename; 
+
+        if (appFolders.indexOf(file.dirname) < 0) {
+            appFolders.push(file.dirname);
+        }
+        // console.log("" + fileOutput);
+
+        fs.writeFileSync(fileOutput, fileContent);
+         fileCallback(null, file);
+    }))
+    .on("end", function() {
+
+        console.log(appFolders);
+        console.log("moved " + appFolders.length + " samples from /scr/app/*.* to /scr/*.* ");
+        del(appFolders, {force: true});
+
+        for (let i = 0; i < appFolders.length; i++) {
+
+            var mainPath = appFolders[i].replace("\\app", "") + "\\main.ts";
+            let mainFile = fs.readFileSync(mainPath).toString();
+            mainFile = mainFile.replace("/app/", "/");
+            fs.writeFileSync(mainPath, mainFile);
+         }
+        cb();
+    });
+
+} 
+
+exports.updateCodeSandbox = function updateCodeSandbox(cb) {
+    var appFolders = [];
+    var copyFiles = [
+        "../tests/donut-ava4/.stackblitzrc",
+        "../tests/donut-ava4/.codesandbox/tasks.json",
+        "../tests/donut-ava4/.codesandbox/Dockerfile",
+        "../tests/donut-ava4/tsconfig.app.json",
+        "../tests/donut-ava4/tsconfig.json",
+        "../tests/donut-ava4/angular.json",
+    ];
+    var deleteFiles = [
+        "sandbox.config.json",
+        "src\\config",
+    ];
+
+    gulp.src( [
+        "../samples/**/package.json", 
+        // "../samples/**/display-osm-imagery/package.json",
+        // "../samples/**/doughnut-chart/overview/package.json", 
+        // "../samples/**/display-heat-imagery/package.json", 
+    ], {allowEmpty: true})
+    .pipe(es.map(function(file, fileCallback) {
+
+        var fileContent = file.contents.toString();
+        let fileOutput = file.dirname + "\\" + file.basename; 
+
+        console.log("updating " + fileOutput);
+        fileContent = fileContent.replace('"@angular/animations": "17.0.0"','"@angular/animations": "^17.2.1"');
+        fileContent = fileContent.replace('"@angular/common": "17.0.0"','"@angular/common": "^17.2.1"');
+        fileContent = fileContent.replace('"@angular/compiler": "17.0.0"','"@angular/compiler": "^17.2.1"');
+        fileContent = fileContent.replace('"@angular/core": "17.0.0"','"@angular/core": "^17.2.1"');
+        fileContent = fileContent.replace('"@angular/forms": "17.0.0"','"@angular/forms": "^17.2.1"');
+        fileContent = fileContent.replace('"@angular/platform-browser": "17.0.0"','"@angular/platform-browser": "^17.2.1"');
+        fileContent = fileContent.replace('"@angular/platform-browser-dynamic": "17.0.0"','"@angular/platform-browser-dynamic": "^17.2.1"');
+        fileContent = fileContent.replace('"rxjs": "6.6.7"','"rxjs": "^7.8.1"');
+        fileContent = fileContent.replace('"tslib": "2.3.1"','"tslib": "^2.6.1"');
+        fileContent = fileContent.replace('"zone.js": "~0.14.1"','"zone.js": "~0.14.4"');
+        fileContent = fileContent.replace('"@angular-devkit/build-angular": "17.0.0"','"@angular-devkit/build-angular": "17.2.0"');
+        fileContent = fileContent.replace('"@angular/cli": "17.0.0"','"@angular/cli": "17.2.0"');
+        fileContent = fileContent.replace('"@angular/compiler-cli": "17.0.0"','"@angular/compiler-cli": "17.2.1"');
+        fileContent = fileContent.replace('"@angular/language-service": "17.0.0"','"@angular/language-service": "17.2.1"');
+        fileContent = fileContent.replace('"@types/node": "14.14.28"','"@types/node": "18.17.0"');
+        fileContent = fileContent.replace('"jasmine-core": "3.7.1"','"jasmine-core": "5.1.1"');
+        fileContent = fileContent.replace('"ts-node": "9.1.1"','"ts-node": "10.9.1"');
+        fileContent = fileContent.replace('"typescript": "5.2.2"','"typescript": "5.3.3"');
+        fileContent = fileContent.replace('"hammerjs": "2.0.8"','"hammerjs": "^2.0.8"');
+
+        fs.writeFileSync(fileOutput, fileContent);
+
+        for (let i = 0; i < deleteFiles.length; i++) {
+            var deletePath = file.dirname + "\\" + deleteFiles[i];
+            console.log("delete " + deletePath); 
+            del([deletePath], {force: true});
+        }
+
+        for (let i = 0; i < copyFiles.length; i++) {
+            var outputPath = copyFiles[i].replace('../tests/donut-ava4/', file.dirname + "/");
+            // del([deletePath], {force: true});
+            console.log("copy " + outputPath);
+            let outputFile = fs.readFileSync(copyFiles[i]).toString();
+            // outputFile = outputFile.replace("/app/", "/");
+            makeDirectoryFor(outputPath);
+            fs.writeFileSync(outputPath, outputFile);
+        }
+         fileCallback(null, file);
+    }))
+    .on("end", function() {
+        cb();
+    });
+
+} 

browser/src/browser-info.json

@@ -1,14 +1,14 @@
 [
-{"ver":"17.0.0","name":"igniteui-angular"},
-{"ver":"17.3.0-beta.0","name":"igniteui-angular-charts"},
-{"ver":"17.3.0-beta.0","name":"igniteui-angular-core"},
-{"ver":"17.3.0-beta.0","name":"igniteui-angular-excel"},
-{"ver":"17.3.0-beta.0","name":"igniteui-angular-gauges"},
-{"ver":"17.3.0-beta.0","name":"igniteui-angular-inputs"},
-{"ver":"17.3.0-beta.0","name":"igniteui-angular-layouts"},
-{"ver":"17.3.0-beta.0","name":"igniteui-angular-maps"},
-{"ver":"17.3.0-beta.0","name":"igniteui-angular-spreadsheet"},
-{"ver":"17.3.0-beta.0","name":"igniteui-angular-spreadsheet-chart-adapter"},
-{"ver":"3.3.1","name":"igniteui-theming"},
-{"ver":"4.7.0","name":"igniteui-webcomponents"}
+{"ver":"17.2.3","name":"igniteui-angular"},
+{"ver":"17.3.1-alpha.0","name":"igniteui-angular-charts"},
+{"ver":"17.3.1-alpha.0","name":"igniteui-angular-core"},
+{"ver":"17.3.1-alpha.0","name":"igniteui-angular-excel"},
+{"ver":"17.3.1-alpha.0","name":"igniteui-angular-gauges"},
+{"ver":"17.3.1-alpha.0","name":"igniteui-angular-inputs"},
+{"ver":"17.3.1-alpha.0","name":"igniteui-angular-layouts"},
+{"ver":"17.3.1-alpha.0","name":"igniteui-angular-maps"},
+{"ver":"17.3.1-alpha.0","name":"igniteui-angular-spreadsheet"},
+{"ver":"17.3.1-alpha.0","name":"igniteui-angular-spreadsheet-chart-adapter"},
+{"ver":"6.4.0-beta.2","name":"igniteui-theming"},
+{"ver":"4.9.0","name":"igniteui-webcomponents"}
 ]

samples/charts/category-chart/annotations-all/.codesandbox/Dockerfile

@@ -0,0 +1 @@
+FROM node:18

samples/charts/category-chart/annotations-all/.codesandbox/tasks.json

@@ -0,0 +1,17 @@
+{
+  // These tasks will run in order when initializing your CodeSandbox project.
+  "setupTasks": [
+    {
+      "name": "Install Dependencies",
+      "command": "yarn install"
+    }
+  ],
+    // These tasks can be run from CodeSandbox. Running one will open a log in the app.
+    "tasks": {
+        "node node_modules/@angular/cli/bin/ng serve -o --disable-host-check": {
+            "name": "Start Project",
+            "command": "node node_modules/@angular/cli/bin/ng serve -o --disable-host-check",
+            "runAtStart": true
+        }
+    }
+}

samples/charts/category-chart/annotations-all/.stackblitzrc

@@ -1 +1 @@
-{"installDependencies":true,"startCommand":"turbo start","env":{"ENABLE_CJS_IMPORTS":true}}
+{"installDependencies":true, "startCommand":"npm start"}