yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v10: npm updates for april (#12288)

Browse Source 
* Upgraded MailKit

* Upgraded Microsoft.* packages

* Upgrades various nuget packages to latest version

* Upgrades various nuget packages related to test

* update package-lock.json to new npm format

* bump all angular dependencies to latest 1.8.3

* bump jquery to 3.6.0

* remove dubious 'npm' dependency and set engines versions to avoid warnings

* bump signalr dependency from v3 to v6

* bump 'underscore' from 1.12.1 to 1.13.1

* bump 'diff' from 3.5.0 to 5.0.0

* bump 'clipboard' from 2.0.4 to 2.0.10

* bump 'flatpickr' from 4.6.9 to 4.6.13

* bump 'moment' from 2.22.2 to 2.29.3

* bump 'spectrum-colorpicker2' from 2.0.8 to 2.0.9

* bump 'underscore' from 1.13.1 to 1.13.2

* update 'less' 'autoprefixer' 'cssnano' and accompanying gulp tasks to latest

* bump all gulp dependencies

except gulp-imagemin since we do not yet support esmodules in the backoffice client

* remove 'fs' since the package is marked as malicious and do not seem to be used

* update AcceptanceTests lockfile to latest npm + dependency updates

* bump '@babel/core' from 7.17.5 to 7.17.9

* bump karma dependencies to latest

* bump 'animejs' from 2.2.0 to 3.2.1

* bump 'jasmine-core' from 3.5.0 to 4.1.0

* remove deduped 'caniuse-lite'

* bump wicg-inert from ^3.0.2 to 3.1.1

* bump 'nouislider' from 15.5.0 to 15.5.1

* add slight delay for confirmation overlay

* ignore postinstall task for acceptance tests since env file is generated manually

* upgrade cypress to 9.5.4

* add wait step to content.ts tests

* Revert "ignore postinstall task for acceptance tests since env file is generated manually"

This reverts commit 61acebfda2502499480f31d8450c889d4c5c6f11.

* increate wait amount of content rollback tests

* Revert "upgrade cypress to 9.5.4"

This reverts commit 2febf139a41938ae005754abd958fdec1f598991.

* Revert "update AcceptanceTests lockfile to latest npm + dependency updates"

This reverts commit b45d20b3cdcae6b17d4024c7085c5e6a3e3e2a83.

* update lockfile version

* update umbraco-cypress-testhelpers to latest

Co-authored-by: Bjarke Berg <mail@bergmania.dk>
This commit is contained in:
Jacob Overgaard
2022-05-02 12:21:41 +02:00
committed by GitHub
parent 58cbeac39d
commit 140029c38c
9 changed files with 19299 additions and 6516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22546
src/Umbraco.Web.UI.Client/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

91
src/Umbraco.Web.UI.Client/package.json
View File

@@ -13,81 +13,80 @@
"watch": "gulp watch"
},
"engines": {
"node": ">=10.00.0"
"node": ">=14.0.0 <17",
"npm": ">=8.0.0 < 9"
},
"dependencies": {
"@microsoft/signalr": "^3.1.8",
"@microsoft/signalr": "6.0.4",
"ace-builds": "1.4.2",
"angular": "1.8.0",
"angular-animate": "1.7.5",
"angular-aria": "1.7.9",
"angular-chart.js": "^1.1.1",
"angular-cookies": "1.7.5",
"angular-dynamic-locale": "0.1.37",
"angular-i18n": "1.7.5",
"angular": "1.8.3",
"angular-animate": "1.8.3",
"angular-aria": "1.8.3",
"angular-chart.js": "1.1.1",
"angular-cookies": "1.8.3",
"angular-dynamic-locale": "0.1.38",
"angular-i18n": "1.8.3",
"angular-local-storage": "0.7.1",
"angular-messages": "1.7.5",
"angular-mocks": "1.7.5",
"angular-route": "1.7.5",
"angular-sanitize": "1.7.5",
"angular-touch": "1.7.5",
"angular-messages": "1.8.3",
"angular-mocks": "1.8.3",
"angular-route": "1.8.3",
"angular-sanitize": "1.8.3",
"angular-touch": "1.8.3",
"angular-ui-sortable": "0.19.0",
"animejs": "2.2.0",
"animejs": "3.2.1",
"bootstrap-social": "5.1.1",
"chart.js": "^2.9.3",
"clipboard": "2.0.4",
"diff": "3.5.0",
"flatpickr": "4.6.9",
"clipboard": "2.0.10",
"diff": "5.0.0",
"flatpickr": "4.6.13",
"font-awesome": "4.7.0",
"jquery": "^3.5.1",
"jquery-ui-dist": "1.12.1",
"jquery": "3.6.0",
"jquery-ui-dist": "1.13.1",
"jquery-ui-touch-punch": "0.2.3",
"lazyload-js": "1.0.0",
"moment": "2.22.2",
"moment": "2.29.3",
"ng-file-upload": "12.2.13",
"nouislider": "15.5.0",
"npm": "^6.14.7",
"spectrum-colorpicker2": "2.0.8",
"nouislider": "15.5.1",
"spectrum-colorpicker2": "2.0.9",
"tinymce": "4.9.11",
"typeahead.js": "0.11.1",
"underscore": "1.12.1",
"wicg-inert": "^3.0.2"
"underscore": "1.13.2",
"wicg-inert": "3.1.1"
},
"devDependencies": {
"@babel/core": "7.17.5",
"@babel/core": "7.17.9",
"@babel/preset-env": "7.16.11",
"autoprefixer": "9.6.5",
"caniuse-lite": "^1.0.30001312",
"cssnano": "4.1.10",
"fs": "0.0.2",
"autoprefixer": "10.4.4",
"cssnano": "5.1.7",
"gulp": "4.0.2",
"gulp-angular-embed-templates": "^2.3.0",
"gulp-angular-embed-templates": "2.3.0",
"gulp-babel": "8.0.0",
"gulp-clean-css": "4.2.0",
"gulp-cli": "^2.3.0",
"gulp-clean-css": "4.3.0",
"gulp-cli": "2.3.0",
"gulp-concat": "2.6.1",
"gulp-eslint": "6.0.0",
"gulp-imagemin": "7.1.0",
"gulp-less": "4.0.1",
"gulp-less": "5.0.0",
"gulp-minify": "3.1.0",
"gulp-notify": "^3.0.0",
"gulp-postcss": "8.0.0",
"gulp-rename": "1.4.0",
"gulp-notify": "4.0.0",
"gulp-postcss": "9.0.1",
"gulp-rename": "2.0.0",
"gulp-sort": "2.0.0",
"gulp-sourcemaps": "^2.6.5",
"gulp-sourcemaps": "3.0.0",
"gulp-watch": "5.0.1",
"gulp-wrap": "0.15.0",
"gulp-wrap-js": "0.4.1",
"jasmine-core": "3.5.0",
"jsdom": "16.4.0",
"karma": "6.3.16",
"karma-jasmine": "2.0.1",
"karma-jsdom-launcher": "^8.0.2",
"jasmine-core": "4.1.0",
"jsdom": "19.0.0",
"karma": "6.3.19",
"karma-jasmine": "5.0.0",
"karma-jsdom-launcher": "12.0.0",
"karma-junit-reporter": "2.0.1",
"karma-spec-reporter": "0.0.32",
"less": "3.10.3",
"karma-spec-reporter": "0.0.34",
"less": "4.1.2",
"lodash": "4.17.21",
"merge-stream": "2.0.0",
"postcss": "8.4.12",
"run-sequence": "2.2.1"
}
}

