Skip to content

Commit 4337e43

Browse files
Hristo HristovHristo Hristov
authored andcommitted
feat(wc): resolve conflicts
2 parents a72fb14 + e655e56 commit 4337e43

File tree

92 files changed

+1316
-1042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+1316
-1042
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# [14.3.7](https://github.com/IgniteUI/igniteui-cli/compare/v14.3.6...v14.3.7) (2025-01-22)
2+
3+
## What's Changed
4+
* Upgrade github pages deploy and artifact versions by @Hristo313 in https://github.com/IgniteUI/igniteui-cli/pull/1366
5+
* chore: update dv packages with v19; standalone false for legacy components by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1365
6+
7+
8+
**Full Changelog**: https://github.com/IgniteUI/igniteui-cli/compare/v14.3.6...14.3.7
9+
110
# [14.3.6](https://github.com/IgniteUI/igniteui-cli/compare/v14.3.5...v14.3.6) (2024-12-12)
211

312
## What's Changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
"@types/jasmine": "^5.1.4",
6464
"@types/minimatch": "^5.1.2",
6565
"@types/node": "^22.5.5",
66-
"@typescript-eslint/eslint-plugin": "^7.5.0",
67-
"@typescript-eslint/parser": "^7.5.0",
66+
"@typescript-eslint/eslint-plugin": "^8.21.0",
67+
"@typescript-eslint/parser": "^8.21.0",
6868
"coveralls-next": "^4.2.1",
6969
"browser-sync": "^3.0.3",
7070
"eslint": "^8.57.0",

packages/cli/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "igniteui-cli",
3-
"version": "14.3.6",
3+
"version": "14.3.7",
44
"description": "CLI tool for creating Ignite UI projects",
55
"keywords": [
66
"CLI",
@@ -76,8 +76,8 @@
7676
"all": true
7777
},
7878
"dependencies": {
79-
"@igniteui/angular-templates": "~19.0.1436",
80-
"@igniteui/cli-core": "~14.3.6",
79+
"@igniteui/angular-templates": "~19.0.1437",
80+
"@igniteui/cli-core": "~14.3.7",
8181
"@inquirer/prompts": "^5.4.0",
8282
"@types/yargs": "^17.0.33",
8383
"chalk": "^5.3.0",

packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github-pages.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
permissions:
1414
pages: write
1515
id-token: write
16+
actions: read
1617

1718
environment:
1819
name: github-pages
@@ -40,8 +41,8 @@ jobs:
4041
- name: SPA routing handling
4142
run: cp ./dist/index.html ./dist/404.html
4243
- name: Upload build artifact to GitHub Pages
43-
uses: actions/upload-pages-artifact@v1
44+
uses: actions/upload-pages-artifact@v3
4445
with:
4546
path: ./dist
4647
- name: Deploy to GitHub Pages
47-
uses: actions/deploy-pages@v1
48+
uses: actions/deploy-pages@v4

packages/cli/templates/react/igr-ts/projects/_base/files/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
"devDependencies": {
1919
"@types/react": "^18.2.15",
2020
"@types/react-dom": "^18.2.7",
21-
"@typescript-eslint/eslint-plugin": "^6.2.1",
22-
"@typescript-eslint/parser": "^6.2.1",
21+
"@typescript-eslint/eslint-plugin": "^8.21.0",
22+
"@typescript-eslint/parser": "^8.21.0",
2323
"@vitejs/plugin-react": "^4.0.3",
24-
"eslint": "^8.46.0",
24+
"eslint": "^8.57.0",
2525
"eslint-plugin-react-hooks": "^4.6.0",
2626
"eslint-plugin-react-refresh": "^0.4.3",
2727
"jsdom": "^22.1.0",

packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ jobs:
1313
permissions:
1414
pages: write
1515
id-token: write
16+
actions: read
1617

1718
environment:
1819
name: github-pages
@@ -47,8 +48,8 @@ jobs:
4748
- name: SPA routing handling
4849
run: cp ./dist/index.html ./dist/404.html
4950
- name: Upload build artifact to GitHub Pages
50-
uses: actions/upload-pages-artifact@v1
51+
uses: actions/upload-pages-artifact@v3
5152
with:
5253
path: ./dist
5354
- name: Deploy to GitHub Pages
54-
uses: actions/deploy-pages@v1
55+
uses: actions/deploy-pages@v4

packages/cli/templates/webcomponents/igc-ts/projects/_base/files/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
"devDependencies": {
2929
"@babel/preset-env": "^7.20.2",
3030
"@open-wc/testing": "^4.0.0",
31-
"@typescript-eslint/eslint-plugin": "^7.13.1",
32-
"@typescript-eslint/parser": "^7.13.1",
31+
"@typescript-eslint/eslint-plugin": "^8.21.0",
32+
"@typescript-eslint/parser": "^8.21.0",
3333
"@web/dev-server": "^0.4.6",
3434
"@web/test-runner": "^0.18.0",
3535
"babel-plugin-template-html-minifier": "^4.1.0",

packages/cli/templates/webcomponents/igc-ts/projects/_base_with_home/files/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
"devDependencies": {
3737
"@babel/preset-env": "^7.20.2",
3838
"@open-wc/testing": "^4.0.0",
39-
"@typescript-eslint/eslint-plugin": "^7.13.1",
40-
"@typescript-eslint/parser": "^7.13.1",
39+
"@typescript-eslint/eslint-plugin": "^8.21.0",
40+
"@typescript-eslint/parser": "^8.21.0",
4141
"@web/dev-server": "^0.4.6",
4242
"@web/test-runner": "^0.18.0",
4343
"babel-plugin-template-html-minifier": "^4.1.0",

packages/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@igniteui/cli-core",
3-
"version": "14.3.6",
3+
"version": "14.3.7",
44
"description": "Base types and functionality for Ignite UI CLI",
55
"repository": {
66
"type": "git",

packages/igx-templates/igx-ts-legacy/accordion/default/files/src/app/__path__/__filePrefix__.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import { Component } from '@angular/core';
33
@Component({
44
selector: 'app-<%=filePrefix%>',
55
templateUrl: './<%=filePrefix%>.component.html',
6-
styleUrls: ['./<%=filePrefix%>.component.scss']
6+
styleUrls: ['./<%=filePrefix%>.component.scss'],
7+
standalone: false
78
})
89
export class <%=ClassName%>Component {
910
public singleBranchExpand = false;

0 commit comments

Comments
 (0)