Skip to content
This repository has been archived by the owner on Jun 19, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' of github.com:SocialGouv/emjpm-portail
Browse files Browse the repository at this point in the history
  • Loading branch information
devthejo committed Dec 8, 2021
2 parents 62c738e + def180f commit f70b6f0
Show file tree
Hide file tree
Showing 7 changed files with 556 additions and 478 deletions.
5 changes: 5 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Protect workflow files
.github/workflows/*.yml @socialgouv/sre
.github/CODEOWNERS @socialgouv/sre
.k8s/ @socialgouv/sre
.socialgouv/ @socialgouv/sre
3 changes: 1 addition & 2 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"extends": [
"github>SocialGouv/renovate-config:light",
":automergeAll"
"github>SocialGouv/renovate-config:light"
],
"packageRules": [
{
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deactivate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
# run: kapp -y delete -a ${{ env.project }} --namespace ${{ env.namespace }}

- name: Mark environment as deactivated
uses: bobheadxi/deployments@v0.6.0
uses: bobheadxi/deployments@v0.6.1
with:
step: deactivate-env
env: ${{ env.branch }}
Expand Down
50 changes: 50 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,53 @@
## [1.10.14](https://github.com/SocialGouv/emjpm-portail/compare/v1.10.13...v1.10.14) (2021-12-06)


### Bug Fixes

* **deps:** update all dependencies to ^11.1.3 ([f5910d0](https://github.com/SocialGouv/emjpm-portail/commit/f5910d0dd08e3df67b23d053070de0eaf9e1c43d))

## [1.10.13](https://github.com/SocialGouv/emjpm-portail/compare/v1.10.12...v1.10.13) (2021-10-25)


### Bug Fixes

* **deps:** update dependency styled-components to ^5.3.3 ([2f65948](https://github.com/SocialGouv/emjpm-portail/commit/2f659489b584fa3caad2698fcef25c85c114af44))

## [1.10.12](https://github.com/SocialGouv/emjpm-portail/compare/v1.10.11...v1.10.12) (2021-10-07)


### Bug Fixes

* **docker:** upgrade nginx ([2a235d6](https://github.com/SocialGouv/emjpm-portail/commit/2a235d69b0bfeaa39193a079b079d21250f40661))

## [1.10.11](https://github.com/SocialGouv/emjpm-portail/compare/v1.10.10...v1.10.11) (2021-10-07)


### Bug Fixes

* Revert "fix(deps): update dependency theme-ui to v0.11.3" ([#324](https://github.com/SocialGouv/emjpm-portail/issues/324)) ([bbce87e](https://github.com/SocialGouv/emjpm-portail/commit/bbce87eb1bd841351af765116907de9031504947))

## [1.10.10](https://github.com/SocialGouv/emjpm-portail/compare/v1.10.9...v1.10.10) (2021-10-01)


### Bug Fixes

* **deps:** update dependency theme-ui to v0.11.3 ([46cb3df](https://github.com/SocialGouv/emjpm-portail/commit/46cb3df39a9ae812d4c947f50ece0c9df233d7fb))

## [1.10.9](https://github.com/SocialGouv/emjpm-portail/compare/v1.10.8...v1.10.9) (2021-09-28)


### Bug Fixes

* use regular nginx ([39cf3d1](https://github.com/SocialGouv/emjpm-portail/commit/39cf3d12ee88fbd2ace7483c2c2ea5b3fde99ee5))

## [1.10.8](https://github.com/SocialGouv/emjpm-portail/compare/v1.10.7...v1.10.8) (2021-09-02)


### Bug Fixes

* **csp:** fonts and script ([dd61a28](https://github.com/SocialGouv/emjpm-portail/commit/dd61a283bda9c095af2ecba51d31660d9165b6e7))
* **renovate:** merge to github one ([6701600](https://github.com/SocialGouv/emjpm-portail/commit/6701600f181b419bad8b2297385463471c97d134))

## [1.10.7](https://github.com/SocialGouv/emjpm-portail/compare/v1.10.6...v1.10.7) (2021-09-02)


Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ RUN yarn --production --frozen-lockfile --prefer-offline && yarn cache clean
RUN yarn build
RUN yarn export

FROM ghcr.io/socialgouv/docker/nginx4spa:6.47.2
FROM ghcr.io/socialgouv/docker/nginx:6.53.2

COPY --from=builder /out /usr/share/nginx/html
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "emjpm-portail",
"version": "1.10.7",
"version": "1.10.14",
"private": true,
"scripts": {
"dev": "next dev -p 3001",
Expand All @@ -16,25 +16,25 @@
"dependencies": {
"@mdx-js/loader": "^1.6.22",
"@mdx-js/react": "^1.6.22",
"@next/mdx": "^11.1.2",
"next": "11.1.2",
"@next/mdx": "^11.1.3",
"next": "11.1.3",
"react": "17.0.2",
"react-dom": "17.0.2",
"rebass": "^4.0.7",
"styled-components": "^5.3.1",
"styled-components": "^5.3.3",
"theme-ui": "0.3.5"
},
"devDependencies": {
"@socialgouv/eslint-config-react": "^1.85.4",
"babel-jest": "^27.1.0",
"@socialgouv/eslint-config-react": "^1.91.0",
"babel-jest": "^27.2.5",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.6",
"eslint": "^7.32.0",
"eslint-config-next": "^11.1.2",
"eslint-config-next": "^11.1.3",
"eslint-plugin-sort-keys-fix": "^1.1.2",
"jest": "^27.1.0",
"jest": "^27.2.5",
"nextjs-sitemap-generator": "^1.3.1",
"prettier": "^2.3.2",
"prettier": "^2.4.1",
"react-test-renderer": "^17.0.2"
}
}
Loading

0 comments on commit f70b6f0

Please sign in to comment.