12
src/Umbraco.Web.UI.Client/src/less/variables.less
View File

@@ -536,16 +536,16 @@
// Fluid grid
// -------------------------
@fluidGridColumnWidth: percentage(@gridColumnWidth/@gridRowWidth);
@fluidGridGutterWidth: percentage(@gridGutterWidth/@gridRowWidth);
@fluidGridColumnWidth: percentage((@gridColumnWidth / @gridRowWidth));
@fluidGridGutterWidth: percentage((@gridGutterWidth / @gridRowWidth));
// 1200px min
@fluidGridColumnWidth1200: percentage(@gridColumnWidth1200/@gridRowWidth1200);
@fluidGridGutterWidth1200: percentage(@gridGutterWidth1200/@gridRowWidth1200);
@fluidGridColumnWidth1200: percentage((@gridColumnWidth1200 / @gridRowWidth1200));
@fluidGridGutterWidth1200: percentage((@gridGutterWidth1200 / @gridRowWidth1200));
// 768px-979px
@fluidGridColumnWidth768: percentage(@gridColumnWidth768/@gridRowWidth768);
@fluidGridGutterWidth768: percentage(@gridGutterWidth768/@gridRowWidth768);
@fluidGridColumnWidth768: percentage((@gridColumnWidth768 / @gridRowWidth768));
@fluidGridGutterWidth768: percentage((@gridGutterWidth768 / @gridRowWidth768));
// SORTABLE
// --------------------------------------------------

