Skip to content

Commit

Permalink
Merge pull request #35 from eea/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
laszlocseh authored Oct 1, 2024
2 parents a390e88 + 4f6d17d commit dfd07ac
Show file tree
Hide file tree
Showing 6 changed files with 477 additions and 433 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

### [3.3.0](https://github.com/eea/marine-frontend/compare/3.2.0...3.3.0) - 1 October 2024

#### :rocket: Dependency updates

- Release @eeacms/volto-plotlycharts@10.0.9 [EEA Jenkins - [`ab00a14`](https://github.com/eea/marine-frontend/commit/ab00a148d0367ec424bf2e1ef4e9b16819cbf393)]
- Release @eeacms/volto-plotlycharts@10.0.8 [EEA Jenkins - [`0427d4c`](https://github.com/eea/marine-frontend/commit/0427d4c729dcbbc83439e4d3b529a05c0a47da60)]

#### :house: Documentation changes

- docs: [JENKINS] Automated badge update of README.md [EEA Jenkins - [`181f967`](https://github.com/eea/marine-frontend/commit/181f9674e58c523e5b51be9a726fccf842550805)]

#### :hammer_and_wrench: Others

- Temporarily disable cypress test [laszlocseh - [`0565471`](https://github.com/eea/marine-frontend/commit/05654712780c8e9d812170f5da2bb1398da2d4e5)]
- update yarn.lock [laszlocseh - [`a60d0c0`](https://github.com/eea/marine-frontend/commit/a60d0c0ebf02abbf8b1228450f14295ed85ce86f)]
- update jsconfig.json and jsconfig.json.prod [laszlocseh - [`bcd053a`](https://github.com/eea/marine-frontend/commit/bcd053a3a9b87a68919b637a1b78817f35b08e41)]
- enable cypress test [laszlocseh - [`caba0b7`](https://github.com/eea/marine-frontend/commit/caba0b7958090bc0a8d3b2d8307a9a9d66ba6411)]
- update jsconfig.json and yarn.lock [laszlocseh - [`45d36dc`](https://github.com/eea/marine-frontend/commit/45d36dc1ad10f3a2f0e06e0e35a38f0b629c7833)]
### [3.2.0](https://github.com/eea/marine-frontend/compare/3.1.0...3.2.0) - 20 September 2024

#### :rocket: Dependency updates
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![Release](https://img.shields.io/github/v/release/eea/marine-frontend?sort=semver)](https://github.com/eea/marine-frontend/releases)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2Fmaster&subject=master)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/master/lastBuild/display/redirect)
[![Pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2Fdevelop&subject=develop)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/develop/lastBuild/display/redirect)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2F0.3.0&build=last&subject=release%20.3.0.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/3.2.0/lastBuild/display/redirect/)
[![Release pipeline](https://ci.eionet.europa.eu/buildStatus/icon?job=volto%2Fmarine-frontend%2F0.3.0&build=last&subject=release%20.3.0.0%20pipeline)](https://ci.eionet.europa.eu/view/Github/job/volto/job/marine-frontend/job/3.3.0/lastBuild/display/redirect/)

## Documentation

Expand Down
69 changes: 42 additions & 27 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,29 +1,44 @@
{
"compilerOptions": {
"target": "ESNext",
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"module": "commonjs",
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "Node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
"paths": {
"@plone/volto/*": ["../node_modules/@plone/volto/src/*", "../node_modules/@plone/volto/types/*"],
"@root/*": ["."],
"@eeacms/volto-prefixpath": ["addons/volto-prefixpath/src"],
"@eeacms/volto-marine-policy": ["addons/volto-marine-policy/src"],
"@eeacms/volto-elastic-csv-widget": ["addons/volto-elastic-csv-widget/src"],
"@eeacms/volto-datablocks": ["addons/volto-datablocks/src"]
"compilerOptions": {
"target": "ESNext",
"lib": [
"DOM",
"DOM.Iterable",
"ESNext"
],
"module": "commonjs",
"allowJs": true,
"skipLibCheck": true,
"esModuleInterop": true,
"allowSyntheticDefaultImports": true,
"strict": true,
"forceConsistentCasingInFileNames": true,
"moduleResolution": "Node",
"resolveJsonModule": true,
"isolatedModules": true,
"noEmit": true,
"jsx": "react-jsx",
"paths": {
"@plone/volto/*": [
"../node_modules/@plone/volto/src/*",
"../node_modules/@plone/volto/types/*"
],
"@root/*": [
"."
]
},
"baseUrl": "src"
},
"include": ["src"],
"exclude": ["node_modules", "build", "public", "coverage", "src/**/*.test.{js,jsx,ts,tsx}", "src/**/*.spec.{js,jsx,ts,tsx}", "src/**/*.stories.{js,jsx,ts,tsx}"],
"baseUrl": "src"
}
}
"include": [
"src"
],
"exclude": [
"node_modules",
"build",
"public",
"coverage",
"src/**/*.test.{js,jsx,ts,tsx}",
"src/**/*.spec.{js,jsx,ts,tsx}",
"src/**/*.stories.{js,jsx,ts,tsx}"
]
}
12 changes: 2 additions & 10 deletions jsconfig.json.prod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"compilerOptions": {
"compilerOptions": {
"target": "ESNext",
"lib": ["DOM", "DOM.Iterable", "ESNext"],
"module": "commonjs",
Expand All @@ -21,13 +21,5 @@
"baseUrl": "src"
},
"include": ["src"],
"exclude": [
"node_modules",
"build",
"public",
"coverage",
"src/**/*.test.{js,jsx,ts,tsx}",
"src/**/*.spec.{js,jsx,ts,tsx}",
"src/**/*.stories.{js,jsx,ts,tsx}"
]
"exclude": ["node_modules", "build", "public", "coverage", "src/**/*.test.{js,jsx,ts,tsx}", "src/**/*.spec.{js,jsx,ts,tsx}", "src/**/*.stories.{js,jsx,ts,tsx}"]
}
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "marine-frontend",
"description": "A Volto-powered Plone frontend",
"license": "MIT",
"version": "3.2.0",
"version": "3.3.0",
"scripts": {
"start": "razzle start",
"analyze": "webpack-bundle-analyzer -p $PORT -h 0.0.0.0 ./build/public/stats.json",
Expand Down Expand Up @@ -90,7 +90,7 @@
"@eeacms/volto-globalsearch": "2.0.0",
"@eeacms/volto-marine-policy": "2.0.1",
"@eeacms/volto-openlayers-map": "0.3.2",
"@eeacms/volto-plotlycharts": "10.0.7",
"@eeacms/volto-plotlycharts": "10.0.9",
"@eeacms/volto-prefixpath": "1.0.1",
"@eeacms/volto-redmine-helpdesk": "1.0.0",
"@eeacms/volto-searchlib": "2.0.3",
Expand Down
Loading

0 comments on commit dfd07ac

Please sign in to comment.