Skip to content

Commit c4cbce5

Browse files
desig9steindesig9stein
committed
Merge branch 'master' into mpopov/update-navdrawer-samples
# Conflicts: # projects/app-lob/src/app/index/index.component.html # src/app/index/index.component.html # src/app/menus/navdrawer/nav-drawer-pin/nav-drawer-pin.component.html # src/app/menus/navdrawer/nav-drawer-routing/nav-drawer-routing.component.html # src/app/menus/navdrawer/nav-drawer-simple/nav-drawer-simple.component.html
2 parents 714ba82 + fa0be18 commit c4cbce5

File tree

1,355 files changed

+29742
-27597
lines changed

Some content is hidden

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

1,355 files changed

+29742
-27597
lines changed

‎angular.Samples.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
<description>This is a package that can be used with Octopus deployer</description>
1111
</metadata>
1212
<files>
13-
<file src="dist\$path$\**\*.*" target="\" />
13+
<file src="dist\$path$\browser\**\*.*" target="\" />
1414
</files>
1515
</package>

‎angular.json‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@
1010
"prefix": "app",
1111
"architect": {
1212
"build": {
13-
"builder": "@angular-devkit/build-angular:browser",
13+
"builder": "@angular-devkit/build-angular:application",
1414
"options": {
15-
"outputPath": "dist/app",
15+
"outputPath": {
16+
"base": "dist/app"
17+
},
1618
"index": "src/index.html",
17-
"main": "src/main.ts",
1819
"tsConfig": "src/tsconfig.app.json",
1920
"polyfills": [
20-
"zone.js",
21-
"hammerjs"
21+
"zone.js",
22+
"hammerjs"
2223
],
2324
"assets": [
2425
"src/assets",
@@ -28,16 +29,17 @@
2829
"src/styles.scss"
2930
],
3031
"scripts": [],
31-
"vendorChunk": true,
3232
"extractLicenses": false,
33-
"buildOptimizer": false,
3433
"optimization": false,
3534
"namedChunks": true,
3635
"sourceMap": true,
3736
"progress": true,
3837
"stylePreprocessorOptions": {
39-
"includePaths": ["node_modules"]
40-
}
38+
"includePaths": [
39+
"node_modules"
40+
]
41+
},
42+
"browser": "src/main.ts"
4143
},
4244
"configurations": {
4345
"production": {
@@ -51,8 +53,6 @@
5153
"outputHashing": "all",
5254
"namedChunks": false,
5355
"extractLicenses": true,
54-
"vendorChunk": false,
55-
"buildOptimizer": true,
5656
"sourceMap": false,
5757
"fileReplacements": [
5858
{
@@ -125,12 +125,15 @@
125125
"prefix": "app",
126126
"architect": {
127127
"build": {
128-
"builder": "@angular-devkit/build-angular:browser",
128+
"builder": "@angular-devkit/build-angular:application",
129129
"options": {
130-
"outputPath": "dist/app-lob",
130+
"outputPath": {
131+
"base": "dist/app-lob"
132+
},
131133
"index": "projects/app-lob/src/index.html",
132-
"main": "projects/app-lob/src/main.ts",
133-
"polyfills": "projects/app-lob/src/polyfills.ts",
134+
"polyfills": [
135+
"projects/app-lob/src/polyfills.ts"
136+
],
134137
"tsConfig": "projects/app-lob/tsconfig.app.json",
135138
"assets": [
136139
"projects/app-lob/src/favicon.ico",
@@ -140,9 +143,7 @@
140143
"projects/app-lob/src/styles.scss"
141144
],
142145
"scripts": [],
143-
"vendorChunk": true,
144146
"extractLicenses": false,
145-
"buildOptimizer": false,
146147
"sourceMap": {
147148
"scripts": true,
148149
"styles": true,
@@ -153,9 +154,12 @@
153154
"optimization": false,
154155
"namedChunks": true,
155156
"stylePreprocessorOptions": {
156-
"includePaths": ["node_modules"]
157+
"includePaths": [
158+
"node_modules"
159+
]
157160
},
158-
"preserveSymlinks": true
161+
"preserveSymlinks": true,
162+
"browser": "projects/app-lob/src/main.ts"
159163
},
160164
"configurations": {
161165
"production": {
@@ -170,8 +174,6 @@
170174
"sourceMap": false,
171175
"namedChunks": false,
172176
"extractLicenses": true,
173-
"vendorChunk": false,
174-
"buildOptimizer": true,
175177
"budgets": [
176178
{
177179
"type": "initial",
@@ -249,12 +251,15 @@
249251
"prefix": "app",
250252
"architect": {
251253
"build": {
252-
"builder": "@angular-devkit/build-angular:browser",
254+
"builder": "@angular-devkit/build-angular:application",
253255
"options": {
254-
"outputPath": "dist/app-crm",
256+
"outputPath": {
257+
"base": "dist/app-crm"
258+
},
255259
"index": "projects/app-crm/src/index.html",
256-
"main": "projects/app-crm/src/main.ts",
257-
"polyfills": "projects/app-crm/src/polyfills.ts",
260+
"polyfills": [
261+
"projects/app-crm/src/polyfills.ts"
262+
],
258263
"tsConfig": "projects/app-crm/tsconfig.app.json",
259264
"assets": [
260265
"projects/app-crm/src/favicon.ico",
@@ -264,9 +269,7 @@
264269
"projects/app-crm/src/styles.scss"
265270
],
266271
"scripts": [],
267-
"vendorChunk": true,
268272
"extractLicenses": false,
269-
"buildOptimizer": false,
270273
"sourceMap": {
271274
"scripts": true,
272275
"styles": true,
@@ -277,8 +280,11 @@
277280
"optimization": false,
278281
"namedChunks": true,
279282
"stylePreprocessorOptions": {
280-
"includePaths": ["node_modules"]
281-
}
283+
"includePaths": [
284+
"node_modules"
285+
]
286+
},
287+
"browser": "projects/app-crm/src/main.ts"
282288
},
283289
"configurations": {
284290
"production": {
@@ -293,8 +299,6 @@
293299
"sourceMap": false,
294300
"namedChunks": false,
295301
"extractLicenses": true,
296-
"vendorChunk": false,
297-
"buildOptimizer": true,
298302
"budgets": [
299303
{
300304
"type": "initial",

‎azure-devops/app-cd.yml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
trigger:
2+
branches:
3+
include:
4+
- master
5+
- vnext
6+
7+
# This pipeline is meant to build specific branches for deployment. It's not meant to be a part of PR validation. Ensure that this pipeline is reserved for deployment purposes.
8+
pr: none
9+
10+
name: $(BuildDefinitionName)_$(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
11+
12+
pool:
13+
vmImage: ubuntu-latest
14+
15+
variables:
16+
- group: live-editing-samples-pat
17+
- name: ReplacementText
18+
value: '@infragistics/igniteui-angular-extras'
19+
20+
steps:
21+
- checkout: self
22+
persistCredentials: true
23+
clean: true
24+
fetchTags: true
25+
26+
- task: NodeTool@0
27+
displayName: Use Node 20.x
28+
inputs:
29+
versionSpec: 20.x
30+
31+
- task: PowerShell@2
32+
displayName: 'Replace with licensed angular-extras'
33+
inputs:
34+
targetType: 'inline'
35+
script: |
36+
# List of files to update
37+
$files = @(
38+
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
39+
"projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
40+
"package.json")
41+
foreach ($file in $files) {
42+
(Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file
43+
}
44+
45+
- task: CmdLine@2
46+
displayName: 'Create empty .npmrc file in the project root dir'
47+
inputs:
48+
script: 'touch $(Build.SourcesDirectory)/.npmrc'
49+
failOnStderr: true
50+
51+
- task: Npm@1
52+
displayName: 'Register licensed npm registry in .npmrc'
53+
inputs:
54+
command: 'custom'
55+
workingDir: '$(Build.SourcesDirectory)'
56+
customCommand: 'config -L project set @infragistics:registry=https://packages.infragistics.com/npm/js-licensed/'
57+
customEndpoint: 'public proget'
58+
59+
- task: npmAuthenticate@0
60+
inputs:
61+
workingFile: '$(Build.SourcesDirectory)/.npmrc'
62+
customEndpoint: 'public proget'
63+
64+
- task: Npm@1
65+
displayName: npm install
66+
inputs:
67+
command: install
68+
workingDir: $(Build.SourcesDirectory)
69+
verbose: false
70+
customEndpoint: 'public proget'
71+
env:
72+
AZURE_PIPELINES: true
73+
74+
- task: CmdLine@2
75+
displayName: Clone submodule
76+
inputs:
77+
script: git clone --recurse-submodules https://github.com/IgniteUI/igniteui-live-editing-samples igniteui-live-editing-samples
78+
workingDirectory: $(Build.SourcesDirectory)
79+
80+
- template: templates/cd-template.yml
81+
parameters:
82+
customCommand: run generate-live-editing
83+
gitHubToken: $(GITHUB_TOKEN)
84+
workingDir: $(Build.SourcesDirectory)
85+
submoduleDir: angular-demos
86+
baseHref: \/angular-demos\/
87+
targetFolder: dist/app
88+
findRegex: angular-demos
89+
npmBuildCommand: 'run build-ci'
90+
repositoryfy: true
91+
repositoryfyCommand: 'repositoryfyAngularDemos'

‎azure-devops/app-crm-cd-yml‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
trigger:
2+
branches:
3+
include:
4+
- master
5+
- vnext
6+
7+
# This pipeline is meant to build specific branches for deployment. It's not meant to be a part of PR validation. Ensure that this pipeline is reserved for deployment purposes.
8+
pr: none
9+
10+
name: $(BuildDefinitionName)_$(Year:yyyy).$(Month).$(DayOfMonth)$(Rev:.r)
11+
12+
pool:
13+
vmImage: ubuntu-latest
14+
15+
variables:
16+
- group: live-editing-samples-pat
17+
- name: ReplacementText
18+
value: '@infragistics/igniteui-angular-extras'
19+
20+
steps:
21+
- checkout: self
22+
persistCredentials: true
23+
clean: true
24+
fetchTags: true
25+
26+
- task: NodeTool@0
27+
displayName: Use Node 20.x
28+
inputs:
29+
versionSpec: 20.x
30+
31+
- task: PowerShell@2
32+
displayName: 'Replace with licensed angular-extras'
33+
inputs:
34+
targetType: 'inline'
35+
script: |
36+
# List of files to update
37+
$files = @(
38+
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
39+
"projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
40+
"package.json")
41+
foreach ($file in $files) {
42+
(Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file
43+
}
44+
45+
- task: CmdLine@2
46+
displayName: 'Create empty .npmrc file in the project root dir'
47+
inputs:
48+
script: 'touch $(Build.SourcesDirectory)/.npmrc'
49+
failOnStderr: true
50+
51+
- task: Npm@1
52+
displayName: 'Register licensed npm registry in .npmrc'
53+
inputs:
54+
command: 'custom'
55+
workingDir: '$(Build.SourcesDirectory)'
56+
customCommand: 'config -L project set @infragistics:registry=https://packages.infragistics.com/npm/js-licensed/'
57+
customEndpoint: 'public proget'
58+
59+
- task: npmAuthenticate@0
60+
inputs:
61+
workingFile: '$(Build.SourcesDirectory)/.npmrc'
62+
customEndpoint: 'public proget'
63+
64+
- task: Npm@1
65+
displayName: npm install
66+
inputs:
67+
command: install
68+
workingDir: $(Build.SourcesDirectory)
69+
verbose: false
70+
customEndpoint: 'public proget'
71+
env:
72+
AZURE_PIPELINES: true
73+
74+
- task: CmdLine@2
75+
displayName: Clone submodule
76+
inputs:
77+
script: git clone --recurse-submodules https://github.com/IgniteUI/igniteui-live-editing-samples igniteui-live-editing-samples
78+
workingDirectory: $(Build.SourcesDirectory)
79+
80+
- template: templates/cd-template.yml
81+
parameters:
82+
customCommand: run generate-live-editing:app-crm
83+
gitHubToken: $(GITHUB_TOKEN)
84+
workingDir: $(Build.SourcesDirectory)
85+
submoduleDir: angular-demos-crm
86+
baseHref: \/angular-demos-grid-crm\/
87+
targetFolder: dist/app-crm
88+
findRegex: angular-demos
89+
npmBuildCommand: 'run build-ci:app-crm --loglevel verbose'
90+
repositoryfy: false

0 commit comments

Comments
 (0)