diff --git a/packages/generator-volto/generators/addon/templates/.github/workflows/acceptance.yml b/packages/generator-volto/generators/addon/templates/.github/workflows/acceptance.yml index cb58dba6d6..e15f047d83 100644 --- a/packages/generator-volto/generators/addon/templates/.github/workflows/acceptance.yml +++ b/packages/generator-volto/generators/addon/templates/.github/workflows/acceptance.yml @@ -4,7 +4,7 @@ on: [push] env: ADDON_NAME: "<%= addonName %>" ADDON_PATH: "<%= name %>" - VOLTO_VERSION: "17.0.0-alpha.25" + VOLTO_VERSION: "17.0.0-alpha.30" jobs: diff --git a/packages/generator-volto/generators/addon/templates/.project.eslintrc.js b/packages/generator-volto/generators/addon/templates/.project.eslintrc.js deleted file mode 100644 index 6e39257807..0000000000 --- a/packages/generator-volto/generators/addon/templates/.project.eslintrc.js +++ /dev/null @@ -1,50 +0,0 @@ -const fs = require('fs'); -const path = require('path'); - -const projectRootPath = fs.realpathSync('./project'); // __dirname -const packageJson = require(path.join(projectRootPath, 'package.json')); - -let voltoPath = path.join(projectRootPath, 'node_modules/@plone/volto'); - -let configFile; -if (fs.existsSync(`${this.projectRootPath}/tsconfig.json`)) - configFile = `${this.projectRootPath}/tsconfig.json`; -else if (fs.existsSync(`${this.projectRootPath}/jsconfig.json`)) - configFile = `${this.projectRootPath}/jsconfig.json`; - -if (configFile) { - const jsConfig = require(configFile).compilerOptions; - const pathsConfig = jsConfig.paths; - if (pathsConfig['@plone/volto']) - voltoPath = `./${jsConfig.baseUrl}/${pathsConfig['@plone/volto'][0]}`; -} - -const AddonConfigurationRegistry = require(`${voltoPath}/addon-registry.js`); -const reg = new AddonConfigurationRegistry(projectRootPath); - -// Extends ESlint configuration for adding the aliases to `src` directories in Volto addons -const addonAliases = Object.keys(reg.packages).map((o) => [ - o, - reg.packages[o].modulePath, -]); - -module.exports = { - extends: `${voltoPath}/.eslintrc`, - settings: { - 'import/resolver': { - alias: { - map: [ - ['@plone/volto', '@plone/volto/src'], - ...addonAliases, - ['@package', `${__dirname}/src`], - ['@root', `${__dirname}/src`], - ['~', `${__dirname}/src`], - ], - extensions: ['.js', '.jsx', '.json'], - }, - 'babel-plugin-root-import': { - rootPathSuffix: 'src', - }, - }, - }, -}; diff --git a/packages/generator-volto/generators/addon/templates/Makefile b/packages/generator-volto/generators/addon/templates/Makefile index ea1079bf26..d40ad19e29 100644 --- a/packages/generator-volto/generators/addon/templates/Makefile +++ b/packages/generator-volto/generators/addon/templates/Makefile @@ -22,7 +22,7 @@ RESET=`tput sgr0` YELLOW=`tput setaf 3` PLONE_VERSION=6 -VOLTO_VERSION=17.0.0-alpha.25 +VOLTO_VERSION=17.0.0-alpha.30 ADDON_NAME='<% if (scope) { %><%= scope %>/<%= name %><% } else { %><%= addonName %><% } %>' ADDON_PATH='<%= name %>' diff --git a/packages/generator-volto/generators/addon/templates/package.json b/packages/generator-volto/generators/addon/templates/package.json index b6bfc89446..564637ab98 100644 --- a/packages/generator-volto/generators/addon/templates/package.json +++ b/packages/generator-volto/generators/addon/templates/package.json @@ -42,6 +42,6 @@ "stylelint-prettier": "4.0.2" }, "peerDependencies": { - "@plone/volto": "^17.0.0-alpha.27" + "@plone/volto": "^17.0.0-alpha.30" } } diff --git a/packages/generator-volto/generators/app/templates/Makefile b/packages/generator-volto/generators/app/templates/Makefile index 983ad78dad..4a5a606c1f 100644 --- a/packages/generator-volto/generators/app/templates/Makefile +++ b/packages/generator-volto/generators/app/templates/Makefile @@ -9,15 +9,15 @@ MAKEFLAGS+=--warn-undefined-variables MAKEFLAGS+=--no-builtin-rules # Update the versions depending on your project requirements | Last Updated 2023-03-02 -DOCKER_IMAGE=plone/server-dev:6.0.2 -DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.2 +DOCKER_IMAGE=plone/server-dev:6.0.6 +DOCKER_IMAGE_ACCEPTANCE=plone/server-acceptance:6.0.6 KGS= -TESTING_ADDONS=plone.app.robotframework==2.0.0 plone.app.testing==7.0.0 NODEBIN = ./node_modules/.bin # Plone 5 legacy -DOCKER_IMAGE5=plone/plone-backend:5.2.10 -KGS5=plone.restapi==8.35.0 plone.volto==4.0.5 plone.rest==3.0.0 +DOCKER_IMAGE5=plone/plone-backend:5.2.12 +KGS5=plone.restapi==8.43.3 plone.volto==4.1.0 plone.rest==3.0.1 +TESTING_ADDONS=plone.app.robotframework==2.0.0 plone.app.testing==7.0.0 # Project settings diff --git a/packages/generator-volto/news/5246.feature b/packages/generator-volto/news/5246.feature new file mode 100644 index 0000000000..82ef9a0162 --- /dev/null +++ b/packages/generator-volto/news/5246.feature @@ -0,0 +1 @@ +Update Plone and Volto versions in generators @sneridagh