diff --git a/package-lock.json b/package-lock.json index f1375767d31..26bb476dbe7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -455,9 +455,15 @@ } }, "@babel/plugin-proposal-optional-chaining": { + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + "version": "7.13.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz", + "integrity": "sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ==", + ======= "version": "7.13.12", "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz", "integrity": "sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==", + >>>>>>> master "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.13.0", @@ -770,6 +776,7 @@ "version": "7.13.0", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz", "integrity": "sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==", + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 "dev": true, "requires": { "@babel/helper-module-transforms": "^7.13.0", @@ -782,6 +789,20 @@ "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==", "dev": true, "requires": { + ======= + "dev": true, + "requires": { + "@babel/helper-module-transforms": "^7.13.0", + "@babel/helper-plugin-utils": "^7.13.0" + } + }, + "@babel/plugin-transform-named-capturing-groups-regex": { + "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz", + "integrity": "sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==", + "dev": true, + "requires": { + >>>>>>> master "@babel/helper-create-regexp-features-plugin": "^7.12.13" } }, @@ -906,6 +927,17 @@ } }, "@babel/preset-env": { + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + "version": "7.13.10", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.10.tgz", + "integrity": "sha512-nOsTScuoRghRtUsRr/c69d042ysfPHcu+KOB4A9aAO9eJYqrkat+LF8G1yp1HD18QiwixT2CisZTr/0b3YZPXQ==", + "dev": true, + "requires": { + "@babel/compat-data": "^7.13.8", + "@babel/helper-compilation-targets": "^7.13.10", + "@babel/helper-plugin-utils": "^7.13.0", + "@babel/helper-validator-option": "^7.12.17", + ======= "version": "7.13.12", "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.13.12.tgz", "integrity": "sha512-JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA==", @@ -916,6 +948,7 @@ "@babel/helper-plugin-utils": "^7.13.0", "@babel/helper-validator-option": "^7.12.17", "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.13.12", + >>>>>>> master "@babel/plugin-proposal-async-generator-functions": "^7.13.8", "@babel/plugin-proposal-class-properties": "^7.13.0", "@babel/plugin-proposal-dynamic-import": "^7.13.8", @@ -926,7 +959,11 @@ "@babel/plugin-proposal-numeric-separator": "^7.12.13", "@babel/plugin-proposal-object-rest-spread": "^7.13.8", "@babel/plugin-proposal-optional-catch-binding": "^7.13.8", + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + "@babel/plugin-proposal-optional-chaining": "^7.13.8", + ======= "@babel/plugin-proposal-optional-chaining": "^7.13.12", + >>>>>>> master "@babel/plugin-proposal-private-methods": "^7.13.0", "@babel/plugin-proposal-unicode-property-regex": "^7.12.13", "@babel/plugin-syntax-async-generators": "^7.8.4", @@ -974,7 +1011,11 @@ "@babel/plugin-transform-unicode-escapes": "^7.12.13", "@babel/plugin-transform-unicode-regex": "^7.12.13", "@babel/preset-modules": "^0.1.4", + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + "@babel/types": "^7.13.0", + ======= "@babel/types": "^7.13.12", + >>>>>>> master "babel-plugin-polyfill-corejs2": "^0.1.4", "babel-plugin-polyfill-corejs3": "^0.1.3", "babel-plugin-polyfill-regenerator": "^0.1.2", @@ -982,6 +1023,8 @@ "semver": "^6.3.0" }, "dependencies": { + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + ======= "@babel/compat-data": { "version": "7.13.12", "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz", @@ -999,6 +1042,7 @@ "to-fast-properties": "^2.0.0" } }, + >>>>>>> master "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -3332,9 +3376,15 @@ "dev": true }, "regjsparser": { + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + "version": "0.6.7", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.7.tgz", + "integrity": "sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==", + ======= "version": "0.6.9", "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz", "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==", + >>>>>>> master "dev": true, "requires": { "jsesc": "~0.5.0" @@ -4216,9 +4266,15 @@ } }, "webpack": { + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + "version": "5.26.3", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.26.3.tgz", + "integrity": "sha512-z/F2lt2N1fZqaud1B4SzjL3OW03eULThbBXQ2OX4LSrZX4N9k1A5d0Rje3zS2g887DTWyAV0KGqEf64ois2dhg==", + ======= "version": "5.28.0", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.28.0.tgz", "integrity": "sha512-1xllYVmA4dIvRjHzwELgW4KjIU1fW4PEuEnjsylz7k7H5HgPOctIq7W1jrt3sKH9yG5d72//XWzsHhfoWvsQVg==", + >>>>>>> master "dev": true, "requires": { "@types/eslint-scope": "^3.7.0", @@ -4246,6 +4302,34 @@ "webpack-sources": "^2.1.1" }, "dependencies": { + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + "browserslist": { + "version": "4.16.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz", + "integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001181", + "colorette": "^1.2.1", + "electron-to-chromium": "^1.3.649", + "escalade": "^3.1.1", + "node-releases": "^1.1.70" + } + }, + "caniuse-lite": { + "version": "1.0.30001202", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001202.tgz", + "integrity": "sha512-ZcijQNqrcF8JNLjzvEiXqX4JUYxoZa7Pvcsd9UD8Kz4TvhTonOSNRsK+qtvpVL4l6+T1Rh4LFtLfnNWg6BGWCQ==", + "dev": true + }, + "electron-to-chromium": { + "version": "1.3.691", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.691.tgz", + "integrity": "sha512-ZqiO69KImmOGCyoH0icQPU3SndJiW93juEvf63gQngyhODO6SpQIPMTOHldtCs5DS5GMKvAkquk230E2zt2vpw==", + "dev": true + }, + ======= + >>>>>>> master "enhanced-resolve": { "version": "5.7.0", "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.7.0.tgz", @@ -4262,6 +4346,21 @@ "integrity": "sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==", "dev": true }, + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + "node-releases": { + "version": "1.1.71", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz", + "integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==", + "dev": true + }, + "source-list-map": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", + "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", + "dev": true + }, + ======= + >>>>>>> master "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", diff --git a/package.json b/package.json index 9365dc1a071..a2cf69089fb 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,17 @@ }, "devDependencies": { "@babel/core": "^7.13.10", + <<<<<<< dependabot/bundler/src-api/redcarpet-3.5.1 + "@babel/preset-env": "^7.13.10", + "babel-loader": "^8.2.2", + "uglifyjs-webpack-plugin": "^1.3.0", + "webpack": "^5.26.3", + ======= "@babel/preset-env": "^7.13.12", "babel-loader": "^8.2.2", "uglifyjs-webpack-plugin": "^1.3.0", "webpack": "^5.28.0", + >>>>>>> master "webpack-cli": "^3.1.0" } } diff --git a/src-api/Gemfile b/src-api/Gemfile index 274072d4afb..8c6f92faf6e 100644 --- a/src-api/Gemfile +++ b/src-api/Gemfile @@ -7,6 +7,6 @@ gem 'middleman-syntax', '~> 3.0.0' gem 'middleman-autoprefixer', '~> 2.7.0' gem 'middleman-sprockets', '~> 4.1.0' gem 'rouge', '~> 2.0.5' -gem 'redcarpet', '~> 3.4.0' +gem 'redcarpet', '~> 3.5.1' gem 'nokogiri', '~> 1.10.8' gem "therubyracer" diff --git a/src-api/Gemfile.lock b/src-api/Gemfile.lock index 26eae7ca2e4..c118f86f530 100644 --- a/src-api/Gemfile.lock +++ b/src-api/Gemfile.lock @@ -97,7 +97,7 @@ GEM rb-fsevent (0.9.8) rb-inotify (0.9.8) ffi (>= 0.5.0) - redcarpet (3.4.0) + redcarpet (3.5.1) ref (2.0.0) rouge (2.0.7) sass (3.4.23) @@ -126,7 +126,7 @@ DEPENDENCIES middleman-sprockets (~> 4.1.0) middleman-syntax (~> 3.0.0) nokogiri (~> 1.10.8) - redcarpet (~> 3.4.0) + redcarpet (~> 3.5.1) rouge (~> 2.0.5) therubyracer