Skip to content

Commit

Permalink
Update to volto 16; Update packages for EEA DS
Browse files Browse the repository at this point in the history
  • Loading branch information
kreafox committed Jun 23, 2023
1 parent 1314e67 commit 2a9786d
Show file tree
Hide file tree
Showing 12 changed files with 975 additions and 101 deletions.
130 changes: 76 additions & 54 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,73 +1,82 @@
.vscode/
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.DS_Store

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# TypeScript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz
# Node
node_modules
coverage
jsdoc
webpack-assets.json
webpack-stats.json
npm-debug.log
dist
junit.xml
eslint.xml
yarn-error.log
build

# Yarn Integrity file
.yarn-integrity
# Other
.DS_Store
.idea
lighthouse-report.html
.vscode/
backend
.#*
*~

# dotenv environment variables file
# Python
/api/.installed.cfg
/api/.mr.developer.cfg
/api/bin/
/api/develop-eggs/
/api/eggs/
/api/include/
/api/lib/
/api/lib64/
/api/notebook/env/
/api/parts/
/api/share/python-wheels/
/api/src/
/api/var/
/api/venv/
/bin/
/lib/
.Python
include
pip-selfcheck.json
pyvenv.cfg
share

# locales
locales/*.json

# Tests
/tests/bin
/tests/develop-eggs
/tests/parts
/tests/.installed.cfg
*.pyc
geckodriver.log
log.html
output.xml
report.html
selenium-screenshot-*.png
/selenium/
cypress/videos/
cypress/screenshots

# Local environment setup
.env

# next.js build output
.next

build
.env.local
.env.development.local
.env.test.local
.env.production.local

# generic
data
omelette
*.old
Expand All @@ -76,3 +85,16 @@ src/addons
src/develop
npm-cache
backend

# build
public/critical.css
/cache

# yarn 3
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
783 changes: 783 additions & 0 deletions .yarn/releases/yarn-3.2.3.cjs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
defaultSemverRangePrefix: ""

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.2.3.cjs
23 changes: 23 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,26 @@ try-production: ## Build production bundle
.PHONY: sync
sync: ## Sync repo with eea/volto-starter-kit Github template
npx git-upstream-template https://github.com/eea/volto-starter-kit.git

.PHONY: install
install: ## Install the frontend
@echo "Install frontend"
$(MAKE) omelette
$(MAKE) preinstall
yarn install

.PHONY: preinstall
preinstall: ## Preinstall task, checks if missdev (mrs-developer) is present and runs it
if [ -f $$(pwd)/mrs.developer.json ]; then make develop; fi

.PHONY: develop
develop: ## Runs missdev in the local project (mrs.developer.json should be present)
npx -p mrs-developer missdev --config=jsconfig.json --output=addons --fetch-https

.PHONY: omelette
omelette: ## Creates the omelette folder that contains a link to the installed version of Volto (a softlink pointing to node_modules/@plone/volto)
if [ ! -d omelette ]; then ln -sf node_modules/@plone/volto omelette; fi

.PHONY: patches
patches:
/bin/bash patches/patchit.sh > /dev/null 2>&1 ||true
13 changes: 1 addition & 12 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1 @@
const baseCfg = require('@plone/volto/babel');

module.exports = function (api) {
const voltoConfig = baseCfg(api);
const presets = voltoConfig.presets;
const plugins = [...voltoConfig.plugins];
return {
plugins,
presets,
sourceType: 'unambiguous',
};
};
module.exports = require('@plone/volto/babel');
12 changes: 9 additions & 3 deletions jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@
"@eeacms/volto-tableau": [
"addons/volto-tableau/src"
],
"@eeacms/volto-freshwater": [
"addons/volto-freshwater/src"
"@eeacms/volto-freshwater-policy": [
"addons/volto-freshwater-policy/src"
],
"@eeacms/volto-eea-design-system": [
"addons/volto-eea-design-system/src"
],
"@eeacms/volto-eea-website-theme": [
"addons/volto-eea-website-theme/src"
]
},
"baseUrl": "src"
}
}
}
2 changes: 1 addition & 1 deletion locales/de.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion locales/en.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion locales/nl.json

Large diffs are not rendered by default.

32 changes: 28 additions & 4 deletions mrs.developer.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,34 @@
"develop": false,
"path": "src"
},
"volto-freshwater": {
"url": "git@github.com:eea/volto-freshwater.git",
"https": "https://github.com/eea/volto-freshwater.git",
"package": "@eeacms/volto-freshwater",
"volto-slots": {
"url": "git@github.com:eea/volto-slots.git",
"https": "https://github.com/eea/volto-slots.git",
"package": "@eeacms/volto-slots",
"path": "src",
"branch": "develop",
"develop": true
},
"volto-freshwater-policy": {
"url": "git@github.com:eea/volto-freshwater-policy.git",
"https": "https://github.com/eea/volto-freshwater-policy.git",
"package": "@eeacms/volto-freshwater-policy",
"branch": "develop",
"develop": true,
"path": "src"
},
"volto-eea-design-system": {
"url": "git@github.com:eea/volto-eea-design-system.git",
"https": "https://github.com/eea/volto-eea-design-system.git",
"package": "@eeacms/volto-eea-design-system",
"branch": "develop",
"develop": true,
"path": "src"
},
"volto-eea-website-theme": {
"url": "git@github.com:eea/volto-eea-website-theme.git",
"https": "https://github.com/eea/volto-eea-website-theme.git",
"package": "@eeacms/volto-eea-website-theme",
"branch": "develop",
"develop": true,
"path": "src"
Expand Down
Loading

0 comments on commit 2a9786d

Please sign in to comment.