*)[\s\S]*?(<\/ins> *<\/div>)/ig, "$1Macro alias: $2$3");
- */
-
- var aceEditor = {
- content: args.editor.getContent(),
- view: 'views/propertyeditors/rte/codeeditor.html',
- submit: function (model) {
- args.editor.setContent(model.content);
- args.editor.fire('Change');
- editorService.close();
- },
- close: function () {
- editorService.close();
- }
- };
-
- editorService.open(aceEditor);
+ if (tmpLocation) {
+ sizeImageInEditor(args.editor, imageElement);
+ args.editor.dom.setAttrib(imageElement, "data-tmpimg", tmpLocation);
+ }
});
+ });
}
- };
+ if (Umbraco.Sys.ServerVariables.umbracoSettings.sanitizeTinyMce === true) {
+ /** prevent injecting arbitrary JavaScript execution in on-attributes. */
+ const allNodes = Array.prototype.slice.call(args.editor.dom.doc.getElementsByTagName("*"));
+ allNodes.forEach(node => {
+ for (var i = 0; i < node.attributes.length; i++) {
+ if (node.attributes[i].name.indexOf("on") === 0) {
+ node.removeAttribute(node.attributes[i].name)
+ }
+ }
+ });
+ }
+
+ });
+
+ args.editor.on('init', function () {
+
+ if (args.model.value) {
+ args.editor.setContent(args.model.value);
+ }
+
+ //enable browser based spell checking
+ args.editor.getBody().setAttribute('spellcheck', true);
+
+ /** Setup sanitization for preventing injecting arbitrary JavaScript execution in attributes:
+ * https://github.com/advisories/GHSA-w7jx-j77m-wp65
+ * https://github.com/advisories/GHSA-5vm8-hhgr-jcjp
+ */
+ const uriAttributesToSanitize = ['src', 'href', 'data', 'background', 'action', 'formaction', 'poster', 'xlink:href'];
+ const parseUri = function () {
+ // Encapsulated JS logic.
+ const safeSvgDataUrlElements = ['img', 'video'];
+ const scriptUriRegExp = /((java|vb)script|mhtml):/i;
+ const trimRegExp = /[\s\u0000-\u001F]+/g;
+ const isInvalidUri = (uri, tagName) => {
+ if (/^data:image\//i.test(uri)) {
+ return safeSvgDataUrlElements.indexOf(tagName) !== -1 && /^data:image\/svg\+xml/i.test(uri);
+ } else {
+ return /^data:/i.test(uri);
+ }
+ };
+
+ return function parseUri(uri, tagName) {
+ uri = uri.replace(trimRegExp, '');
+ try {
+ // Might throw malformed URI sequence
+ uri = decodeURIComponent(uri);
+ } catch (ex) {
+ // Fallback to non UTF-8 decoder
+ uri = unescape(uri);
+ }
+
+ if (scriptUriRegExp.test(uri)) {
+ return;
+ }
+
+ if (isInvalidUri(uri, tagName)) {
+ return;
+ }
+
+ return uri;
+ }
+ }();
+
+ if (Umbraco.Sys.ServerVariables.umbracoSettings.sanitizeTinyMce === true) {
+ args.editor.serializer.addAttributeFilter(uriAttributesToSanitize, function (nodes) {
+ nodes.forEach(function (node) {
+ node.attributes.forEach(function (attr) {
+ const attrName = attr.name.toLowerCase();
+ if (uriAttributesToSanitize.indexOf(attrName) !== -1) {
+ attr.value = parseUri(attr.value, node.name);
+ }
+ });
+ });
+ });
+ }
+
+ //start watching the value
+ startWatch();
+ });
+
+ args.editor.on('Change', function (e) {
+ syncContent();
+ });
+ args.editor.on('Keyup', function (e) {
+ syncContent();
+ });
+
+ //when we leave the editor (maybe)
+ args.editor.on('blur', function (e) {
+ syncContent();
+ });
+
+ // When the element is removed from the DOM, we need to terminate
+ // any active watchers to ensure scopes are disposed and do not leak.
+ // No need to sync content as that has already happened.
+ args.editor.on('remove', () => stopWatch());
+
+ args.editor.on('ObjectResized', function (e) {
+ var srcAttr = $(e.target).attr("src");
+
+ if (!srcAttr) {
+ return;
+ }
+
+ var path = srcAttr.split("?")[0];
+ mediaHelper.getProcessedImageUrl(path, {
+ width: e.width,
+ height: e.height,
+ mode: "max"
+ }).then(function (resizedPath) {
+ $(e.target).attr("data-mce-src", resizedPath);
+ });
+
+ syncContent();
+ });
+
+ args.editor.on('Dirty', function (e) {
+ syncContent(); // Set model.value to the RTE's content
+ });
+
+ let self = this;
+
+ //create link picker
+ self.createLinkPicker(args.editor, function (currentTarget, anchorElement) {
+
+ entityResource.getAnchors(args.model.value).then(anchorValues => {
+
+ const linkPicker = {
+ currentTarget: currentTarget,
+ dataTypeKey: args.model.dataTypeKey,
+ ignoreUserStartNodes: args.model.config.ignoreUserStartNodes,
+ anchors: anchorValues,
+ size: args.model.config.overlaySize,
+ submit: model => {
+ self.insertLinkInEditor(args.editor, model.target, anchorElement);
+ editorService.close();
+ },
+ close: () => {
+ editorService.close();
+ }
+ };
+
+ editorService.linkPicker(linkPicker);
+ });
+
+ });
+
+ //Create the insert media plugin
+ self.createMediaPicker(args.editor, function (currentTarget, userData, imgDomElement) {
+
+ var startNodeId, startNodeIsVirtual;
+ if (!args.model.config.startNodeId) {
+ if (args.model.config.ignoreUserStartNodes === true) {
+ startNodeId = -1;
+ startNodeIsVirtual = true;
+ }
+ else {
+ startNodeId = userData.startMediaIds.length !== 1 ? -1 : userData.startMediaIds[0];
+ startNodeIsVirtual = userData.startMediaIds.length !== 1;
+ }
+ }
+
+ var mediaPicker = {
+ currentTarget: currentTarget,
+ onlyImages: true,
+ showDetails: true,
+ disableFolderSelect: true,
+ disableFocalPoint: true,
+ startNodeId: startNodeId,
+ startNodeIsVirtual: startNodeIsVirtual,
+ dataTypeKey: args.model.dataTypeKey,
+ submit: function (model) {
+ self.insertMediaInEditor(args.editor, model.selection[0], imgDomElement);
+ editorService.close();
+ },
+ close: function () {
+ editorService.close();
+ }
+ };
+ editorService.mediaPicker(mediaPicker);
+ });
+
+ //Create the embedded plugin
+ self.createInsertEmbeddedMedia(args.editor, function (activeElement, modify) {
+ var embed = {
+ modify: modify,
+ submit: function (model) {
+ self.insertEmbeddedMediaInEditor(args.editor, model.embed, activeElement);
+ editorService.close();
+ },
+ close: function () {
+ editorService.close();
+ }
+ };
+ editorService.embed(embed);
+ });
+
+ //Create the insert macro plugin
+ self.createInsertMacro(args.editor, function (dialogData) {
+ var macroPicker = {
+ dialogData: dialogData,
+ submit: function (model) {
+ var macroObject = macroService.collectValueData(model.selectedMacro, model.macroParams, dialogData.renderingEngine);
+ self.insertMacroInEditor(args.editor, macroObject, dialogData.activeMacroElement);
+ editorService.close();
+ },
+ close: function () {
+ editorService.close();
+ }
+ };
+ editorService.macroPicker(macroPicker);
+ });
+
+ self.createAceCodeEditor(args.editor, function () {
+
+ // TODO: CHECK TO SEE WHAT WE NEED TO DO WIT MACROS (See code block?)
+ /*
+ var html = editor.getContent({source_view: true});
+ html = html.replace(/]*)>([^<]*)<\/span>/gm, String.fromCharCode(chr));
+ editor.dom.remove(editor.dom.select('.CmCaReT'));
+ html = html.replace(/(
*)[\s\S]*?(<\/ins> *<\/div>)/ig, "$1Macro alias: $2$3");
+ */
+
+ var aceEditor = {
+ content: args.editor.getContent(),
+ view: 'views/propertyeditors/rte/codeeditor.html',
+ submit: function (model) {
+ args.editor.setContent(model.content);
+ args.editor.dispatch('Change');
+ editorService.close();
+ },
+ close: function () {
+ editorService.close();
+ }
+ };
+
+ editorService.open(aceEditor);
+ });
+
+ }
+
+ };
}
angular.module('umbraco.services').factory('tinyMceService', tinyMceService);
diff --git a/src/Umbraco.Web.UI.Client/src/less/rte.less b/src/Umbraco.Web.UI.Client/src/less/rte.less
index f9406c72b8..8ff4d128ed 100644
--- a/src/Umbraco.Web.UI.Client/src/less/rte.less
+++ b/src/Umbraco.Web.UI.Client/src/less/rte.less
@@ -140,6 +140,13 @@
}
}
+.tox-tinymce-inline {
+ z-index: 999;
+}
+
+.tox-tinymce-fullscreen {
+ position: absolute;
+}
.mce-menu {
border-radius: 3px;
@@ -170,16 +177,3 @@
border: 1px solid @gray-8;
max-width: none;
}
-
-.mce-fullscreen {
- position: absolute;
-
- .mce-in {
- position: fixed;
- top: 35px !important;
- }
-
- umb-editor__overlay, .umb-editor {
- position: fixed;
- }
-}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index de93b8470a..765a5164b0 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -15,10 +15,6 @@ angular.module("umbraco")
if (!editorConfig || Utilities.isString(editorConfig)) {
editorConfig = tinyMceService.defaultPrevalues();
}
- //make sure there's a max image size
- if (!editorConfig.maxImageSize && editorConfig.maxImageSize !== 0) {
- editorConfig.maxImageSize = tinyMceService.defaultPrevalues().maxImageSize;
- }
var width = editorConfig.dimensions ? parseInt(editorConfig.dimensions.width, 10) || null : null;
var height = editorConfig.dimensions ? parseInt(editorConfig.dimensions.height, 10) || null : null;
@@ -81,6 +77,7 @@ angular.module("umbraco")
//initialize the standard editor functionality for Umbraco
tinyMceService.initializeEditor({
editor: editor,
+ toolbar: editorConfig.toolbar,
model: $scope.model,
currentFormInput: $scope.rteForm.modelValue
});
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
index 96de0cd040..0926efd6a4 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
@@ -40,8 +40,9 @@
diff --git a/src/Umbraco.Web.UI/appsettings.Development.template.json b/src/Umbraco.Web.UI/appsettings.Development.template.json
index 33c5dd2fae..b2bde5bf2d 100644
--- a/src/Umbraco.Web.UI/appsettings.Development.template.json
+++ b/src/Umbraco.Web.UI/appsettings.Development.template.json
@@ -41,18 +41,6 @@
"RuntimeMinification": {
"useInMemoryCache": true,
"cacheBuster": "Timestamp"
- },
- "RichTextEditor": {
- "Commands": [
- {
- "Alias": "fullscreen",
- "Name": "Full Screen",
- "Mode": "All"
- }
- ],
- "Plugins": [
- "fullscreen"
- ]
}
}
}
diff --git a/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
index 9288dd6f72..649d1835f9 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
+++ b/tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
@@ -675,7 +675,7 @@ context('Content', () => {
cy.umbracoTreeItem("content", [viewMacroName]).click();
// Insert macro
- cy.get('#mceu_13-button').click();
+ cy.get('button[title="Insert macro"]').click();
cy.get('.umb-card-grid-item').contains(viewMacroName).click();
// Save and publish
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index e0572c1cb3..223f83c12b 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -2339,10 +2339,16 @@
}
},
"dependencies": {
+ "@colors/colors": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+ "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
+ "dev": true
+ },
"@cypress/request": {
- "version": "2.88.7",
- "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.7.tgz",
- "integrity": "sha512-FTULIP2rnDJvZDT9t6B4nSfYR40ue19tVmv3wUcY05R9/FPCoMl1nAPJkzWzBCo7ltVn5ThQTbxiMoGBN7k0ig==",
+ "version": "2.88.10",
+ "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.10.tgz",
+ "integrity": "sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==",
"dev": true,
"requires": {
"aws-sign2": "~0.7.0",
@@ -2352,8 +2358,7 @@
"extend": "~3.0.2",
"forever-agent": "~0.6.1",
"form-data": "~2.3.2",
- "har-validator": "~5.1.3",
- "http-signature": "~1.2.0",
+ "http-signature": "~1.3.6",
"is-typedarray": "~1.0.0",
"isstream": "~0.1.2",
"json-stringify-safe": "~5.0.1",
@@ -2459,18 +2464,6 @@
}
}
},
- "ajv": {
- "version": "6.12.6",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
- "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
- "dev": true,
- "requires": {
- "fast-deep-equal": "^3.1.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
- }
- },
"ansi-colors": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz",
@@ -2535,9 +2528,9 @@
"dev": true
},
"async": {
- "version": "3.2.2",
- "resolved": "https://registry.npmjs.org/async/-/async-3.2.2.tgz",
- "integrity": "sha512-H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g==",
+ "version": "3.2.3",
+ "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz",
+ "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==",
"dev": true
},
"asynckit": {
@@ -2683,13 +2676,12 @@
}
},
"cli-table3": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.0.tgz",
- "integrity": "sha512-gnB85c3MGC7Nm9I/FkiasNBOKjOiO1RNuXXarQms37q4QMpWdlbBgD/VnOStA2faG1dpXMv31RFApjX1/QdgWQ==",
+ "version": "0.6.2",
+ "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.2.tgz",
+ "integrity": "sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw==",
"dev": true,
"requires": {
- "colors": "^1.1.2",
- "object-assign": "^4.1.0",
+ "@colors/colors": "1.5.0",
"string-width": "^4.2.0"
}
},
@@ -2730,12 +2722,6 @@
"integrity": "sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==",
"dev": true
},
- "colors": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
- "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
- "dev": true
- },
"combined-stream": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -2790,9 +2776,9 @@
}
},
"cy-verify-downloads": {
- "version": "0.0.5",
- "resolved": "https://registry.npmjs.org/cy-verify-downloads/-/cy-verify-downloads-0.0.5.tgz",
- "integrity": "sha512-aRK7VvKG5rmDJK4hjZ27KM2oOOz0cMO7z/j4zX8qCc4ffXZS1XRJkofUY0w5u6MCB/wUsNMs03VuvkeR2tNPoQ==",
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/cy-verify-downloads/-/cy-verify-downloads-0.1.5.tgz",
+ "integrity": "sha512-8iviQ+LhZ9z7bUEfN5YOGqYy292tSDHVDNsz9eaGZ97dVybgx9NhkSyk//2rVXIV97JBIdx8GIeGBBD+JBB27w==",
"dev": true
},
"cycle": {
@@ -2802,9 +2788,9 @@
"dev": true
},
"cypress": {
- "version": "8.4.1",
- "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.4.1.tgz",
- "integrity": "sha512-itJXq0Vx3sXCUrDyBi2IUrkxVu/gTTp1VhjB5tzGgkeCR8Ae+/T8WV63rsZ7fS8Tpq7LPPXiyoM/sEdOX7cR6A==",
+ "version": "8.7.0",
+ "resolved": "https://registry.npmjs.org/cypress/-/cypress-8.7.0.tgz",
+ "integrity": "sha512-b1bMC3VQydC6sXzBMFnSqcvwc9dTZMgcaOzT0vpSD+Gq1yFc+72JDWi55sfUK5eIeNLAtWOGy1NNb6UlhMvB+Q==",
"dev": true,
"requires": {
"@cypress/request": "^2.88.6",
@@ -2841,6 +2827,7 @@
"minimist": "^1.2.5",
"ospath": "^1.2.2",
"pretty-bytes": "^5.6.0",
+ "proxy-from-env": "1.0.0",
"ramda": "~0.27.1",
"request-progress": "^3.0.0",
"supports-color": "^8.1.1",
@@ -3021,12 +3008,6 @@
"integrity": "sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=",
"dev": true
},
- "fast-deep-equal": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
- "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
- "dev": true
- },
"fast-glob": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz",
@@ -3040,12 +3021,6 @@
"micromatch": "^4.0.4"
}
},
- "fast-json-stable-stringify": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
- "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
- "dev": true
- },
"fastq": {
"version": "1.13.0",
"resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
@@ -3196,22 +3171,6 @@
"integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==",
"dev": true
},
- "har-schema": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
- "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
- "dev": true
- },
- "har-validator": {
- "version": "5.1.5",
- "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
- "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
- "dev": true,
- "requires": {
- "ajv": "^6.12.3",
- "har-schema": "^2.0.0"
- }
- },
"has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -3219,14 +3178,14 @@
"dev": true
},
"http-signature": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
- "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "version": "1.3.6",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
+ "integrity": "sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==",
"dev": true,
"requires": {
"assert-plus": "^1.0.0",
- "jsprim": "^1.2.2",
- "sshpk": "^1.7.0"
+ "jsprim": "^2.0.2",
+ "sshpk": "^1.14.1"
}
},
"human-signals": {
@@ -3358,15 +3317,9 @@
"dev": true
},
"json-schema": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
- "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
- "dev": true
- },
- "json-schema-traverse": {
- "version": "0.4.1",
- "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
- "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+ "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
"dev": true
},
"json-stringify-safe": {
@@ -3386,14 +3339,14 @@
}
},
"jsprim": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
- "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz",
+ "integrity": "sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==",
"dev": true,
"requires": {
"assert-plus": "1.0.0",
"extsprintf": "1.3.0",
- "json-schema": "0.2.3",
+ "json-schema": "0.4.0",
"verror": "1.10.0"
}
},
@@ -3500,18 +3453,18 @@
}
},
"mime-db": {
- "version": "1.51.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz",
- "integrity": "sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==",
+ "version": "1.52.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+ "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
"dev": true
},
"mime-types": {
- "version": "2.1.34",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz",
- "integrity": "sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==",
+ "version": "2.1.35",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+ "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
"dev": true,
"requires": {
- "mime-db": "1.51.0"
+ "mime-db": "1.52.0"
}
},
"mimic-fn": {
@@ -3562,12 +3515,6 @@
"path-key": "^3.0.0"
}
},
- "object-assign": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
- "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
- "dev": true
- },
"once": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
@@ -3650,26 +3597,24 @@
"dev": true
},
"prompt": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.2.0.tgz",
- "integrity": "sha512-iGerYRpRUg5ZyC+FJ/25G5PUKuWAGRjW1uOlhX7Pi3O5YygdK6R+KEaBjRbHSkU5vfS5PZCltSPZdDtUYwRCZA==",
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.3.0.tgz",
+ "integrity": "sha512-ZkaRWtaLBZl7KKAKndKYUL8WqNT+cQHKRZnT4RYYms48jQkFw3rrBL+/N5K/KtdEveHkxs982MX2BkDKub2ZMg==",
"dev": true,
"requires": {
- "async": "~0.9.0",
- "colors": "^1.1.2",
+ "@colors/colors": "1.5.0",
+ "async": "3.2.3",
"read": "1.0.x",
"revalidator": "0.1.x",
"winston": "2.x"
- },
- "dependencies": {
- "async": {
- "version": "0.9.2",
- "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
- "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
- "dev": true
- }
}
},
+ "proxy-from-env": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+ "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
+ "dev": true
+ },
"psl": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
@@ -3693,9 +3638,9 @@
"dev": true
},
"qs": {
- "version": "6.5.2",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
- "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+ "version": "6.5.3",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+ "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
"dev": true
},
"querystring": {
@@ -3711,9 +3656,9 @@
"dev": true
},
"ramda": {
- "version": "0.27.1",
- "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.1.tgz",
- "integrity": "sha512-PgIdVpn5y5Yns8vqb8FzBUEYn98V3xcPgawAkkgj0YJ0qDsnHCiNmZYfOGMgOvoB0eWFLpYbhxUR3mxfDIMvpw==",
+ "version": "0.27.2",
+ "resolved": "https://registry.npmjs.org/ramda/-/ramda-0.27.2.tgz",
+ "integrity": "sha512-SbiLPU40JuJniHexQSAgad32hfwd+DRUdwF2PlVuI5RZD0/vahUco7R8vD86J/tcEKKF9vZrUVwgtmGCqlCKyA==",
"dev": true
},
"read": {
@@ -3834,9 +3779,9 @@
}
},
"sshpk": {
- "version": "1.16.1",
- "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
- "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+ "version": "1.17.0",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
+ "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
"dev": true,
"requires": {
"asn1": "~0.2.3",
@@ -3959,9 +3904,9 @@
"dev": true
},
"typescript": {
- "version": "3.9.10",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz",
- "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q=="
+ "version": "4.6.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz",
+ "integrity": "sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw=="
},
"umbraco-cypress-testhelpers": {
"version": "1.0.0-beta-73",
@@ -3985,15 +3930,6 @@
"integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
"dev": true
},
- "uri-js": {
- "version": "4.4.1",
- "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
- "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
- "dev": true,
- "requires": {
- "punycode": "^2.1.0"
- }
- },
"url": {
"version": "0.11.0",
"resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 45ef9bef67..34c82f4441 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -7,16 +7,20 @@
"test": "npx cypress run",
"ui": "npx cypress open"
},
+ "engines": {
+ "node": ">=14.0.0 <17",
+ "npm": ">=8.0.0 < 9"
+ },
"devDependencies": {
- "cross-env": "^7.0.2",
- "cypress": "8.4.1",
- "cy-verify-downloads": "0.0.5",
+ "cross-env": "^7.0.3",
+ "cypress": "8.7.0",
+ "cy-verify-downloads": "0.1.5",
"del": "^6.0.0",
"ncp": "^2.0.0",
"prompt": "^1.2.0",
"umbraco-cypress-testhelpers": "^1.0.0-beta-73"
},
"dependencies": {
- "typescript": "^3.9.2"
+ "typescript": "^4.6.3"
}
}
diff --git a/tests/Umbraco.Tests.AcceptanceTest/tsconfig.json b/tests/Umbraco.Tests.AcceptanceTest/tsconfig.json
index 96178bfc54..2c71b50b6a 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/tsconfig.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/tsconfig.json
@@ -1,37 +1,36 @@
{
- "compileOnSave": false,
- "compilerOptions": {
- "baseUrl": "./",
- "outDir": "./lib",
- "sourceMap": false,
- "declaration": true,
- "module": "CommonJS",
- "moduleResolution": "node",
- "emitDecoratorMetadata": true,
- "experimentalDecorators": true,
- "esModuleInterop": true,
- "importHelpers": true,
- "target": "es5",
-
- "types": [
- "cypress",
- "cy-verify-downloads"
- ],
- "lib": [
- "es5",
- "dom"
- ],
- "plugins": [
- {
- "name": "typescript-tslint-plugin",
- "alwaysShowRuleFailuresAsWarnings": false,
- "ignoreDefinitionFiles": true,
- "configFile": "tslint.json",
- "suppressWhileTypeErrorsPresent": false
- }
- ]
- },
- "include": [
- "src/**/*.ts"
+ "compileOnSave": false,
+ "compilerOptions": {
+ "baseUrl": "./",
+ "outDir": "./lib",
+ "sourceMap": false,
+ "declaration": true,
+ "module": "CommonJS",
+ "moduleResolution": "node",
+ "emitDecoratorMetadata": true,
+ "experimentalDecorators": true,
+ "esModuleInterop": true,
+ "importHelpers": true,
+ "target": "es5",
+ "types": [
+ "cypress",
+ "cy-verify-downloads"
+ ],
+ "lib": [
+ "es5",
+ "dom"
+ ],
+ "plugins": [
+ {
+ "name": "typescript-tslint-plugin",
+ "alwaysShowRuleFailuresAsWarnings": false,
+ "ignoreDefinitionFiles": true,
+ "configFile": "tslint.json",
+ "suppressWhileTypeErrorsPresent": false
+ }
]
+ },
+ "include": [
+ "cypress/**/*.ts"
+ ]
}