Skip to content
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.

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

Merge typescript-template into repo #66

Merged
merged 258 commits into from
Feb 9, 2024
Merged

Merge typescript-template into repo #66

merged 258 commits into from
Feb 9, 2024

Conversation

thomasridd
Copy link
Contributor

No description provided.

andrewrlee and others added 30 commits December 7, 2020 08:57
* Update dependencies

Also move to use declaration overrides for describing additional possible fields in session data

Also removing/moving unnecessary prod dependencies

Moving jest tests to run in parallel

* Fix types for user

* Do not allow any warnings

* Correcting test results path
Also
* Update dependencies
* Adopt standard github gitignore for node projects
* Using body typography
* Add rename script

* PR reviews

* Removing unused vars
* Decoupling auth client from redis impl
* Convert to arrow functions in utils

* Remove returns and fix prettier issues
* Adding outdated job

* Updating dependencies

* Removing patch to minor version
* Add new veracode scan for schedueled workflow

* Re-add - check_outdated job
…ks (#27)

* Updating dependencies and adding slack notifications to outdated checks

* Add slack orb
* Ensure that the `SLACK_ACCESS_TOKEN` env var is set for `check_outdated`

As the final step (on fail) is a slack notification we need to use a context containing the variable.

* Refactor the channel for alerts into parameters

This establishes a reusable pattern in case consumers wish to notify slack on other jobs.
The "medium" configuration was not an acceptable term, should be one of
"info", "low", "moderate", "high" or "critical". This meant that it
would not pick up on anything!
* Updating dependencies and node

* Use parameterised slack channel rather than default of typescript alerts channel

* Extracting out executor
* WFP-322 use the hmpps/node executor to build

* WFP-322 parameterise the node version in the executor

* WFP-322 use node version parameter in integration test image

* WFP-322 integration tests use new node_redis executor

Co-authored-by: Andrew Lee <[email protected]>
* Deploy template project to template k8s namespace
ravmoj and others added 26 commits December 14, 2023 15:10
* HAAR-2061:
1 ) Removed staffId (userId has same info),
2) activeCaseLoadId : can be derived from 'me/caseloads' endpoint in 'nomis-user-roles-api'

* HAAR-2061: Remove staffId from stub
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Update CHANGELOG.md

* Update CHANGELOG.md

---------

Co-authored-by: nishanthmahasamudram <[email protected]>
Co-authored-by: Paul Solecki <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* Upgrade to GovUK 5 and MoJ 2.0

* Update sass command
* Update all non major NPM dependencies
* Update Node.js to v20.11.0
* Update dependency husky to v9
* Update MoJ frontend, dropping jQuery which is no longer required
* Remove unused static assets route: `govuk_frontend_toolkit` is not currently included
* Prevent renovate from updating `engines.node` and `engines.npm` in package.json because we’d usually want to stick to an LTS version rather than move to the latest
`node_modules/govuk-frontend/dist/components/` was missing `govuk/`
before `components/`, however we don't really need both the higher-level
and lower-level paths here. For greater consistency, just using the
higher-level path to enable a single clearly-namespaced route to each
GOV.UK and MOJ Nunjucks component makes more sense. The lower-level path
is often unused on projects that use this template

Imports should therefore look like this:

```njk
{% from "govuk/components/checkboxes/macro.njk" import govukCheckboxes %}
```

... and not this:

```njk
{% from "checkboxes/macro.njk" import govukCheckboxes %}
```
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
# Conflicts:
#	.circleci/config.yml
#	Dockerfile
#	README.md
#	assets/scss/application.scss
#	cypress.config.ts
#	docker-compose-test.yml
#	docker-compose.yml
#	feature.env
#	helm_deploy/values-dev.yaml
#	helm_deploy/values-preprod.yaml
#	helm_deploy/values-prod.yaml
#	integration_tests/e2e/health.cy.ts
#	integration_tests/index.d.ts
#	integration_tests/mockApis/auth.ts
#	integration_tests/pages/index.ts
#	integration_tests/support/commands.ts
#	logger.ts
#	package-lock.json
#	package.json
#	renovate.json
#	server/app.ts
#	server/config.ts
#	server/data/hmppsAuthClient.test.ts
#	server/data/hmppsAuthClient.ts
#	server/data/index.ts
#	server/data/manageUsersApiClient.test.ts
#	server/data/manageUsersApiClient.ts
#	server/middleware/authorisationMiddleware.test.ts
#	server/middleware/authorisationMiddleware.ts
#	server/middleware/setUpAuthentication.ts
#	server/middleware/setUpStaticResources.ts
#	server/middleware/setUpWebSession.ts
#	server/routes/index.ts
#	server/services/healthCheck.ts
#	server/services/index.ts
#	server/utils/nunjucksSetup.ts
#	server/utils/utils.test.ts
#	server/utils/utils.ts
#	server/views/pages/error.njk
#	server/views/partials/header.njk
#	server/views/partials/layout.njk
# Conflicts:
#	.circleci/config.yml
#	README.md
Copy link
Contributor

@andrewrlee andrewrlee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thomasridd thomasridd merged commit 8c8d5c4 into main Feb 9, 2024
4 checks passed
@thomasridd thomasridd deleted the template-changes-2400 branch February 9, 2024 09:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.