Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mass merge from 12.0.x to master #1126

Merged
merged 32 commits into from
Jul 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
77e99ce
Adding the $surface argument (#1115)
Lipata Apr 11, 2023
521029f
chore: release 11.0.3
Lipata Apr 11, 2023
0173409
Separate config files for the WebComponents application and the tests…
valadzhov Apr 11, 2023
b561e52
fix(wc): changing the function call #1110 (#1113)
valadzhov Apr 10, 2023
34d4b25
Adding NoopAnimationsModule and removing FormsModule.
valadzhov May 17, 2023
bf39bfb
Merge pull request #1125 from IgniteUI/valadzhov/angular-failing-proj…
Lipata May 17, 2023
737bf1c
Removing "on" prefix from event names.
valadzhov May 18, 2023
761326d
Merge pull request #1128 from IgniteUI/valadzhov/hierarchical-grid-ba…
Lipata May 19, 2023
4d7023f
chore(igx): add explicitely igniteui-theming package
Lipata May 25, 2023
3418635
Merge pull request #1132 from IgniteUI/nalipiev/igniteui-theming
Lipata May 25, 2023
4a568a9
chore: release 11.1.2
Lipata May 25, 2023
ee07c99
Merge branch '11.0.x' into 11.1.x
Lipata May 26, 2023
cd80809
Merge branch '11.1.x' into 12.0.x
Lipata May 26, 2023
59279c6
chore: release 12.0.1
Lipata May 26, 2023
3cab9a2
chore(ig-ts): update tsconfig
Lipata May 26, 2023
434a423
chore(igx-ts): remove igniteui-theming package
Lipata May 26, 2023
1879dec
chore: add component schematic config
Lipata May 26, 2023
c7e600c
Angular Wrappers package.json update (#1130)
valadzhov May 31, 2023
537fad7
chore(igx): update DV 16
Lipata Jun 2, 2023
fc61052
fix(igx): replace DataGridSelectionMode with GridSelectionMode
Lipata Jun 2, 2023
1373d18
fix(igx): more fixes
Lipata Jun 2, 2023
8d429c0
Merge pull request #1136 from IgniteUI/nalipiev/update-16-dv
Lipata Jun 2, 2023
a1fc0f8
Merge pull request #1134 from IgniteUI/nalipiev/remove-theming-package
Lipata Jun 2, 2023
0575ea7
chore(igx): enable back strict true (#1090)
Lipata Jun 2, 2023
3ee871c
chore: release 12.0.2
Lipata Jun 2, 2023
4fb09dc
Merge branch 'master' into 12.0.x
Lipata Jun 27, 2023
023c5b1
chore: update wc to 4.3.0 (#1137)
Lipata Jun 28, 2023
40a3c8f
Fix memory allocation issue during build of webComponent app that use…
dkalinovInfra Jul 18, 2023
b33baf2
chore: release 12.0.4
Lipata Jul 18, 2023
1876be5
build(deps): bump semver from 5.7.1 to 5.7.2 (#1141)
dependabot[bot] Jul 18, 2023
ee188bf
fix: memory allocation issue during build of webComponent app that us…
Lipata Jul 18, 2023
300f8c1
chore: release 12.0.5
Lipata Jul 18, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 33 additions & 5 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -339,10 +339,10 @@
"new",
"test_new",
"--collection=${workspaceFolder}/packages/ng-schematics/src/collection.json",
//"--skipGit=true",
//"--skipInstall=true",
//"--template=empty",
//"--theme=Default"
"--skip-git=true",
"--skip-install=true",
"--template=empty",
"--theme=Default"
],
"env": {
"TS_NODE_PROJECT": "${workspaceFolder}/packages/ng-schematics/tsconfig.json"
Expand Down Expand Up @@ -371,6 +371,34 @@
"env": {
"TS_NODE_PROJECT": "${workspaceFolder}/packages/ng-schematics/tsconfig.json"
}
}
},
{
// in order to test schematics, you need to have ignitui-angular package already installed in the test project
"name": "Run schematics:component",
"request": "launch",
"type": "node",

// "cwd": "<absolute directory of the project, created with ng cli, on which the 'ng' schematic is applied>"
"cwd": "C:\\Users\\User\\Desktop\\ng_test\\test_proj",
"args": [
"-r",

// you need to install ts-node for the test project
"ts-node/register",

// "<path/to/ng>", "g",
"${env:AppData}/npm/node_modules/@angular/cli/bin/ng", "g",

// "<../../relative/path/from/cwd/to>/igniteui-cli/packages/ng-schematics/src/collection.json:cli-config"
"../../../../../work/git/igniteui-cli/packages/ng-schematics/src/collection.json:c",
"--template=grid",
"--name=newGrid",
"--skip-route",
// "--help"
],
"env": {
"TS_NODE_PROJECT": "${workspaceFolder}/packages/ng-schematics/tsconfig.json"
}
}
]
}
43 changes: 43 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,39 @@
# [12.0.5](https://github.com/IgniteUI/igniteui-cli/compare/v12.0.4...v12.0.5) (2023-07-18)

## What's Changed

* Fix memory allocation issue during build of webComponent app that uses igc-category-chart by @dkalinovInfra in https://github.com/IgniteUI/igniteui-cli/pull/1143


# [12.0.4](https://github.com/IgniteUI/igniteui-cli/compare/v12.0.3...v12.0.4) (2023-07-18)

## What's Changed

* Fix memory allocation issue during build of webComponent app that uses igc-category-chart by @dkalinovInfra in https://github.com/IgniteUI/igniteui-cli/pull/1143

# [12.0.3](https://github.com/IgniteUI/igniteui-cli/compare/v12.0.2...v12.0.3) (2023-06-28)

## What's Changed

* update web components' libraries to 4.3.0 by @lipata in https://github.com/IgniteUI/igniteui-cli/pull/1137
* Removing ts-node from Angular proj by @dafo in https://github.com/IgniteUI/igniteui-cli/pull/1138

# [12.0.2](https://github.com/IgniteUI/igniteui-cli/compare/v12.0.1...v12.0.2) (2023-06-02)

## What's Changed

* Angular Wrappers package.json update by @valadzhov in https://github.com/IgniteUI/igniteui-cli/pull/1130
* chore(igx): update DV 16 by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1136
* chore(igx-ts): remove igniteui-theming package by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1134
* chore(igx): enable back strict true by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1090

# [12.0.1](https://github.com/IgniteUI/igniteui-cli/compare/v12.0.0...v12.0.1) (2023-05-25)

* Adding NoopAnimationsModule and removing FormsModule. by @valadzhov in https://github.com/IgniteUI/igniteui-cli/pull/1125
* Removing "on" prefix from event names. by @valadzhov in https://github.com/IgniteUI/igniteui-cli/pull/1128
* chore(igx): add explicitely igniteui-theming package by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1132
* Аngular problems by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1115

# [12.0.0](https://github.com/IgniteUI/igniteui-cli/compare/v11.1.1...v12.0.0) (2023-05-15)

🎉 This update includes:
Expand All @@ -12,6 +48,10 @@
* fix(grid): Adding missing packages to the grid template #1109 by @valadzhov & @dafo in https://github.com/IgniteUI/igniteui-cli/pull/1119
* Removing the context method which caused the Angular project tests to fail by @valadzhov in https://github.com/IgniteUI/igniteui-cli/pull/1124

# [11.1.2](https://github.com/IgniteUI/igniteui-cli/compare/v11.1.1...v11.1.2) (2023-05-25)

* chore(igx): add explicitely igniteui-theming package by @Lipata in https://github.com/IgniteUI/igniteui-cli/pull/1132

# [11.1.1](https://github.com/IgniteUI/igniteui-cli/compare/v11.1.0...v11.1.1) (2023-04-11)

* Changing the babel function call by @valadzhov in https://github.com/IgniteUI/igniteui-cli/pull/1113
Expand All @@ -29,6 +69,9 @@

* fix(igx-ts): updating dependencies #1099 by @kdinev in https://github.com/IgniteUI/igniteui-cli/pull/1102
* Update angular packages to 15.2 by @IvayloG in https://github.com/IgniteUI/igniteui-cli/pull/1106
# [11.0.3](https://github.com/IgniteUI/igniteui-cli/compare/v11.0.2...v11.0.3) (2023-04-11)

* Adding the $surface argument by @valadzhov in https://github.com/IgniteUI/igniteui-cli/pull/1114

# [11.0.2](https://github.com/IgniteUI/igniteui-cli/compare/v11.0.1...v11.0.2) (2022-12-16)

Expand Down
2 changes: 1 addition & 1 deletion packages/cli/lib/commands/upgrade.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ command = {
if (success && !argv.skipInstall) {
Util.log("Installing npm packages.");
try {
Util.execSync("npm install --force --quiet");
Util.execSync("npm install --quiet");
Util.log("npm packages installed.");
} catch (error) {
Util.error(`Error installing npm packages.`);
Expand Down
4 changes: 1 addition & 3 deletions packages/cli/lib/templates/AngularTemplate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,7 @@ export class AngularTemplate implements Template {
updateFile = true;
}

for (let fileName of sourceFiles) {
// strip .js file extension from bundle names, as webpack serves these files as .js.js
fileName = fileName.includes(".js") ? fileName.replace(".js", "") : fileName;
for (const fileName of sourceFiles) {
if (!scripts.find(x => x.bundleName === fileName)) {
scripts.push({
bundleName: fileName,
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "igniteui-cli",
"version": "12.0.0",
"version": "12.0.5",
"description": "CLI tool for creating Ignite UI projects",
"keywords": [
"CLI",
Expand Down Expand Up @@ -78,8 +78,8 @@
"all": true
},
"dependencies": {
"@igniteui/angular-templates": "~16.0.1200",
"@igniteui/cli-core": "~12.0.0",
"@igniteui/angular-templates": "~16.0.1205",
"@igniteui/cli-core": "~12.0.5",
"chalk": "^2.3.2",
"fs-extra": "^3.0.1",
"glob": "^7.1.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,35 +10,35 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~14.1.0",
"@angular/common": "~14.1.0",
"@angular/compiler": "~14.1.0",
"@angular/core": "~14.1.0",
"@angular/forms": "~14.1.0",
"@angular/platform-browser": "~14.1.0",
"@angular/platform-browser-dynamic": "~14.1.0",
"@angular/router": "~14.1.0",
"@angular/animations": "~16.0.0",
"@angular/common": "~16.0.0",
"@angular/compiler": "~16.0.0",
"@angular/core": "~16.0.0",
"@angular/forms": "~16.0.0",
"@angular/platform-browser": "~16.0.0",
"@angular/platform-browser-dynamic": "~16.0.0",
"@angular/router": "~16.0.0",
"jquery": ">=1.9.1",
"jquery-ui": ">=1.10.5",
"igniteui-angular-wrappers": "~14.1.0",
"ignite-ui": "~21.2",
"rxjs": "~7.5.0",
"igniteui-angular-wrappers": "~16.0.0",
"ignite-ui": "~22.2",
"rxjs": "~7.8.0",
"tslib": "^2.3.0",
"zone.js": "~0.11.4"
"zone.js": "~0.13.0"
},
"devDependencies": {
"@angular-devkit/build-angular": "~14.1.0",
"@angular/cli": "~14.1.0",
"@angular/compiler-cli": "~14.1.0",
"@types/jasmine": "~4.0.0",
"@types/node": "^12.11.1",
"@angular-devkit/build-angular": "~16.0.0",
"@angular/cli": "~16.0.0",
"@angular/compiler-cli": "~16.0.0",
"@types/jasmine": "~4.3.0",
"@types/node": "^18.16.0",
"igniteui-cli": "^$(cliVersion)",
"jasmine-core": "~4.1.0",
"karma": "~6.3.0",
"karma-chrome-launcher": "~3.1.0",
"jasmine-core": "~4.6.0",
"karma": "~6.4.0",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.0.0",
"karma-jasmine-html-reporter": "~1.7.0",
"typescript": "~4.7.2"
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.0.0",
"typescript": "~5.0.4"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"experimentalDecorators": true,
"moduleResolution": "node",
"importHelpers": true,
"target": "es2020",
"module": "es2020",
"target": "es2022",
"module": "es2022",
"lib": [
"es2020",
"es2022",
"dom"
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { customElement } from 'lit/decorators.js';
import {
EditModeType,
GridActivationMode,
DataGridSelectionMode,
GridSelectionMode,
IgcDataGridComponent,
IgcDataGridModule,
IgcGridCellValueChangingEventArgs,
Expand Down Expand Up @@ -193,7 +193,7 @@ export default class $(ClassName) extends LitElement {
if (grid !== null) {
grid.dataSource = this.data;
grid.activationMode = GridActivationMode.Cell;
grid.selectionMode = DataGridSelectionMode.SingleCell;
grid.selectionMode = GridSelectionMode.SingleCell;
grid.editMode = EditModeType.Cell;
grid.cellValueChanging = onCellValueChanging;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"scripts": {
"start": "tsc && concurrently -k -r \"tsc --watch\" \"wds\"",
"build": "rimraf dist && tsc && rollup -c rollup.config.mjs",
"build": "rimraf dist && tsc && node --max-old-space-size=4096 node_modules/rollup/dist/bin/rollup -c rollup.config.mjs",
"start:build": "web-dev-server --root-dir dist --app-index index.html --open",
"lint": "eslint \"**/*.{js,ts}\" --ignore-path .gitignore",
"test": "tsc --project tsconfig.test.json && wtr"
Expand All @@ -23,7 +23,7 @@
"@vaadin/router": "^1.7.4",
"lit": "^2.6.1",
"typescript": "^4.9.4",
"igniteui-webcomponents": "4.2.0"
"igniteui-webcomponents": "~4.3.0"
},
"devDependencies": {
"@babel/preset-env": "^7.20.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
"scripts": {
"start": "tsc && concurrently -k -r \"tsc --watch\" \"wds\"",
"build": "rimraf dist && tsc && rollup -c rollup.config.mjs",
"build": "rimraf dist && tsc && node --max-old-space-size=4096 node_modules/rollup/dist/bin/rollup -c rollup.config.mjs",
"start:build": "web-dev-server --root-dir dist --app-index index.html --open",
"lint": "eslint \"**/*.{js,ts}\" --ignore-path .gitignore",
"test": "tsc --project tsconfig.test.json && wtr"
Expand All @@ -23,13 +23,13 @@
"@vaadin/router": "^1.7.4",
"@igniteui/material-icons-extended": "^2.11.0",
"igniteui-dockmanager": "~1.8.0",
"igniteui-webcomponents": "4.2.0",
"igniteui-webcomponents-charts": "~4.0.0",
"igniteui-webcomponents-core": "~4.0.0",
"igniteui-webcomponents-gauges": "~4.0.0",
"igniteui-webcomponents-grids": "~4.0.0",
"igniteui-webcomponents-inputs": "~4.0.0",
"igniteui-webcomponents-layouts": "~4.0.0",
"igniteui-webcomponents": "~4.3.0",
"igniteui-webcomponents-charts": "~4.3.0",
"igniteui-webcomponents-core": "~4.3.0",
"igniteui-webcomponents-gauges": "~4.3.0",
"igniteui-webcomponents-grids": "~4.3.0",
"igniteui-webcomponents-inputs": "~4.3.0",
"igniteui-webcomponents-layouts": "~4.3.0",
"lit": "^2.6.1",
"typescript": "^4.9.4"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@igniteui/cli-core",
"version": "12.0.0",
"version": "12.0.5",
"description": "Base types and functionality for Ignite UI CLI",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions packages/core/packages/PackageManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class PackageManager {
case "npm":
/* passes through */
default:
command = `${managerCommand} install --force --quiet`;
command = `${managerCommand} install --quiet`;
break;
}
await this.flushQueue(false);
Expand Down Expand Up @@ -277,7 +277,7 @@ export class PackageManager {
case "npm":
/* passes through */
default:
return `${managerCommand} install ${packageName} --force --quiet --save`;
return `${managerCommand} install ${packageName} --quiet --save`;

Check warning

Code scanning / CodeQL

Unsafe shell command constructed from library input

This string concatenation which depends on [library input](1) is later used in a [shell command](2). This string concatenation which depends on [library input](3) is later used in a [shell command](2). This string concatenation which depends on [library input](4) is later used in a [shell command](2).
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IgxBulletGraphTemplate extends IgniteUIForAngularTemplate {
import: ["IgxBulletGraphModule"],
from: "igniteui-angular-gauges"
}];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-gauges@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-gauges@~16.0.0"];
}
}
module.exports = new IgxBulletGraphTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class IgxCategoryChartTemplate extends IgniteUIForAngularTemplate {
{ import: "IgxCategoryChartModule", from: "igniteui-angular-charts" },
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-charts@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-charts@~16.0.0"];
}
}
module.exports = new IgxCategoryChartTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class IgxGridAwesomeTemplate extends IgniteUIForAngularTemplate {
},
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-charts@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-charts@~16.0.0"];
}
}
module.exports = new IgxGridAwesomeTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@
@keyframes spin-fade {
0% {
opacity: 0;
tranfsorm: rotate(0);
transform: rotate(0);
}

100% {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
import {
CloseScrollStrategy,
ConnectedPositioningStrategy,
DataGridSelectionMode,
GridSelectionMode,
HorizontalAlignment,
IColumnExportingEventArgs,
ColumnType,
Expand Down Expand Up @@ -54,7 +54,7 @@ export class <%=ClassName%>Component implements OnInit, AfterViewInit {

public searchText = '';
public caseSensitive = false;
public selectionMode: DataGridSelectionMode = 'multiple';
public selectionMode: GridSelectionMode = 'multiple';
public displayType = SparklineDisplayType;

public positionSettings: PositionSettings = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class IgxGridCRMTemplate extends IgniteUIForAngularTemplate {
},
{ import: "FormsModule", from: "@angular/forms" }
];
this.packages = ["igniteui-angular-core@~15.0.0", "igniteui-angular-charts@~15.0.0"];
this.packages = ["igniteui-angular-core@~16.0.0", "igniteui-angular-charts@~16.0.0"];
}
}
module.exports = new IgxGridCRMTemplate();
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ $green-palette: palette($primary: #09f, $secondary: #72da67, $surface: #333);
::ng-deep {

.fin-dark-theme {
@include dark-theme($dark-palette);
@include dark-theme($green-palette);
background: #333;

igx-grid-cell {
Expand Down
Loading