Skip to content

Commit

Permalink
Merge pull request #13681 from IgniteUI/17.0.x
Browse files Browse the repository at this point in the history
Merging 17.0.x into master
  • Loading branch information
kdinev authored Nov 28, 2023
2 parents 85aa2b3 + 569979b commit 5fcadeb
Show file tree
Hide file tree
Showing 46 changed files with 1,540 additions and 823 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master, 16.1.x, 15.1.x ]
branches: [ master, 17.0.x, 16.1.x, 15.1.x ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master, 16.1.x, 15.1.x ]
branches: [ master, 17.0.x, 16.1.x, 15.1.x ]
schedule:
- cron: '33 4 * * 4'

Expand Down
1 change: 1 addition & 0 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

| Version | Supported |
| -------- | ------------------ |
| 17.0.x | :white_check_mark: |
| 16.1.x | :white_check_mark: |
| 16.0.x | :x: |
| 15.1.x | :white_check_mark: |
Expand Down
20 changes: 11 additions & 9 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,19 @@
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"builder": "@angular-devkit/build-angular:application",
"options": {
"outputPath": "dist/igniteui-dev-demos",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"browser": "src/main.ts",
"server": "src/main.server.ts",
"ssr": {
"entry": "src/server.ts"
},
"polyfills": [
"zone.js",
"hammerjs"
],
"tsConfig": "src/tsconfig.app.json",
"assets": [
"src/favicon.ico",
Expand All @@ -31,9 +38,7 @@
"src/styles/styles.scss"
],
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true,
Expand Down Expand Up @@ -62,10 +67,7 @@
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"aot": true
"extractLicenses": true
},
"hmr": {
"budgets": [
Expand Down
Loading

0 comments on commit 5fcadeb

Please sign in to comment.