Skip to content

Commit

Permalink
Merge vnext into skrastev/update-nwdata
Browse files Browse the repository at this point in the history
  • Loading branch information
skrustev committed Nov 15, 2024
2 parents 857a3cb + d683cf4 commit 4d0846e
Show file tree
Hide file tree
Showing 2,803 changed files with 109,725 additions and 80,845 deletions.
30 changes: 21 additions & 9 deletions azure-pipelines/build-pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ trigger:
include:
- vnext
- master
- btraykov/azure-pipeline

# This pipeline is meant to build specific branches for deployment. It's not meant to be a part of PR validation.
pr: none
Expand All @@ -13,7 +12,13 @@ parameters:
displayName: 'Get verbose output from steps - where configurable'
type: boolean
default: false
- name: shouldCleanPostExectuion
displayName: 'Clean all pipeline dirs after the pipeline finishes?'
type: boolean
default: true

name: $(BuildDefinitionName)_$(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)

stages:
- stage: Build
pool:
Expand All @@ -23,35 +28,38 @@ stages:
- job: BuildSamples
steps:
- checkout: 'self'
clean: true
path: $(Build.Repository.Name)

- task: NodeTool@0
displayName: 'Install Node'
inputs:
versionSource: 'spec'
versionSpec: '16.x'
versionSpec: '18.x'

- task: Npm@1
displayName: 'Register licensed npm registry in .npmrc'
inputs:
command: 'custom'
workingDir: '$(Build.SourcesDirectory)'
customCommand: 'config -L project set @infragistics:registry=http://proget.infragistics.local:81/npm/IgniteUILicensed/'
customEndpoint: 'internal licensed proget'
customCommand: 'config -L project set @infragistics:registry=https://packages.infragistics.com/npm/js-licensed/'
customEndpoint: 'public proget'

- task: Npm@1
displayName: 'npm ci --legacy-peer-deps'
displayName: 'npm install --legacy-peer-deps'
inputs:
command: custom
workingDir: '$(Build.SourcesDirectory)'
customCommand: 'ci --legacy-peer-deps'
customEndpoint: 'internal licensed proget'
customCommand: 'install --legacy-peer-deps'
customEndpoint: 'public proget'

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

- task: PowerShell@2
displayName: 'Uninstall all IG trial packages & re-install their licensed variations'
Expand All @@ -64,7 +72,7 @@ stages:
Get-Content -Path .\.npmrc
$packageJson = Get-Content -Raw .\package.json | ConvertFrom-Json
$npmUninstallPackages = "npm uninstall --save "
$npmInstallPackages = "npm install "
$npmInstallPackages = "npm install --legacy-peer-deps "
$packageJson.dependencies.PSObject.Properties | `
Where-Object {
$_.Name.StartsWith("igniteui-webcomponents-") -or $_.Name.StartsWith("igniteui-dockmanager") `
Expand All @@ -77,6 +85,7 @@ stages:
Write-Host $npmInstallPackages
Invoke-Expression -Command “$npmUninstallPackages”
Invoke-Expression -Command “$npmInstallPackages”
- task: Npm@1
displayName: 'npm run build'
inputs:
Expand Down Expand Up @@ -104,3 +113,6 @@ stages:
inputs:
targetPath: '$(Build.ArtifactStagingDirectory)/WebComponentsSamples.zip'
artifact: 'WebComponentsSamplesBrowser'

- ${{ if eq(parameters.shouldCleanPostExectuion, true) }}:
- task: PostBuildCleanup@4
108 changes: 96 additions & 12 deletions browser/public/index.html

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion browser/src/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ export class Router {
}

private preventDocumentScroll(event:any) {
if (event.target.outerHTML.toLowerCase().includes('igx')) {
const eventPath = event.composedPath();
if (event.target.outerHTML.toLowerCase().includes('igx') && eventPath.filter(x => x.classList?.value === 'igx-grid__tbody').length > 0) {
event.preventDefault();
}
}
Expand Down
31 changes: 17 additions & 14 deletions browser/tasks/gulp-samples.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ var sampleSources = [
// '!' + igConfig.SamplesCopyPath + '/grids/list/**/package.json',
// '!' + igConfig.SamplesCopyPath + '/grids/tree/**/package.json',
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/**/package.json',
'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/row-styles/package.json', // BUG webTreeGridRowStylesHandler does not export
// '!' + igConfig.SamplesCopyPath + '/grids/tree-grid/row-styles/package.json', // BUG webTreeGridRowStylesHandler does not export
//'!' + igConfig.SamplesCopyPath + '/grids/tree-grid/row-reorder/package.json', // BUG Property 'dragElement' does not exist on type 'IgcRowDragStartEventArgs'

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

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

// excluding samples' node_modules:
'!' + igConfig.SamplesCopyPath + '/**/node_modules/**/package.json',
Expand Down Expand Up @@ -975,24 +976,26 @@ function updateIG(cb) {
// { name: "igniteui-webcomponents-core", version: "3.2.2" }, // PUBLIC NPM
let packageUpgrades = [
// these IG packages are often updated:
{ name: "igniteui-webcomponents-core" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-charts" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-excel" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-gauges" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-grids" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-inputs" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-layouts" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-maps" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-spreadsheet-chart-adapter", version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-spreadsheet" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-datasources" , version: "4.8.1-alpha.0" },
{ name: "igniteui-webcomponents-core" , version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-charts" , version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-excel" , version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-gauges" , version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-grids" , version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-inputs" , version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-layouts" , version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-maps" , version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-spreadsheet-chart-adapter", version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-spreadsheet" , version: "5.0.3-beta.0" },
{ name: "igniteui-webcomponents-datasources" , version: "5.0.3-beta.0" },
// these IG packages are sometimes updated:
{ name: "igniteui-webcomponents", version: "4.8.0" },
{ name: "igniteui-webcomponents", version: "5.1.1" },
{ name: "igniteui-dockmanager", version: "1.14.3" },
// other packages:
{ name: "webpack", version: "^5.74.0" },
{ name: "webpack-cli", version: "^4.10.0" },
{ name: "webpack-dev-server", version: "^4.11.1" },
{ name: "lit", version: "^3.2.0" },
{ name: "lit-html", version: "^3.2.0" },
];

var packagePaths = [
Expand Down
Loading

0 comments on commit 4d0846e

Please sign in to comment.