19
src/Umbraco.Web.UI.Client/src/preview/preview.controller.js
View File

@@ -65,6 +65,17 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
}
function configureSignalR(iframe) {
const reloadIframe = () => {
console.log("Reloading.");
var iframeDoc = (iframe.contentWindow || iframe.contentDocument);
if (iframeDoc) {
iframeDoc.location.reload();
} else {
console.error('could not reload iframe');
}
}
// visibility tracking
var dirtyContent = false;
var visibleContent = true;
@@ -73,9 +84,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
visibleContent = !document.hidden;
if (visibleContent && dirtyContent) {
dirtyContent = false;
console.log("Visible, reloading.")
var iframeDoc = (iframe.contentWindow || iframe.contentDocument);
iframeDoc.location.reload();
reloadIframe();
}
});
@@ -101,9 +110,7 @@ var app = angular.module("umbraco.preview", ['umbraco.resources', 'umbraco.servi
dirtyContent = true;
return;
}
console.log("Reloading.");
var iframeDoc = iframe.contentWindow || iframe.contentDocument;
iframeDoc.location.reload();
reloadIframe();
})
try {

2
src/Umbraco.Web.UI.Client/test/config/karma.conf.js
View File

@@ -107,7 +107,7 @@ module.exports = function (config) {
jsdomLauncher: {
jsdom: {
resources: new jsdom.ResourceLoader({
userAgent: "umbraco-test-suite",
userAgent: "umbraco-test-suite"
})
}
},

8
tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
View File

@@ -5,7 +5,7 @@ import {
DocumentTypeBuilder,
GridDataTypeBuilder,
MacroBuilder,
PartialViewMacroBuilder
PartialViewMacroBuilder,
} from 'umbraco-cypress-testhelpers';
context('Content', () => {
@@ -343,8 +343,14 @@ context('Content', () => {
// Rollback
cy.get('.umb-box-header :button').click();
// Wait to ensure the next button is clickable
cy.wait(1000);
cy.get('.-selectable.cursor-pointer:first').click();
// Wait to ensure the next button is clickable
cy.wait(1000);
cy.get('.umb-editor-footer-content__right-side > [button-style="success"] > .umb-button > .btn-success').click();
refreshContentTree();

1
tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Packages/packages.ts
View File

@@ -124,6 +124,7 @@ context('Packages', () => {
cy.umbracoSection('packages');
cy.contains('Created').click();
cy.contains('Delete').click();
cy.wait(100);
cy.contains('Yes, delete').click();
// Assert

6
tests/Umbraco.Tests.AcceptanceTest/package-lock.json generated
View File

@@ -1562,9 +1562,9 @@
}
},
"node_modules/minimist": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
"version": "1.2.6",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz",
"integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==",
"dev": true
},
"node_modules/ms": {

2
tests/Umbraco.Tests.AcceptanceTest/package.json
View File

@@ -14,7 +14,7 @@
"del": "^6.0.0",
"ncp": "^2.0.0",
"prompt": "^1.2.0",
"umbraco-cypress-testhelpers": "^1.0.0-beta-65"
"umbraco-cypress-testhelpers": "^1.0.0-beta-66"
},
"dependencies": {
"typescript": "^3.9.2"