Merge branch 'master' into nalipiev/update-yarn

Lipata · Lipata · commit 4e682a27c90f · 2025-11-20T11:41:28.000+02:00
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,6 +23,9 @@ on:
 jobs:
   analyze:
     name: Analyze
+    permissions:
+      contents: read
+      security-events: write
     runs-on: ubuntu-latest
 
     strategy:
diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml
@@ -1,4 +1,7 @@
 name: Node.js CI
+permissions:
+  contents: read
+  checks: write
 
 on:
   push:
@@ -35,6 +38,7 @@ jobs:
         run: yarn coverage
       - name: Publish to coveralls.io
         if: matrix.node-version == '20.x'
-        uses: coverallsapp/github-action@v2.3.4
+        # coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 corresponds to v2.3.4
+        uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8
         with:
             github-token: ${{ github.token }}
diff --git a/.github/workflows/npm-publish.yml b/.github/workflows/npm-publish.yml
@@ -3,6 +3,9 @@ on:
   release:
     types: [created]
 
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,35 @@
+# [14.7.0](https://github.com/IgniteUI/igniteui-cli/compare/v14.6.6...v14.7.0) (2025-11-17)
+## What's Changed
+
+* feat(ng): use ng lint schematic by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1439
+* chore(ng): add overrides to remove npm i warnings by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1440
+* chore: address dependabot security alerts by @Copilot in https://github.com/IgniteUI/igniteui-cli/pull/1437
+* fix: command injection vulnerabilities in PackageManager and start command by @Copilot in https://github.com/IgniteUI/igniteui-cli/pull/1438
+* Fix code scanning alert: Potential file system race conditions by @Hristo313 in https://github.com/IgniteUI/igniteui-cli/pull/1446
+* Potential fix for code scanning alert: Workflow does not contain permissions by @Hristo313 in https://github.com/IgniteUI/igniteui-cli/pull/1445
+* build(deps): bump eazy-logger from 4.0.1 to 4.1.0 in the npm_and_yarn group across 1 directory by @dependabot[bot] in https://github.com/IgniteUI/igniteui-cli/pull/1436
+* merge 14.6.x into master by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1451
+
+**Full Changelog**: https://github.com/IgniteUI/igniteui-cli/compare/v14.6.6...v14.7.0
+
+# [14.6.6](https://github.com/IgniteUI/igniteui-cli/compare/v14.6.5...v14.6.6) (2025-11-12)
+
+## What's Changed
+* Update github pages workflow step by @Hristo313 in https://github.com/IgniteUI/igniteui-cli/pull/1452
+* Update react test setup configuration by @Hristo313 in https://github.com/IgniteUI/igniteui-cli/pull/1453
+
+**Full Changelog**: https://github.com/IgniteUI/igniteui-cli/compare/v14.6.5...v14.6.6
+
+# [14.6.5](https://github.com/IgniteUI/igniteui-cli/compare/v14.6.4...v14.6.5) (2025-11-10)
+
+## What's Changed
+
+* ci(react): install Playwright in the YAML file by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1450
+* build(deps): bump eazy-logger from 4.0.1 to 4.1.0 in the npm_and_yarn group across 1 directory by @dependabot[bot] in https://github.com/IgniteUI/igniteui-cli/pull/1436
+
+
+**Full Changelog**: https://github.com/IgniteUI/igniteui-cli/compare/v14.6.4...v14.6.5
+
 # [14.6.4](https://github.com/IgniteUI/igniteui-cli/compare/v14.6.3...v14.6.4) (2025-10-14)
 
 ## What's Changed
diff --git a/package.json b/package.json
@@ -55,6 +55,9 @@
 		"cache": false,
 		"all": true
 	},
+	"resolutions": {
+		"js-yaml": "^4.1.0"
+	},
 	"dependencies": {
 		"handlebars": "4.7.8"
 	},
