Skip to content

Commit 4d0846e

Browse files
committed
Merge vnext into skrastev/update-nwdata
2 parents 857a3cb + d683cf4 commit 4d0846e

File tree

2,803 files changed

+109725
-80845
lines changed

Some content is hidden

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

2,803 files changed

+109725
-80845
lines changed

azure-pipelines/build-pipeline.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ trigger:
33
include:
44
- vnext
55
- master
6-
- btraykov/azure-pipeline
76

87
# This pipeline is meant to build specific branches for deployment. It's not meant to be a part of PR validation.
98
pr: none
@@ -13,7 +12,13 @@ parameters:
1312
displayName: 'Get verbose output from steps - where configurable'
1413
type: boolean
1514
default: false
15+
- name: shouldCleanPostExectuion
16+
displayName: 'Clean all pipeline dirs after the pipeline finishes?'
17+
type: boolean
18+
default: true
19+
1620
name: $(BuildDefinitionName)_$(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
21+
1722
stages:
1823
- stage: Build
1924
pool:
@@ -23,35 +28,38 @@ stages:
2328
- job: BuildSamples
2429
steps:
2530
- checkout: 'self'
31+
clean: true
2632
path: $(Build.Repository.Name)
33+
2734
- task: NodeTool@0
2835
displayName: 'Install Node'
2936
inputs:
3037
versionSource: 'spec'
31-
versionSpec: '16.x'
38+
versionSpec: '18.x'
39+
3240
- task: Npm@1
3341
displayName: 'Register licensed npm registry in .npmrc'
3442
inputs:
3543
command: 'custom'
3644
workingDir: '$(Build.SourcesDirectory)'
37-
customCommand: 'config -L project set @infragistics:registry=http://proget.infragistics.local:81/npm/IgniteUILicensed/'
38-
customEndpoint: 'internal licensed proget'
45+
customCommand: 'config -L project set @infragistics:registry=https://packages.infragistics.com/npm/js-licensed/'
46+
customEndpoint: 'public proget'
3947

4048
- task: Npm@1
41-
displayName: 'npm ci --legacy-peer-deps'
49+
displayName: 'npm install --legacy-peer-deps'
4250
inputs:
4351
command: custom
4452
workingDir: '$(Build.SourcesDirectory)'
45-
customCommand: 'ci --legacy-peer-deps'
46-
customEndpoint: 'internal licensed proget'
53+
customCommand: 'install --legacy-peer-deps'
54+
customEndpoint: 'public proget'
4755

4856
- task: Npm@1
4957
displayName: 'Register licensed npm registry in .npmrc'
5058
inputs:
5159
command: 'custom'
5260
workingDir: '$(Build.SourcesDirectory)'
5361
customCommand: 'config -L project set @infragistics:registry=https://packages.infragistics.com/npm/js-licensed/'
54-
customEndpoint: 'public proget'
62+
customEndpoint: 'internal licensed proget'
5563

5664
- task: PowerShell@2
5765
displayName: 'Uninstall all IG trial packages & re-install their licensed variations'
@@ -64,7 +72,7 @@ stages:
6472
Get-Content -Path .\.npmrc
6573
$packageJson = Get-Content -Raw .\package.json | ConvertFrom-Json
6674
$npmUninstallPackages = "npm uninstall --save "
67-
$npmInstallPackages = "npm install "
75+
$npmInstallPackages = "npm install --legacy-peer-deps "
6876
$packageJson.dependencies.PSObject.Properties | `
6977
Where-Object {
7078
$_.Name.StartsWith("igniteui-webcomponents-") -or $_.Name.StartsWith("igniteui-dockmanager") `
@@ -77,6 +85,7 @@ stages:
7785
Write-Host $npmInstallPackages
7886
Invoke-Expression -Command “$npmUninstallPackages”
7987
Invoke-Expression -Command “$npmInstallPackages”
88+
8089
- task: Npm@1
8190
displayName: 'npm run build'
8291
inputs:
@@ -104,3 +113,6 @@ stages:
104113
inputs:
105114
targetPath: '$(Build.ArtifactStagingDirectory)/WebComponentsSamples.zip'
106115
artifact: 'WebComponentsSamplesBrowser'
116+
117+
- ${{ if eq(parameters.shouldCleanPostExectuion, true) }}:
118+
- task: PostBuildCleanup@4

browser/public/index.html

Lines changed: 96 additions & 12 deletions
Large diffs are not rendered by default.

browser/src/router.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,8 @@ export class Router {
167167
}
168168

169169
private preventDocumentScroll(event:any) {
170-
if (event.target.outerHTML.toLowerCase().includes('igx')) {
170+
const eventPath = event.composedPath();
171+
if (event.target.outerHTML.toLowerCase().includes('igx') && eventPath.filter(x => x.classList?.value === 'igx-grid__tbody').length > 0) {
171172
event.preventDefault();
172173
}
173174
}

browser/tasks/gulp-samples.js

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ var sampleSources = [
6969
// '!' + igConfig.SamplesCopyPath + '/grids/list/**/package.json',
7070
// '!' + igConfig.SamplesCopyPath + '/grids/tree/**/package.json',
7171
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/**/package.json',
72-
'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/row-styles/package.json', // BUG webTreeGridRowStylesHandler does not export
72+
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/row-styles/package.json', // BUG webTreeGridRowStylesHandler does not export
73+
//'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/row-reorder/package.json', // BUG Property 'dragElement' does not exist on type 'IgcRowDragStartEventArgs'
7374

7475
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/editing-lifecycle/package.json', // BUG TS2339: Property 'cancel' does not exist on type 'IgcGridEditEventArgs'.
7576
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/multi-column-headers-export/package.json', // BUG Module '"igniteui-webcomponents-grids/grids"' has no exported member 'IgcExporterEventEventArgs'.
@@ -123,7 +124,7 @@ var sampleSources = [
123124
// '!' + igConfig.SamplesCopyPath + '/inputs/switches/**/package.json',
124125

125126
// excluding samples that are not finished:
126-
'!' + igConfig.SamplesCopyPath + '/grids/pivot-grid/remote/package.json', // grid has no exported member named 'NoopPivotDimensionsStrategy'
127+
// '!' + igConfig.SamplesCopyPath + '/grids/pivot-grid/remote/package.json', // grid has no exported member named 'NoopPivotDimensionsStrategy'
127128

128129
// excluding samples' node_modules:
129130
'!' + igConfig.SamplesCopyPath + '/**/node_modules/**/package.json',
@@ -975,24 +976,26 @@ function updateIG(cb) {
975976
// { name: "igniteui-webcomponents-core", version: "3.2.2" }, // PUBLIC NPM
976977
let packageUpgrades = [
977978
// these IG packages are often updated:
978-
{ name: "igniteui-webcomponents-core" , version: "4.8.1-alpha.0" },
979-
{ name: "igniteui-webcomponents-charts" , version: "4.8.1-alpha.0" },
980-
{ name: "igniteui-webcomponents-excel" , version: "4.8.1-alpha.0" },
981-
{ name: "igniteui-webcomponents-gauges" , version: "4.8.1-alpha.0" },
982-
{ name: "igniteui-webcomponents-grids" , version: "4.8.1-alpha.0" },
983-
{ name: "igniteui-webcomponents-inputs" , version: "4.8.1-alpha.0" },
984-
{ name: "igniteui-webcomponents-layouts" , version: "4.8.1-alpha.0" },
985-
{ name: "igniteui-webcomponents-maps" , version: "4.8.1-alpha.0" },
986-
{ name: "igniteui-webcomponents-spreadsheet-chart-adapter", version: "4.8.1-alpha.0" },
987-
{ name: "igniteui-webcomponents-spreadsheet" , version: "4.8.1-alpha.0" },
988-
{ name: "igniteui-webcomponents-datasources" , version: "4.8.1-alpha.0" },
979+
{ name: "igniteui-webcomponents-core" , version: "5.0.3-beta.0" },
980+
{ name: "igniteui-webcomponents-charts" , version: "5.0.3-beta.0" },
981+
{ name: "igniteui-webcomponents-excel" , version: "5.0.3-beta.0" },
982+
{ name: "igniteui-webcomponents-gauges" , version: "5.0.3-beta.0" },
983+
{ name: "igniteui-webcomponents-grids" , version: "5.0.3-beta.0" },
984+
{ name: "igniteui-webcomponents-inputs" , version: "5.0.3-beta.0" },
985+
{ name: "igniteui-webcomponents-layouts" , version: "5.0.3-beta.0" },
986+
{ name: "igniteui-webcomponents-maps" , version: "5.0.3-beta.0" },
987+
{ name: "igniteui-webcomponents-spreadsheet-chart-adapter", version: "5.0.3-beta.0" },
988+
{ name: "igniteui-webcomponents-spreadsheet" , version: "5.0.3-beta.0" },
989+
{ name: "igniteui-webcomponents-datasources" , version: "5.0.3-beta.0" },
989990
// these IG packages are sometimes updated:
990-
{ name: "igniteui-webcomponents", version: "4.8.0" },
991+
{ name: "igniteui-webcomponents", version: "5.1.1" },
991992
{ name: "igniteui-dockmanager", version: "1.14.3" },
992993
// other packages:
993994
{ name: "webpack", version: "^5.74.0" },
994995
{ name: "webpack-cli", version: "^4.10.0" },
995996
{ name: "webpack-dev-server", version: "^4.11.1" },
997+
{ name: "lit", version: "^3.2.0" },
998+
{ name: "lit-html", version: "^3.2.0" },
996999
];
9971000

9981001
var packagePaths = [

0 commit comments

Comments
 (0)