Skip to content

Updating master with ssr removal #3660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2025
Merged

Updating master with ssr removal #3660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
950d2c7
fix(*): disabling ssr for the time being
ChronosSF Mar 26, 2025
6b51b88
Merge pull request #3659 from IgniteUI/sstoychev/revert-ssr
ChronosSF Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 3 additions & 18 deletions angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,7 @@
"node_modules"
]
},
"browser": "src/main.ts",
"server": "src/main.server.ts",
"outputMode": "static",
"ssr": {
"entry": "src/server.ts"
}
"browser": "src/main.ts"
},
"configurations": {
"production": {
Expand Down Expand Up @@ -164,12 +159,7 @@
]
},
"preserveSymlinks": true,
"browser": "projects/app-lob/src/main.ts",
"server": "projects/app-lob/src/main.server.ts",
"outputMode": "static",
"ssr": {
"entry": "projects/app-lob/src/server.ts"
}
"browser": "projects/app-lob/src/main.ts"
},
"configurations": {
"production": {
Expand Down Expand Up @@ -294,12 +284,7 @@
"node_modules"
]
},
"browser": "projects/app-crm/src/main.ts",
"server": "projects/app-crm/src/main.server.ts",
"outputMode": "static",
"ssr": {
"entry": "projects/app-crm/src/server.ts"
}
"browser": "projects/app-crm/src/main.ts"
},
"configurations": {
"production": {
Expand Down
8 changes: 4 additions & 4 deletions azure-devops/templates/cd-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,10 @@ steps:
displayName: 'Update web.config file'
workingDirectory: ${{ parameters.workingDir }}

- script: |
mv "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.csr.html" "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.html"
echo "File renamed successfully."
displayName: Rename index.csr.html to index.html
# - script: |
# mv "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.csr.html" "$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser/index.html"
# echo "File renamed successfully."
# displayName: Rename index.csr.html to index.html

- script: |
sourcePath="$(Build.SourcesDirectory)/${{ parameters.targetFolder }}/browser"
Expand Down
5 changes: 0 additions & 5 deletions projects/app-crm/web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
</httpCompression>
<rewrite>
<rules>
<!-- Remove trailing slash redirect -->
<rule name="Remove Trailing Slash" stopProcessing="true">
<match url="(.*)/$" />
<action type="Redirect" url="{R:1}" redirectType="Permanent" />
</rule>
<rule name="Angular Routes" stopProcessing="true">
<match url=".*" />
<conditions logicalGrouping="MatchAll">
Expand Down
5 changes: 0 additions & 5 deletions web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
</httpCompression>
<rewrite>
<rules>
<!-- Remove trailing slash redirect -->
<rule name="Remove Trailing Slash" stopProcessing="true">
<match url="(.*)/$" />
<action type="Redirect" url="{R:1}" redirectType="Permanent" />
</rule>
<rule name="Angular Routes" stopProcessing="true">
<match url=".*" />
<conditions logicalGrouping="MatchAll">
Expand Down
Loading