From 26e4ed3b3358c2983dc4c8728812fd44a6c200c8 Mon Sep 17 00:00:00 2001 From: Marleen Jattke Date: Tue, 5 Dec 2023 12:45:28 +0100 Subject: [PATCH] bump to 1.2.0 --- CHANGELOG.md | 13 +++++++++ package-lock.json | 50 ++++++++++++++++----------------- package.json | 6 ++-- templates/landingpage/design.js | 2 ++ templates/website/design.js | 2 ++ webpack.config.js | 21 ++++++-------- 6 files changed, 54 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c44b885..24a5f82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.2.0] - 05.12.2023 + +### Added +* Slot finder element +* Webcam image upload element +* Language switch for websites with multiple languages +* Build config of templates designed for CX 23.2 and above + +### Changed +* Fixed bug for website navigation with more than 1 level +* Updated dependencies + +[1.2.0]: https://github.com/bsi-software/bsi-cx-design-master-template-web/releases/tag/1.2.0 ## [1.1.8] - 22.09.2023 diff --git a/package-lock.json b/package-lock.json index 53ad897..c072e6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "@bsi-cx/design-master-template-web", - "version": "1.1.8", + "version": "1.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@bsi-cx/design-master-template-web", - "version": "1.1.8", + "version": "1.2.0", "license": "MIT", "dependencies": { - "@bsi-cx/design-standard-library-web": "^1.2.3" + "@bsi-cx/design-standard-library-web": "^1.3.0" }, "devDependencies": { - "@bsi-cx/design-build": "^1.13.0" + "@bsi-cx/design-build": "^1.13.1" } }, "node_modules/@ampproject/remapping": { @@ -1839,41 +1839,41 @@ "optional": true }, "node_modules/@bsi-cx/design-build": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@bsi-cx/design-build/-/design-build-1.13.0.tgz", - "integrity": "sha512-OwMwAK+hegMMG3IpVYYBvTUBfjG/OYiaEofV1qQwvgTx/lTSMAs6wq4l9DWV8cLXDJyDwcVUTs4LBYN3tyYNTQ==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/@bsi-cx/design-build/-/design-build-1.13.1.tgz", + "integrity": "sha512-5vtHs4wmBF6EcEcAU3hIx0ZHFH4aKRxHjrk2XFMpaaeSjOJEPOb9ZbyFn2WhYKTFNFU3XgBQ9SzDxM6MrlwaHg==", "dev": true, "dependencies": { - "@babel/core": "^7.22.1", - "@babel/plugin-transform-runtime": "^7.22.4", - "@babel/preset-env": "^7.22.4", - "@babel/preset-react": "^7.22.3", - "@babel/register": "^7.21.0", - "@babel/runtime": "^7.22.3", + "@babel/core": "^7.23.0", + "@babel/plugin-transform-runtime": "^7.22.15", + "@babel/preset-env": "^7.22.20", + "@babel/preset-react": "^7.22.15", + "@babel/register": "^7.22.15", + "@babel/runtime": "^7.23.1", "@ofabel/twing": "^5.1.4", "babel-loader": "^8.3.0", "copy-webpack-plugin": "^9.1.0", "css-loader": "^6.8.1", "cssnano": "^5.1.15", - "fast-glob": "^3.2.12", - "handlebars": "^4.7.7", + "fast-glob": "^3.3.1", + "handlebars": "^4.7.8", "is-port-reachable": "^4.0.0", - "less": "^4.1.3", + "less": "^4.2.0", "less-loader": "^10.2.0", "mini-css-extract-plugin": "^2.7.6", - "postcss": "^8.4.24", + "postcss": "^8.4.31", "postcss-loader": "^6.2.1", "postcss-preset-env": "^7.8.3", "ref-loader": "^1.0.3", - "sass": "^1.62.1", + "sass": "^1.69.2", "sass-loader": "^12.6.0", "slugify": "^1.6.6", "source-map-support": "^0.5.21", "terser-webpack-plugin": "^5.3.9", "wait-on": "^7.0.1", - "webpack": "^5.84.1", + "webpack": "^5.88.2", "webpack-cli": "^4.10.0", - "webpack-dev-server": "^4.15.0", + "webpack-dev-server": "^4.15.1", "zip-webpack-plugin": "^4.0.1" }, "engines": { @@ -1881,17 +1881,18 @@ } }, "node_modules/@bsi-cx/design-standard-library-web": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@bsi-cx/design-standard-library-web/-/design-standard-library-web-1.2.3.tgz", - "integrity": "sha512-jzPyjjyqGDP3tvOkpApLymduUWEBLTLEMk1E2PhD0xok1AZzClvnN4l29d+txxvZGsojSPpEEkWuPBKTkY8FkQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@bsi-cx/design-standard-library-web/-/design-standard-library-web-1.3.0.tgz", + "integrity": "sha512-y0RFxmE73Qqdf65q+GyvDXxQAK47GtMuoNXdNs/OQm112GFoU6Hn51wXEFAnjygajD3Ci8s0R7TVawvWBS7gDg==", "dependencies": { "@bsi-cx/chart": "github:bsi-software/bsi-cx-chart#semver:1.3.0", + "@popperjs/core": "^2.11.8", "alpinejs": "^3.10.3", "bootstrap": "^5.2.1", "bootstrap-icons": "^1.9.1", "chart.js": "^4.2.1", "flatpickr": "^4.6.10", - "intl-tel-input": "^18.1.5" + "intl-tel-input": "^18.2.1" } }, "node_modules/@csstools/postcss-cascade-layers": { @@ -2340,7 +2341,6 @@ "version": "2.11.8", "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", - "peer": true, "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" diff --git a/package.json b/package.json index f9a6aeb..ca62ae6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@bsi-cx/design-master-template-web", - "version": "1.1.8", + "version": "1.2.0", "description": "BSI CX master template for websites and landing pages", "scripts": { "build:dev": "webpack --config webpack.config.js --mode development --progress", @@ -32,9 +32,9 @@ } ], "dependencies": { - "@bsi-cx/design-standard-library-web": "^1.2.3" + "@bsi-cx/design-standard-library-web": "^1.3.0" }, "devDependencies": { - "@bsi-cx/design-build": "^1.13.0" + "@bsi-cx/design-build": "^1.13.1" } } diff --git a/templates/landingpage/design.js b/templates/landingpage/design.js index 863e183..33e23f3 100644 --- a/templates/landingpage/design.js +++ b/templates/landingpage/design.js @@ -49,6 +49,8 @@ module.exports = cx.design require('@bsi-cx/design-standard-library-web/content-elements/base/video'), require('@bsi-cx/design-standard-library-web/content-elements/base/social-media-follow'), require('@bsi-cx/design-standard-library-web/content-elements/base/social-media-share'), + require('@bsi-cx/design-standard-library-web/content-elements/advanced/webcam-image-upload'), + require('@bsi-cx/design-standard-library-web/content-elements/base/slot-finder'), require('@bsi-cx/design-standard-library-web/content-elements/base/chart'), require('@bsi-cx/design-standard-library-web/content-elements/base/html')), cx.contentElementGroup diff --git a/templates/website/design.js b/templates/website/design.js index 4897e3a..c3ae577 100644 --- a/templates/website/design.js +++ b/templates/website/design.js @@ -49,6 +49,8 @@ module.exports = cx.design require('@bsi-cx/design-standard-library-web/content-elements/base/video'), require('@bsi-cx/design-standard-library-web/content-elements/base/social-media-follow'), require('@bsi-cx/design-standard-library-web/content-elements/base/social-media-share'), + require('@bsi-cx/design-standard-library-web/content-elements/advanced/webcam-image-upload'), + require('@bsi-cx/design-standard-library-web/content-elements/base/slot-finder'), require('@bsi-cx/design-standard-library-web/content-elements/base/chart'), require('@bsi-cx/design-standard-library-web/content-elements/base/html')), cx.contentElementGroup diff --git a/webpack.config.js b/webpack.config.js index 1d6a104..d38a828 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,5 +1,5 @@ const path = require('path'); -var package = require('./package.json'); +const package = require('./package.json'); const {BuildConfig, WebpackConfigBuilder, Version, DesignType, ModuleConfig} = require('@bsi-cx/design-build'); @@ -36,27 +36,24 @@ module.exports = WebpackConfigBuilder.fromConfigs( .withName('master-template-cx-1.3-website-de') .withTargetVersion(Version.CX_1_3) .withPropertiesFilePath(path.resolve(__dirname, 'properties-de.js')), - /*websiteBuildConfig.clone() - .withName('master-template-cx-1.3-website-en') - .withTargetVersion(Version.CX_1_3) - .withPropertiesFilePath(path.resolve(__dirname, 'properties-en.js')),*/ websiteBuildConfig.clone() .withName('master-template-cx-22.0-website-de') .withPropertiesFilePath(path.resolve(__dirname, 'properties-de.js')), - /*websiteBuildConfig.clone() - .withName('master-template-cx-22.0-website-en') - .withPropertiesFilePath(path.resolve(__dirname, 'properties-en.js')),*/ + websiteBuildConfig.clone() + .withName('master-template-cx-23.2-website-de') + .withTargetVersion(Version.CX_23_2) + .withPropertiesFilePath(path.resolve(__dirname, 'properties-de.js')), landingpageBuildConfig.clone() .withName('master-template-cx-1.3-landingpage-de') .withTargetVersion(Version.CX_1_3) .withPropertiesFilePath(path.resolve(__dirname, 'properties-de.js')), - /*landingpageBuildConfig.clone() - .withName('master-template-cx-1.3-landingpage-en') - .withTargetVersion(Version.CX_1_3) - .withPropertiesFilePath(path.resolve(__dirname, 'properties-en.js')),*/ landingpageBuildConfig.clone() .withName('master-template-cx-22.0-landingpage-de') .withPropertiesFilePath(path.resolve(__dirname, 'properties-de.js')), + landingpageBuildConfig.clone() + .withName('master-template-cx-23.2-landingpage-de') + .withTargetVersion(Version.CX_23_2) + .withPropertiesFilePath(path.resolve(__dirname, 'properties-de.js')) /*landingpageBuildConfig.clone() .withName('master-template-cx-22.0-landingpage-en') .withPropertiesFilePath(path.resolve(__dirname, 'properties-en.js'))*/); \ No newline at end of file