Skip to content

Commit

Permalink
Merge pull request tinymce#6036 from tinymce/security/update-deps
Browse files Browse the repository at this point in the history
Upgraded dependencies to fix some security alerts
  • Loading branch information
lnewson authored Sep 16, 2020
2 parents afc2f9a + 0e6b959 commit 78b6336
Show file tree
Hide file tree
Showing 3 changed files with 664 additions and 476 deletions.
4 changes: 2 additions & 2 deletions modules/oxide/src/less/theme/components/form/layout.less
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
justify-content: space-between;
}

// Escape the calc expression otherwise less incorrectly converts this to 42%
// https://github.com/less/less.js/issues/3047 and https://github.com/less/less.js/issues/2837
.tox-form__grid--2col > .tox-form__group {
// Escape the calc expression otherwise less incorrectly converts this to 42%
// https://github.com/less/less.js/issues/3047 and https://github.com/less/less.js/issues/2837
width: calc(~"50% - (@{form-grid-horizontal-gap} / 2)");
}

Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@
"@ephox/wrap-prismjs": "^1.19.0",
"@tinymce/eslint-plugin": "^1.4.0",
"awesome-typescript-loader": "^5.2.0",
"chalk": "^3.0.0",
"fast-check": "^1.18.1",
"chalk": "^4.1.0",
"fast-check": "^2.3.0",
"grunt": "^1.0.2",
"grunt-contrib-clean": "^2.0.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-less": "2.0.0",
"grunt-contrib-symlink": "^1.0.0",
"grunt-contrib-uglify": "4.0.1",
"grunt-contrib-uglify": "5.0.0",
"grunt-contrib-watch": "^1.1.0",
"grunt-eslint": "^22.0.0",
"grunt-eslint": "^23.0.0",
"grunt-nuget-pack": "^0.0.6",
"grunt-shell": "^3.0.1",
"grunt-webpack": "^3.1.2",
"grunt-webpack": "^4.0.2",
"gulp": "^4.0.0",
"gulp-clean": "^0.4.0",
"gulp-clean-css": "^4.0.0",
Expand All @@ -68,7 +68,7 @@
"load-grunt-tasks": "^5.1.0",
"moxie-zip": "0.0.4",
"npm-run-all": "^4.1.5",
"source-map-loader": "^0.2.3",
"source-map-loader": "^1.1.0",
"string-replace-loader": "^2.1.1",
"stylelint": "^13.2.1",
"stylelint-config-standard": "^20.0.0",
Expand Down
Loading

0 comments on commit 78b6336

Please sign in to comment.