Skip to content

Commit

Permalink
Merge pull request #404 from valor-software/development
Browse files Browse the repository at this point in the history
refactor: created stage env and fixed bugs related to http requests
  • Loading branch information
ZhmenZH authored Oct 23, 2023
2 parents 57ab7da + 6a960c0 commit d070ce6
Show file tree
Hide file tree
Showing 287 changed files with 15,547 additions and 39 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/on-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
- run: npx nx run valor-software-site:build-scully --prod
- run: npx nx run valor-software-site:build-scully -c stage

# firebase deploy
firebase_deploy:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on-push-or-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
with:
path: ${{ env.CACHE_DIST_PATH }}
key: dist-${{ github.run_id }}
- run: npx nx run valor-software-site:build-scully --prod
- run: npx nx run valor-software-site:build-scully -c stage

# run linting
linting:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/on_push_to_master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
node-version: '16.15.1'
- run: yarn install
- run: npx nx run valor-software-site:build-scully --prod
- run: npx nx run valor-software-site:build-scully:production
- name: Deploy 🚀
uses: JamesIves/[email protected]
with:
Expand Down
38 changes: 38 additions & 0 deletions apps/valor-software-site/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
"options": {
"command": "npx scully --prod --scanRoutes --project=valor-software-site"
},
"configurations": {
"uat": {}
},
"dependsOn": [
{
"target": "build",
Expand Down Expand Up @@ -44,6 +47,12 @@
},
"configurations": {
"production": {
"optimization": true,
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
Expand Down Expand Up @@ -71,6 +80,32 @@
"extractLicenses": false,
"sourceMap": true,
"namedChunks": true
},
"stage": {
"fileReplacements": [
{
"replace": "apps/valor-software-site/src/environments/environment.ts",
"with": "apps/valor-software-site/src/environments/environment.stage.ts"
}
],
"optimization": true,
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"buildOptimizer": true,
"budgets": [
{
"type": "initial",
"maximumWarning": "500kb",
"maximumError": "1mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "2kb",
"maximumError": "4kb"
}
]
}
},
"defaultConfiguration": "production"
Expand All @@ -83,6 +118,9 @@
},
"development": {
"browserTarget": "valor-software-site:build:development"
},
"stage": {
"browserTarget": "valor-software-site:build:stage"
}
},
"defaultConfiguration": "development"
Expand Down
4 changes: 2 additions & 2 deletions apps/valor-software-site/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
CommonDocsModule,
OLD_ROUTES_FROM_OLD_SITE,
PORTFOLIO_LIST,
SeoService
SeoService,
} from '@valor-software/common-docs';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { ScullyLibModule } from '@scullyio/ng-lib';
Expand Down Expand Up @@ -38,7 +38,7 @@ import { RECAPTCHA_V3_SITE_KEY, RecaptchaV3Module } from 'ng-recaptcha';
{ provide: ARTICLES_REFACTORED_TITLE_LIST, useValue: articlesRefactoringTitlesList },
{ provide: PORTFOLIO_LIST, useValue: projectsList },
{ provide: OLD_ROUTES_FROM_OLD_SITE, useValue: linksFromOldSite },
{ provide: RECAPTCHA_V3_SITE_KEY, useValue: '6LeXDiUoAAAAABZ2FU4l2GZTJ0v5otDAQkC3UZxs' }
{ provide: RECAPTCHA_V3_SITE_KEY, useValue: '6LeXDiUoAAAAABZ2FU4l2GZTJ0v5otDAQkC3UZxs' },
],
bootstrap: [AppComponent],
})
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d070ce6

Please sign in to comment.