diff --git a/packages/cli/lib/templates/ReactTemplate.ts b/packages/cli/lib/templates/ReactTemplate.ts
@@ -109,8 +109,9 @@ export class ReactTemplate implements Template {
 		const components = require("@igniteui/cli-core/packages/components");
 		const igResPath = path.join(projectPath, this.igniteResources);
 
-		if (fs.existsSync(igResPath)) {
-			let igniteuiResFile = fs.readFileSync(igResPath, "utf8");
+		try {
+			const fd = fs.openSync(igResPath, fs.constants.O_RDWR | fs.constants.O_CREAT);
+			let igniteuiResFile = fs.readFileSync(fd, "utf8");
 			const freeVersionPath = "ignite-ui/";
 			const fullVersionPath = "@infragistics/ignite-ui-full/en/";
 			const dvPath = "@infragistics/ignite-ui-full/en/js/infragistics.dv.js";
@@ -123,16 +124,19 @@ export class ReactTemplate implements Template {
 					igniteuiResFile = igniteuiResFile.replace(freeVersionPath, fullVersionPath);
 					igniteuiResFile = igniteuiResFile.replace("-lite", "");
 				}
-				fs.writeFileSync(igResPath, igniteuiResFile);
+				fs.ftruncateSync(fd, 0);
+				fs.writeSync(fd, igniteuiResFile, 0);
 			}
 
 			if (dvDep && !igniteuiResFile.includes(dvPath)) {
-				fs.appendFileSync(igResPath, `${'\r\n// Ignite UI Charts Required JavaScript File\r\nimport "'
-					+ dvPath + '";\r\n'}`);
+				const endPos = fs.fstatSync(fd).size;
+				fs.writeSync(fd, `\r\n// Ignite UI Charts Required JavaScript File\r\nimport "${dvPath}";\r\n`, endPos);
 			}
 
-		} else {
-			Util.log(`igniteuiResources.js file NOT found!`);
+			fs.closeSync(fd);
+		} catch (err) {
+			Util.error(`Error while updating igniteuiResources.js: ${err.message}`);
+			throw err;
 		}
 	}
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "igniteui-cli",
-  "version": "14.6.5-beta.0",
+  "version": "14.7.0",
   "description": "CLI tool for creating Ignite UI projects",
   "keywords": [
     "CLI",
@@ -76,8 +76,8 @@
     "all": true
   },
   "dependencies": {
-    "@igniteui/angular-templates": "~20.1.1465-beta.0",
-    "@igniteui/cli-core": "~14.6.5-beta.0",
+    "@igniteui/angular-templates": "~20.1.1470",
+    "@igniteui/cli-core": "~14.7.0",
     "@inquirer/prompts": "^7.9.0",
     "@types/yargs": "^17.0.33",
     "chalk": "^5.3.0",
diff --git a/packages/cli/templates/angular/ig-ts/projects/empty/files/package.json b/packages/cli/templates/angular/ig-ts/projects/empty/files/package.json
@@ -18,10 +18,10 @@
     "@angular/platform-browser": "~20.0.0",
     "@angular/platform-browser-dynamic": "~20.0.0",
     "@angular/router": "~20.0.0",
-    "jquery": ">=1.9.1",
-    "jquery-ui": ">=1.10.5",
-    "igniteui-angular-wrappers": "~20.0.0",
-    "ignite-ui": "~22.2",
+    "jquery": "^3.7.1",
+    "jquery-ui": "^1.13.3",
+    "igniteui-angular-wrappers": "~19.0.0",
+    "ignite-ui": "~23.1",
     "rxjs": "~7.8.0",
     "tslib": "^2.3.0",
     "zone.js": "~0.15.0"
diff --git a/packages/cli/templates/jquery/js/projects/empty/files/package.json b/packages/cli/templates/jquery/js/projects/empty/files/package.json
@@ -5,9 +5,9 @@
     "test": "karma start"
   },
   "dependencies": {
-    "jquery": ">=1.9.1",
-    "jquery-ui": ">=1.10.5",
-    "ignite-ui": "~21.2"
+    "jquery": "^3.7.1",
+    "jquery-ui": "^1.13.3",
+    "ignite-ui": "~23.1"
   },
   "devDependencies": {
     "browser-sync": "^3.0.3",
diff --git a/packages/cli/templates/react/es6/projects/empty/files/package.json b/packages/cli/templates/react/es6/projects/empty/files/package.json
@@ -3,10 +3,10 @@
   "version": "0.0.0",
   "private": true,
   "dependencies": {
-    "ignite-ui": "21.1.13",
+    "ignite-ui": "~23.1",
     "igniteui-react": "~19.2.0",
-    "jquery": "^3.6.0",
-    "jquery-ui": "^1.12.1",
+    "jquery": "^3.7.1",
+    "jquery-ui": "^1.13.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "^4.3.1",
diff --git a/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__azure/azure-pipelines.yml b/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__azure/azure-pipelines.yml
@@ -19,5 +19,9 @@ steps:
     continueOnError: true
   - script: npm run build
     displayName: 'Build the project'
+  - script: npx playwright install chromium-headless-shell
+    displayName: 'Install Playwright browsers'
   - script: npm run test
     displayName: 'Run tests'
+    env:
+      CI: 'true'
diff --git a/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github-pages.yml b/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
@@ -39,7 +39,7 @@ jobs:
         find ./dist/assets -type f -name "*.js" -exec sed -i 's|src/assets|${{ github.event.repository.name }}/assets|g' {} +;
         find ./dist/assets -type f -name "*.js" -exec sed -i 's|/static-data/|/${{ github.event.repository.name }}/static-data/|g' {} +
     - name: Copy Resources to dist
-      run: mkdir -p ./dist/assets && cp -R ./src/assets/* ./dist/assets/
+      run: if [ -d "./src/assets" ]; then mkdir -p ./dist/assets && cp -R ./src/assets/* ./dist/assets/; fi
     - name: SPA routing handling
       run: cp ./dist/index.html ./dist/404.html
     - name: Upload build artifact to GitHub Pages
diff --git a/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/node.js.yml b/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/node.js.yml
@@ -29,5 +29,8 @@ jobs:
     - run: npm i # replace with 'npm ci' after committing lock file from first install
 #    - run: npm run lint
     - run: npm run build
+    - name: Install Playwright browsers
+      run: npx playwright install chromium-headless-shell
     - run: npm run test
-
+      env:
+        CI: 'true'
diff --git a/packages/cli/templates/react/igr-ts/projects/_base/files/src/setupTests.ts b/packages/cli/templates/react/igr-ts/projects/_base/files/src/setupTests.ts
@@ -1,11 +1,9 @@
-import '@testing-library/jest-dom'
-import 'vitest-canvas-mock'
 import ResizeObserver from 'resize-observer-polyfill'
 import {vi} from 'vitest'
 
-global.ResizeObserver = ResizeObserver;
+globalThis.ResizeObserver = ResizeObserver;
 
 HTMLElement.prototype.scrollIntoView = vi.fn();
 HTMLElement.prototype.hidePopover = vi.fn();
 HTMLElement.prototype.showPopover = vi.fn();
-HTMLElement.prototype.togglePopover = vi.fn();
+HTMLElement.prototype.togglePopover = vi.fn();
diff --git a/packages/cli/templates/react/igr-ts/projects/_base/files/vite.config.ts b/packages/cli/templates/react/igr-ts/projects/_base/files/vite.config.ts
@@ -18,6 +18,7 @@ export default defineConfig({
         },
       ],
     },
+    setupFiles: ['./src/setupTests.ts']
   },
   resolve: {
     mainFields: ['module'],
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/cli-core",
-  "version": "14.6.5-beta.0",
+  "version": "14.7.0",
   "description": "Base types and functionality for Ignite UI CLI",
   "repository": {
     "type": "git",
diff --git a/packages/core/util/GoogleAnalytics.ts b/packages/core/util/GoogleAnalytics.ts
@@ -69,16 +69,16 @@ class GoogleAnalytics {
 	protected static getUUID(): string {
 		const absolutePath = path.join(this.userDataFolder, this.appFolder, this.userSettings);
 		let UUID = "";
-		if (fs.existsSync(absolutePath)) {
-			UUID = require(absolutePath).UUID;
-		} else {
-			const dirName = path.dirname(absolutePath);
-			if (!fs.existsSync(dirName)) {
-				fs.mkdirSync(dirName);
-			}
+		const dirName = path.dirname(absolutePath);
+		fs.mkdirSync(dirName, { recursive: true });
 
+		try {
+			const fd = fs.openSync(absolutePath, fs.constants.O_CREAT | fs.constants.O_EXCL | fs.constants.O_RDWR, 0o600);
 			UUID = this.getUserID();
-			fs.writeFileSync(absolutePath, JSON.stringify({ UUID }));
+			fs.writeFileSync(fd, JSON.stringify({ UUID }));
+			fs.closeSync(fd);
+		} catch {
+			UUID = JSON.parse(fs.readFileSync(absolutePath, "utf8")).UUID;
 		}
 
 		return UUID;
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json b/packages/igx-templates/igx-ts-legacy/projects/_base/files/package.json
@@ -29,7 +29,8 @@
   "overrides": {
     "reveal-sdk-wrappers-angular": {
       "@angular/core": "^20.3.0",
-      "@angular/common": "^20.3.0"
+      "@angular/common": "^20.3.0",
+      "rxjs": "~7.8.1"
     },
     "rxjs": "~7.8.1"
   },
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/package.json b/packages/igx-templates/igx-ts/projects/_base/files/package.json
@@ -29,7 +29,8 @@
   "overrides": {
     "reveal-sdk-wrappers-angular": {
       "@angular/core": "^20.3.0",
-      "@angular/common": "^20.3.0"
+      "@angular/common": "^20.3.0",
+      "rxjs": "~7.8.1"
     },
     "glob": "^11.0.3",
     "rimraf": "^6.0.1"
diff --git a/packages/igx-templates/package.json b/packages/igx-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-templates",
-  "version": "20.1.1465-beta.0",
+  "version": "20.1.1470",
   "description": "Templates for Ignite UI for Angular projects and components",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   "author": "Infragistics",
   "license": "MIT",
   "dependencies": {
-    "@igniteui/cli-core": "~14.6.5-beta.0",
+    "@igniteui/cli-core": "~14.7.0",
     "typescript": "~5.5.4"
   }
 }
diff --git a/packages/ng-schematics/package.json b/packages/ng-schematics/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@igniteui/angular-schematics",
-  "version": "20.1.1465-beta.0",
+  "version": "20.1.1470",
   "description": "Ignite UI for Angular Schematics for ng new and ng generate",
   "repository": {
     "type": "git",
@@ -20,8 +20,8 @@
   "dependencies": {
     "@angular-devkit/core": "^19.0.0",
     "@angular-devkit/schematics": "^19.0.0",
-    "@igniteui/angular-templates": "~20.1.1465-beta.0",
-    "@igniteui/cli-core": "~14.6.5-beta.0",
+    "@igniteui/angular-templates": "~20.1.1470",
+    "@igniteui/cli-core": "~14.7.0",
     "@schematics/angular": "~19.0.0",
     "minimatch": "^10.0.1",
     "rxjs": "^7.8.1"
diff --git a/yarn.lock b/yarn.lock
