From f6c02781498ae72816b52d559e74f819ab5bf14a Mon Sep 17 00:00:00 2001 From: lianbenjamin Date: Mon, 3 Mar 2025 14:14:09 +0200 Subject: [PATCH 1/2] feat(FEC-14380): add nonce to style tags --- package.json | 5 ++++- webpack.config.js | 8 +++++++- yarn.lock | 5 +++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index e25789a..151950c 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,7 @@ "@babel/preset-env": "^7.10.4", "@babel/preset-flow": "^7.10.4", "@babel/register": "^7.10.5", + "@playkit-js/kaltura-player-js": "3.17.16-canary.0-db12b53", "babel-eslint": "^10.1.0", "babel-loader": "^8.1.0", "babel-plugin-istanbul": "^6.0.0", @@ -75,7 +76,6 @@ "flow-bin": "^0.129.0", "husky": "^4.2.5", "istanbul": "^0.4.5", - "@playkit-js/kaltura-player-js": "3.17.16-canary.0-db12b53", "karma": "^5.1.0", "karma-chai": "^0.1.0", "karma-chrome-launcher": "^3.1.0", @@ -118,5 +118,8 @@ "dependencies": { "playkit-ui-managers": "1.7.0" } + }, + "dependencies": { + "@playkit-js/webpack-common": "^1.0.1-canary.0-dfd24a9" } } diff --git a/webpack.config.js b/webpack.config.js index 9e9832c..f984d81 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -4,6 +4,7 @@ const webpack = require('webpack'); const path = require('path'); const packageData = require('./package.json'); const CSS_MODULE_PREFIX = 'playkit'; +const {insertStylesWithNonce} = require('@playkit-js/webpack-common'); let plugins = [ new webpack.DefinePlugin({ @@ -57,7 +58,12 @@ module.exports = { use: [ { loader: 'style-loader', - options: {attributes: {id: `${packageData.name}`}} + options: { + attributes: { + id: `${packageData.name}` + }, + insert: insertStylesWithNonce + } }, { loader: 'css-loader', diff --git a/yarn.lock b/yarn.lock index 146152b..a4bddb8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1204,6 +1204,11 @@ js-logger "^1.6.0" ua-parser-js "^1.0.36" +"@playkit-js/webpack-common@^1.0.1-canary.0-dfd24a9": + version "1.0.1-canary.0-dfd24a9" + resolved "https://registry.yarnpkg.com/@playkit-js/webpack-common/-/webpack-common-1.0.1-canary.0-dfd24a9.tgz#e1760b4c10f789c62bfd29a73d873d547b52a25c" + integrity sha512-/dlxA7iKF5/SW9Y282THjFRWW0SjKugg4XZgL6OLdfSvAUKcfNXmtSjiqjDBpcrZP51288DyJhOj2+0Tp+R39A== + "@sindresorhus/is@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" From a7963ce0fc13d4e6d62537aa18e506713b280753 Mon Sep 17 00:00:00 2001 From: lianbenjamin Date: Mon, 3 Mar 2025 15:15:23 +0200 Subject: [PATCH 2/2] update webpack-common version --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 151950c..389d3b8 100644 --- a/package.json +++ b/package.json @@ -120,6 +120,6 @@ } }, "dependencies": { - "@playkit-js/webpack-common": "^1.0.1-canary.0-dfd24a9" + "@playkit-js/webpack-common": "^1.0.1-canary.0-9fd715a" } } diff --git a/yarn.lock b/yarn.lock index a4bddb8..0243eff 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1204,10 +1204,10 @@ js-logger "^1.6.0" ua-parser-js "^1.0.36" -"@playkit-js/webpack-common@^1.0.1-canary.0-dfd24a9": - version "1.0.1-canary.0-dfd24a9" - resolved "https://registry.yarnpkg.com/@playkit-js/webpack-common/-/webpack-common-1.0.1-canary.0-dfd24a9.tgz#e1760b4c10f789c62bfd29a73d873d547b52a25c" - integrity sha512-/dlxA7iKF5/SW9Y282THjFRWW0SjKugg4XZgL6OLdfSvAUKcfNXmtSjiqjDBpcrZP51288DyJhOj2+0Tp+R39A== +"@playkit-js/webpack-common@^1.0.1-canary.0-9fd715a": + version "1.0.1-canary.0-9fd715a" + resolved "https://registry.yarnpkg.com/@playkit-js/webpack-common/-/webpack-common-1.0.1-canary.0-9fd715a.tgz#b2ad08a69f2366da99a4797cb53ab38f8db5afe9" + integrity sha512-ctYW6lkFxGvZlS826GE7z4d1dcuoTJ3TkcuLe8LWsETQc1jhOW8IT5k261TO1S+ZWsVVDX7YzwCEnGWJbQTdAg== "@sindresorhus/is@^0.7.0": version "0.7.0"