From dbc00d113f92c794acb942f06616a5ca031dce2d Mon Sep 17 00:00:00 2001 From: Jarek Radosz Date: Thu, 1 Feb 2024 13:00:32 +0100 Subject: [PATCH] DEV: Update content-tag to 2.0.0 (#25520) --- ...content-tag+1.2.2.patch => content-tag+2.0.0.patch} | 10 ++++++---- app/assets/javascripts/theme-transpiler/package.json | 2 +- app/assets/javascripts/yarn-ember3.lock | 7 ++++++- app/assets/javascripts/yarn-ember5.lock | 7 ++++++- 4 files changed, 19 insertions(+), 7 deletions(-) rename app/assets/javascripts/patches/{content-tag+1.2.2.patch => content-tag+2.0.0.patch} (83%) diff --git a/app/assets/javascripts/patches/content-tag+1.2.2.patch b/app/assets/javascripts/patches/content-tag+2.0.0.patch similarity index 83% rename from app/assets/javascripts/patches/content-tag+1.2.2.patch rename to app/assets/javascripts/patches/content-tag+2.0.0.patch index 825ecf06486..94f1455a441 100644 --- a/app/assets/javascripts/patches/content-tag+1.2.2.patch +++ b/app/assets/javascripts/patches/content-tag+2.0.0.patch @@ -1,18 +1,20 @@ diff --git a/node_modules/content-tag/pkg/standalone.js b/node_modules/content-tag/pkg/standalone.js -index 0df00d7..c19b607 100644 +index 7be08fc..35777bf 100644 --- a/node_modules/content-tag/pkg/standalone.js +++ b/node_modules/content-tag/pkg/standalone.js -@@ -1,5 +1,6 @@ +@@ -1,7 +1,8 @@ -import init from "./standalone/content_tag.js"; +import { initSync } from "./standalone/content_tag.js"; +import module from "./standalone/content_tag_bg.wasm"; + import { Preprocessor as WasmPreprocessor } from "./standalone/content_tag.js"; -await init(); +initSync(module); - export { Preprocessor } from "./standalone/content_tag.js"; + const defaultOptions = { + inline_source_map: false, diff --git a/node_modules/content-tag/pkg/standalone/content_tag.js b/node_modules/content-tag/pkg/standalone/content_tag.js -index 70545cf..e6eb36b 100644 +index aaefe00..9374f10 100644 --- a/node_modules/content-tag/pkg/standalone/content_tag.js +++ b/node_modules/content-tag/pkg/standalone/content_tag.js @@ -20,6 +20,7 @@ function takeObject(idx) { diff --git a/app/assets/javascripts/theme-transpiler/package.json b/app/assets/javascripts/theme-transpiler/package.json index 143f3605ed4..47bd93594d6 100644 --- a/app/assets/javascripts/theme-transpiler/package.json +++ b/app/assets/javascripts/theme-transpiler/package.json @@ -10,7 +10,7 @@ "@babel/standalone": "^7.23.10", "@zxing/text-encoding": "^0.9.0", "babel-plugin-ember-template-compilation": "^2.2.1", - "content-tag": "^1.2.2", + "content-tag": "^2.0.0", "discourse-common": "1.0.0", "discourse-widget-hbs": "1.0.0", "ember-cli-htmlbars": "^6.3.0", diff --git a/app/assets/javascripts/yarn-ember3.lock b/app/assets/javascripts/yarn-ember3.lock index d25300e7e9b..5e2c3581a3f 100644 --- a/app/assets/javascripts/yarn-ember3.lock +++ b/app/assets/javascripts/yarn-ember3.lock @@ -4194,11 +4194,16 @@ content-disposition@0.5.4: dependencies: safe-buffer "5.2.1" -content-tag@^1.1.2, content-tag@^1.2.2: +content-tag@^1.1.2: version "1.2.2" resolved "https://registry.yarnpkg.com/content-tag/-/content-tag-1.2.2.tgz#8cbc3cdb9957a81f7c425b138e334330dd6fd78d" integrity sha512-9guqKIx2H+78N17otBpl8yLZbQGL5q1vBO/jDb3gF2JjixtcVpC62jDUNxjVMNoaZ09oxRX84ZOD6VX02qkVvg== +content-tag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/content-tag/-/content-tag-2.0.0.tgz#932e609c800aa85adf0a4ef07b86d91dd1492c0a" + integrity sha512-4P7sbMEX37J0yBS/b4HZn3cQCI+w+CR7URiA7KRSBSuI8P/bFuxu7Y1srfbV9BWTCXwyVGxXo1lIpNTGL0FQUQ== + content-type@~1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" diff --git a/app/assets/javascripts/yarn-ember5.lock b/app/assets/javascripts/yarn-ember5.lock index 2010f658c29..c6be08427c4 100644 --- a/app/assets/javascripts/yarn-ember5.lock +++ b/app/assets/javascripts/yarn-ember5.lock @@ -4351,11 +4351,16 @@ content-disposition@0.5.4: dependencies: safe-buffer "5.2.1" -content-tag@^1.1.2, content-tag@^1.2.2: +content-tag@^1.1.2: version "1.2.2" resolved "https://registry.yarnpkg.com/content-tag/-/content-tag-1.2.2.tgz#8cbc3cdb9957a81f7c425b138e334330dd6fd78d" integrity sha512-9guqKIx2H+78N17otBpl8yLZbQGL5q1vBO/jDb3gF2JjixtcVpC62jDUNxjVMNoaZ09oxRX84ZOD6VX02qkVvg== +content-tag@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/content-tag/-/content-tag-2.0.0.tgz#932e609c800aa85adf0a4ef07b86d91dd1492c0a" + integrity sha512-4P7sbMEX37J0yBS/b4HZn3cQCI+w+CR7URiA7KRSBSuI8P/bFuxu7Y1srfbV9BWTCXwyVGxXo1lIpNTGL0FQUQ== + content-type@~1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"