Skip to content

Commit 73f0c1a

Browse files
ChronosSFChronosSF
authored
Merge pull request #3590 from IgniteUI/vnext
Updating master with vnext
2 parents 1456bb1 + 8d1f07e commit 73f0c1a

File tree

878 files changed

+12368
-13687
lines changed

Some content is hidden

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

878 files changed

+12368
-13687
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: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
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": [
2021
"zone.js",
@@ -28,16 +29,15 @@
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": {
3938
"includePaths": ["node_modules"]
40-
}
39+
},
40+
"browser": "src/main.ts"
4141
},
4242
"configurations": {
4343
"production": {
@@ -51,8 +51,6 @@
5151
"outputHashing": "all",
5252
"namedChunks": false,
5353
"extractLicenses": true,
54-
"vendorChunk": false,
55-
"buildOptimizer": true,
5654
"sourceMap": false,
5755
"fileReplacements": [
5856
{
@@ -125,12 +123,15 @@
125123
"prefix": "app",
126124
"architect": {
127125
"build": {
128-
"builder": "@angular-devkit/build-angular:browser",
126+
"builder": "@angular-devkit/build-angular:application",
129127
"options": {
130-
"outputPath": "dist/app-lob",
128+
"outputPath": {
129+
"base": "dist/app-lob"
130+
},
131131
"index": "projects/app-lob/src/index.html",
132-
"main": "projects/app-lob/src/main.ts",
133-
"polyfills": "projects/app-lob/src/polyfills.ts",
132+
"polyfills": [
133+
"projects/app-lob/src/polyfills.ts"
134+
],
134135
"tsConfig": "projects/app-lob/tsconfig.app.json",
135136
"assets": [
136137
"projects/app-lob/src/favicon.ico",
@@ -140,9 +141,7 @@
140141
"projects/app-lob/src/styles.scss"
141142
],
142143
"scripts": [],
143-
"vendorChunk": true,
144144
"extractLicenses": false,
145-
"buildOptimizer": false,
146145
"sourceMap": {
147146
"scripts": true,
148147
"styles": true,
@@ -155,7 +154,8 @@
155154
"stylePreprocessorOptions": {
156155
"includePaths": ["node_modules"]
157156
},
158-
"preserveSymlinks": true
157+
"preserveSymlinks": true,
158+
"browser": "projects/app-lob/src/main.ts"
159159
},
160160
"configurations": {
161161
"production": {
@@ -170,8 +170,6 @@
170170
"sourceMap": false,
171171
"namedChunks": false,
172172
"extractLicenses": true,
173-
"vendorChunk": false,
174-
"buildOptimizer": true,
175173
"budgets": [
176174
{
177175
"type": "initial",
@@ -249,12 +247,15 @@
249247
"prefix": "app",
250248
"architect": {
251249
"build": {
252-
"builder": "@angular-devkit/build-angular:browser",
250+
"builder": "@angular-devkit/build-angular:application",
253251
"options": {
254-
"outputPath": "dist/app-crm",
252+
"outputPath": {
253+
"base": "dist/app-crm"
254+
},
255255
"index": "projects/app-crm/src/index.html",
256-
"main": "projects/app-crm/src/main.ts",
257-
"polyfills": "projects/app-crm/src/polyfills.ts",
256+
"polyfills": [
257+
"projects/app-crm/src/polyfills.ts"
258+
],
258259
"tsConfig": "projects/app-crm/tsconfig.app.json",
259260
"assets": [
260261
"projects/app-crm/src/favicon.ico",
@@ -264,9 +265,7 @@
264265
"projects/app-crm/src/styles.scss"
265266
],
266267
"scripts": [],
267-
"vendorChunk": true,
268268
"extractLicenses": false,
269-
"buildOptimizer": false,
270269
"sourceMap": {
271270
"scripts": true,
272271
"styles": true,
@@ -278,7 +277,8 @@
278277
"namedChunks": true,
279278
"stylePreprocessorOptions": {
280279
"includePaths": ["node_modules"]
281-
}
280+
},
281+
"browser": "projects/app-crm/src/main.ts"
282282
},
283283
"configurations": {
284284
"production": {
@@ -293,8 +293,6 @@
293293
"sourceMap": false,
294294
"namedChunks": false,
295295
"extractLicenses": true,
296-
"vendorChunk": false,
297-
"buildOptimizer": true,
298296
"budgets": [
299297
{
300298
"type": "initial",

‎azure-devops/app-cd.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ steps:
3333
script: |
3434
# List of files to update
3535
$files = @(
36-
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.module.ts",
3736
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
3837
"projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
39-
"projects/app-lob/src/app/app.module.ts",
4038
"package.json")
4139
foreach ($file in $files) {
4240
(Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ steps:
3333
script: |
3434
# List of files to update
3535
$files = @(
36-
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.module.ts",
3736
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
3837
"projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
39-
"projects/app-lob/src/app/app.module.ts",
4038
"package.json")
4139
foreach ($file in $files) {
4240
(Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file

‎azure-devops/app-lob-cd.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,8 @@ steps:
3333
script: |
3434
# List of files to update
3535
$files = @(
36-
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.module.ts",
3736
"projects/app-lob/src/app/grid-dynamic-chart-data/grid-dynamic-chart-data.component.ts",
3837
"projects/app-lob/src/app/grid-dynamic-chart-data/data-analysis-dock-manager/data-analysis-dock-manager.component.ts",
39-
"projects/app-lob/src/app/app.module.ts",
4038
"package.json")
4139
foreach ($file in $files) {
4240
(Get-Content -Path $file) -replace 'igniteui-angular-extras', '$(ReplacementText)' | Set-Content -Path $file

‎azure-devops/templates/cd-template.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,17 +112,17 @@ steps:
112112
- task: CopyFiles@2
113113
displayName: Copy web.config
114114
inputs:
115-
SourceFolder: $(Build.SourcesDirectory)
115+
SourceFolder: $(Build.SourcesDirectory)/projects/app-crm/
116116
Contents: web.config
117-
TargetFolder: $(Build.SourcesDirectory)/${{ parameters.targetFolder }}
117+
TargetFolder: $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser
118118

119119
- script: |
120-
sed -i 's/${{ parameters.findRegex }}/${{ parameters.submoduleDir }}/g' $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/web.config
120+
sed -i 's/${{ parameters.findRegex }}/${{ parameters.submoduleDir }}/g' $(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/web.config
121121
displayName: 'Update web.config file'
122122
workingDirectory: ${{ parameters.workingDir }}
123123
124124
- script: |
125-
sourcePath="$(Build.SourcesDirectory)/${{ parameters.targetFolder }}"
125+
sourcePath="$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser"
126126
destinationZip="$(Build.ArtifactStagingDirectory)/output.zip"
127127
cd "$sourcePath"
128128
zip -r "$destinationZip" ./

‎gulpfile.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const createPrependerdLobStructure = (cb) => {
8484

8585
const addPrerenderedLobPages = (cb) => {
8686
const { metadata } = require('./projects/app-lob/src/app/metadata');
87-
const indexFilePath = path.resolve(__dirname, './', 'dist/app-lob', 'index.html');
87+
const indexFilePath = path.resolve(__dirname, './', 'dist/app-lob/browser', 'index.html');
8888

8989
// read in the index.html file
9090
fs.readFile(indexFilePath, 'utf8', function (err, data) {
@@ -237,10 +237,6 @@ const processDemosWithScss = () => processApp("src", "angular-demos", "data");
237237
const processDemosLobWithScss = () => processApp("projects/app-lob/src", "angular-demos-lob", "services");
238238
const processDemosCrmWithScss = () => processApp("projects/app-crm/src", "angular-demos-grid-crm");
239239

240-
let repositoryfyAngularDemos;
241-
let repositoryfyAngularDemosLob;
242-
let repositoryfyAngularDemosCrm;
243-
244240
const copyGitHooks = async (cb) => {
245241

246242
if (process.env.AZURE_PIPELINES || process.env.TRAVIS || process.env.CI || !fs.existsSync('.git')) {

0 commit comments

Comments
 (0)