diff --git a/docs/Commands.md b/docs/Commands.md index 83b4217..df6f5da 100644 --- a/docs/Commands.md +++ b/docs/Commands.md @@ -26,7 +26,7 @@ This sets your node instance to watch all changes of images, JS and SCSS in the **Note:** _This command will take over your node instance (in Command Prompt, PowerShell, Git Bash, VS Code Terminal, etc.). Therefore, you may want to start a new instance if you need to run other commands at the same time._ -### gulp package +### gulp packageTheme This command builds and packages your custom theme into a DNN theme installation package (ZIP file). It will place the ZIP file in the `./build/` folder using the following naming convention: `[project]_[version]_install.zip` @@ -72,4 +72,4 @@ ZIPs contents of `./menus/` folder, `./partials/` folder, and all ASCX, XML, HTM ZIPs all subset ZIP files and other pertinent project files into theme package installation file using the following naming convention: `[project]_[version]_install.zip` ### gulp cleantemp -Deletes all temporary ZIP and project files from `./temp/` folder used in package tasks. \ No newline at end of file +Deletes all temporary ZIP and project files from `./temp/` folder used in package tasks. diff --git a/gulpfile.js b/gulpfile.js index 762592d..f1e3550 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -32,11 +32,18 @@ const paths = { dest: './dist/fonts/' }, faFonts: { - src: './node_modules/@fortawesome/fontawesome-free/webfonts/*', + src: [ + './node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.*', + './node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.*' + ], dest: './dist/webfonts/' }, faCss: { - src: './node_modules/@fortawesome/fontawesome-free/css/all.min.css', + src: [ + './node_modules/@fortawesome/fontawesome-free/css/brands.min.css', + './node_modules/@fortawesome/fontawesome-free/css/solid.min.css', + './node_modules/@fortawesome/fontawesome-free/css/fontawesome.min.css', + ], dest: './dist/css/' }, normalize: { @@ -394,7 +401,15 @@ function cleantemp() { //gulp serve function serve() { bs.init({ - proxy: "nvQuickTheme.loc" + proxy: "nvQuickTheme.loc", + rewriteRules: [ + { + match: /w\[".*"].*/g, + fn: (req, _res, match) => { + return match.replace(/(http:\/\/|https:\/\/)[a-zA-Z0-9.-]+\//g, `//${req.headers.host}/`); + } + }, + ], }); gulp.watch(paths.images.src, images).on('change', bs.reload); gulp.watch(paths.styles.src, styles).on('change', bs.reload); diff --git a/manifest.dnn b/manifest.dnn index af0b726..11fdabb 100644 --- a/manifest.dnn +++ b/manifest.dnn @@ -80,16 +80,10 @@ - - - - - - - + diff --git a/package.json b/package.json index 0b20f30..d716183 100644 --- a/package.json +++ b/package.json @@ -7,12 +7,12 @@ "license": "GPL-3.0", "private": true, "dependencies": { - "@fortawesome/fontawesome-free": "^6.2.0", + "@fortawesome/fontawesome-free": "^6.5.1", "bootstrap": "^5.2.2", "normalize.css": "^8.0.1" }, "devDependencies": { - "browser-sync": "^2.27.10", + "browser-sync": "^2.29.3", "fancy-log": "^2.0.0", "gulp": "^4.0.2", "gulp-autoprefixer": "^8.0.0", diff --git a/partials/_includes.ascx b/partials/_includes.ascx index f260562..490b5b3 100644 --- a/partials/_includes.ascx +++ b/partials/_includes.ascx @@ -1,8 +1,10 @@ - - + + + + @@ -15,7 +17,6 @@ var fonts = new string[] { "dist/webfonts/fa-brands-400", - "dist/webfonts/fa-regular-400", "dist/webfonts/fa-solid-900", "dist/fonts/OpenSans-Bold", "dist/fonts/OpenSans-BoldItalic", @@ -31,7 +32,6 @@ var types = new Dictionary(); types.Add("woff2", "font/woff2"); - types.Add("woff", "font/woff"); var defaultPage = (CDefault)this.Page; diff --git a/src/fonts/OpenSans-Bold.woff b/src/fonts/OpenSans-Bold.woff deleted file mode 100644 index e79f7a5..0000000 Binary files a/src/fonts/OpenSans-Bold.woff and /dev/null differ diff --git a/src/fonts/OpenSans-BoldItalic.woff b/src/fonts/OpenSans-BoldItalic.woff deleted file mode 100644 index fad2bfd..0000000 Binary files a/src/fonts/OpenSans-BoldItalic.woff and /dev/null differ diff --git a/src/fonts/OpenSans-ExtraBold.woff b/src/fonts/OpenSans-ExtraBold.woff deleted file mode 100644 index 70ea6a7..0000000 Binary files a/src/fonts/OpenSans-ExtraBold.woff and /dev/null differ diff --git a/src/fonts/OpenSans-ExtraBoldItalic.woff b/src/fonts/OpenSans-ExtraBoldItalic.woff deleted file mode 100644 index b670dd6..0000000 Binary files a/src/fonts/OpenSans-ExtraBoldItalic.woff and /dev/null differ diff --git a/src/fonts/OpenSans-Italic.woff b/src/fonts/OpenSans-Italic.woff deleted file mode 100644 index 3035b2c..0000000 Binary files a/src/fonts/OpenSans-Italic.woff and /dev/null differ diff --git a/src/fonts/OpenSans-Light.woff b/src/fonts/OpenSans-Light.woff deleted file mode 100644 index d99b35e..0000000 Binary files a/src/fonts/OpenSans-Light.woff and /dev/null differ diff --git a/src/fonts/OpenSans-LightItalic.woff b/src/fonts/OpenSans-LightItalic.woff deleted file mode 100644 index b0f70b2..0000000 Binary files a/src/fonts/OpenSans-LightItalic.woff and /dev/null differ diff --git a/src/fonts/OpenSans-Regular.woff b/src/fonts/OpenSans-Regular.woff deleted file mode 100644 index 89836d5..0000000 Binary files a/src/fonts/OpenSans-Regular.woff and /dev/null differ diff --git a/src/fonts/OpenSans-SemiBold.woff b/src/fonts/OpenSans-SemiBold.woff deleted file mode 100644 index 9870a60..0000000 Binary files a/src/fonts/OpenSans-SemiBold.woff and /dev/null differ diff --git a/src/fonts/OpenSans-SemiBoldItalic.woff b/src/fonts/OpenSans-SemiBoldItalic.woff deleted file mode 100644 index eae19b1..0000000 Binary files a/src/fonts/OpenSans-SemiBoldItalic.woff and /dev/null differ diff --git a/src/scss/components/_dnn.scss b/src/scss/components/_dnn.scss index 93531b3..e678beb 100644 --- a/src/scss/components/_dnn.scss +++ b/src/scss/components/_dnn.scss @@ -323,10 +323,10 @@ legend.error { } /* - * 1. Display hand cursor for clickable form elements - * 2. Allow styling of clickable form elements in iOS - * 3. Correct inner spacing displayed oddly in IE7 (doesn't effect IE6) - */ +* 1. Display hand cursor for clickable form elements +* 2. Allow styling of clickable form elements in iOS +* 3. Correct inner spacing displayed oddly in IE7 (doesn't effect IE6) +*/ .dnnFormItem button, .dnnFormItem input[type="button"], @@ -337,29 +337,9 @@ legend.error { .dnnTertiaryAction, ul.dnnAdminTabNav li a, .dnnLogin .LoginTabGroup span { - display: inline-block; - padding: 9px 9px; - margin-bottom: 9px; - cursor: pointer; - min-width: 75px; - *overflow: visible; - border: 1px solid #c2c2c2; - background: #eaeaea; - border-radius: 0.25px; - color: #333; - font-weight: bold; - text-decoration: none; - text-align: center; -} - -.dnnFormItem button, -.dnnFormItem input[type="button"], -.dnnFormItem input[type="reset"], -.dnnFormItem input[type="submit"], -.dnnPrimaryAction, -.dnnSecondaryAction, -.dnnTertiaryAction { - padding: 6px 6px; + @extend .btn; + margin-top: 0.5rem; + margin-bottom: 0.5rem; } /* Primary Action */ @@ -367,38 +347,13 @@ ul.dnnAdminTabNav li a, .dnnPrimaryAction, .dnnFormItem input[type="submit"], a.dnnPrimaryAction { - border-color: color('dnnPrimaryAction'); - background: color('dnnPrimaryAction'); - color: #efefef; - text-shadow: 0px -1px 0px #185B93; - cursor: pointer; -} - -.dnnPrimaryAction:hover, -.dnnFormItem input[type="submit"]:hover, -a.dnnPrimaryAction:hover { - border-color: #6cb6f3; - background: #6cb6f3; - /* Old browsers */ - color: #fff; -} - -.dnnPrimaryAction:active, -.dnnFormItem input[type="submit"]:active, -a.dnnPrimaryAction:active { - border-color: color('dnnPrimaryAction'); - background: color('dnnPrimaryAction'); - color: #fff; + @extend .btn-main-shade; } .dnnPrimaryAction[disabled], .dnnPrimaryAction[disabled]:hover, .dnnPrimaryAction[disabled]:active { - background: #ccc !important; - border: none !important; - box-shadow: none !important; - color: #aaa !important; - text-shadow: none; + @extend .btn-disabled !optional; } /* Secondary Action */ @@ -409,24 +364,7 @@ a.dnnPrimaryAction:active { a.dnnSecondaryAction, ul.dnnAdminTabNav li a, .dnnLogin .LoginTabGroup span { - background: color('dnnSecondaryAction'); - /* Old browsers */ - border-color: color('dnnSecondaryAction'); - text-shadow: 0px 1px 0px #ffffff; - color: #333; - cursor: pointer; -} - -.dnnFormItem button:hover, -.dnnFormItem input[type="button"]:hover, -.dnnFormItem input[type="reset"]:hover, -.dnnSecondaryAction:hover, -a.dnnSecondaryAction:hover, -ul.dnnAdminTabNav li a:hover, -.dnnLogin .LoginTabGroup span:hover { - background: whitesmoke; - /* Old browsers */ - color: #555; + @extend .btn-main-highlight; } .dnnFormItem button:active, @@ -435,8 +373,8 @@ ul.dnnAdminTabNav li a:hover, .dnnSecondaryAction:active, a.dnnSecondaryAction:active, ul.dnnAdminTabNav li a:active { - border-color: color('dnnSecondaryAction'); - background: color('dnnSecondaryAction'); + border-color: color('main-accent'); + background: color('main-accent'); } /* Fix some old forge modules use .dnnPrimaryAction and .dnnSecondaryAction in wrong way */ @@ -456,34 +394,19 @@ span.dnnSecondaryAction>a.dnnSecondaryAction { /* Tertiary Action */ .dnnTertiaryAction, a.dnnTertiaryAction { - padding: 10px 10px; - border: none; - background: color('dnnTertiaryAction'); - color: #333; -} - -.dnnTertiaryAction:hover, -a.dnnTertiaryAction:hover { - background: #f2f2f2; -} - -.dnnTertiaryAction:active, -a.dnnTertiaryAction:active { - background: color('dnnTertiaryAction'); + @extend .btn-main-accent; } /* Action Button behind input */ .dnnFormItem input[type="text"]+a.dnnPrimaryAction, .dnnFormItem input[type="text"]+a.dnnSecondaryAction, .dnnFormItem input[type="text"]+a.dnnTerriaryAction { - display: inline-block; - width: auto; - margin: 6px 5px 6px 5px; + margin-left: 0.325rem; } -.dnnFormItem input[type="checkbox"]+span, -.dnnFormItem input[type="radio"]+span { - margin: 5px; +.dnnFormItem input[type="checkbox"] + span, +.dnnFormItem input[type="radio"] + span { + margin: 0.325rem; } /* text style for buttons and link buttons used in the portal admin pages */ @@ -497,8 +420,7 @@ a.dnnTertiaryAction:active { /* Re-set default cursor for disabled elements */ .dnnFormItem button[disabled], .dnnFormItem input[disabled] { - cursor: default; - opacity: 0.5; + @extend .btn-disabled !optional; } diff --git a/yarn.lock b/yarn.lock index d66e02b..b326e29 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@fortawesome/fontawesome-free@^6.2.0": - version "6.2.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.2.0.tgz#ba3510825b332816fe7190f28827f8cb33a298b5" - integrity sha512-CNR7qRIfCwWHNN7FnKUniva94edPdyQzil/zCwk3v6k4R6rR2Fr8i4s3PM7n/lyfPA6Zfko9z5WDzFxG9SW1uQ== +"@fortawesome/fontawesome-free@^6.5.1": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.5.1.tgz#55cc8410abf1003b726324661ce5b0d1c10de258" + integrity sha512-CNy5vSwN3fsUStPRLX7fUYojyuzoEMSXPl7zSLJ8TgtRfjv24LOnOWKT2zYwaHZCJGkdyRnTmstR0P+Ah503Gw== "@jridgewell/gen-mapping@^0.3.0": version "0.3.2" @@ -597,44 +597,43 @@ braces@^3.0.1, braces@~3.0.2: dependencies: fill-range "^7.0.1" -browser-sync-client@^2.27.10: - version "2.27.10" - resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.27.10.tgz#f06233ea66bd873b96664f001cbc49035022634d" - integrity sha512-KCFKA1YDj6cNul0VsA28apohtBsdk5Wv8T82ClOZPZMZWxPj4Ny5AUbrj9UlAb/k6pdxE5HABrWDhP9+cjt4HQ== +browser-sync-client@^2.29.3: + version "2.29.3" + resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.29.3.tgz#9300b97f42abc2c4f95ca29b5a9781b5c492f14a" + integrity sha512-4tK5JKCl7v/3aLbmCBMzpufiYLsB1+UI+7tUXCCp5qF0AllHy/jAqYu6k7hUF3hYtlClKpxExWaR+rH+ny07wQ== dependencies: etag "1.8.1" fresh "0.5.2" mitt "^1.1.3" - rxjs "^5.5.6" - typescript "^4.6.2" -browser-sync-ui@^2.27.10: - version "2.27.10" - resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.27.10.tgz#59dd6e436e17b743c99094ff5129306ab7ab5b79" - integrity sha512-elbJILq4Uo6OQv6gsvS3Y9vRAJlWu+h8j0JDkF0X/ua+3S6SVbbiWnZc8sNOFlG7yvVGIwBED3eaYQ0iBo1Dtw== +browser-sync-ui@^2.29.3: + version "2.29.3" + resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.29.3.tgz#35e2ce3b470dce6b7219307cac7278bf324a0f16" + integrity sha512-kBYOIQjU/D/3kYtUIJtj82e797Egk1FB2broqItkr3i4eF1qiHbFCG6srksu9gWhfmuM/TNG76jMfzAdxEPakg== dependencies: async-each-series "0.1.1" + chalk "4.1.2" connect-history-api-fallback "^1" immutable "^3" server-destroy "1.0.1" socket.io-client "^4.4.1" stream-throttle "^0.1.3" -browser-sync@^2.27.10: - version "2.27.10" - resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.27.10.tgz#3568d4f66afb0f68fee4a10902ecbbe8b2f680dd" - integrity sha512-xKm+6KJmJu6RuMWWbFkKwOCSqQOxYe3nOrFkKI5Tr/ZzjPxyU3pFShKK3tWnazBo/3lYQzN7fzjixG8fwJh1Xw== +browser-sync@^2.29.3: + version "2.29.3" + resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.29.3.tgz#c2a3ff00c659eb87a13cae9d7a427e1b4b580ee1" + integrity sha512-NiM38O6XU84+MN+gzspVmXV2fTOoe+jBqIBx3IBdhZrdeURr6ZgznJr/p+hQ+KzkKEiGH/GcC4SQFSL0jV49bg== dependencies: - browser-sync-client "^2.27.10" - browser-sync-ui "^2.27.10" + browser-sync-client "^2.29.3" + browser-sync-ui "^2.29.3" bs-recipes "1.3.4" - bs-snippet-injector "^2.0.1" + chalk "4.1.2" chokidar "^3.5.1" connect "3.6.6" connect-history-api-fallback "^1" dev-ip "^1.0.1" easy-extender "^2.3.4" - eazy-logger "3.1.0" + eazy-logger "^4.0.1" etag "^1.8.1" fresh "^0.5.2" fs-extra "3.0.1" @@ -644,7 +643,6 @@ browser-sync@^2.27.10: micromatch "^4.0.2" opn "5.3.0" portscanner "2.2.0" - qs "6.2.3" raw-body "^2.3.2" resp-modifier "6.0.2" rx "4.1.0" @@ -653,7 +651,7 @@ browser-sync@^2.27.10: serve-static "1.13.2" server-destroy "1.0.1" socket.io "^4.4.1" - ua-parser-js "1.0.2" + ua-parser-js "^1.0.33" yargs "^17.3.1" browserslist@^4.16.6: @@ -672,11 +670,6 @@ bs-recipes@1.3.4: resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585" integrity sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU= -bs-snippet-injector@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz#61b5393f11f52559ed120693100343b6edb04dd5" - integrity sha1-YbU5PxH1JVntEgaTEANDtu2wTdU= - buffer-alloc-unsafe@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" @@ -797,7 +790,15 @@ caw@^2.0.0, caw@^2.0.1: tunnel-agent "^0.6.0" url-to-options "^1.0.1" -chalk@^1.0.0, chalk@^1.1.3: +chalk@4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +chalk@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= @@ -1409,11 +1410,6 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.0" -dlv@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" - integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== - doctrine@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" @@ -1527,12 +1523,12 @@ easy-extender@^2.3.4: dependencies: lodash "^4.17.10" -eazy-logger@3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-3.1.0.tgz#b169eb56df714608fa114f164c8a2956bec9f0f3" - integrity sha512-/snsn2JqBtUSSstEl4R0RKjkisGHAhvYj89i7r3ytNUKW12y178KDZwXLXIgwDqLW6E/VRMT9qfld7wvFae8bQ== +eazy-logger@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-4.0.1.tgz#2e9fe487fb14ed6ac20d5f01d90dff377d403041" + integrity sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw== dependencies: - tfunk "^4.0.0" + chalk "4.1.2" ee-first@1.1.1: version "1.1.1" @@ -4406,11 +4402,6 @@ q@^1.1.2: resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= -qs@6.2.3: - version "6.2.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe" - integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4= - query-string@^5.0.1: version "5.1.1" resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" @@ -4716,13 +4707,6 @@ rx@4.1.0: resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I= -rxjs@^5.5.6: - version "5.5.12" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc" - integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw== - dependencies: - symbol-observable "1.0.1" - safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -5309,11 +5293,6 @@ svgo@^1.3.2: unquote "~1.1.1" util.promisify "~1.0.0" -symbol-observable@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" - integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ= - tar-stream@^1.5.2: version "1.6.2" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" @@ -5355,14 +5334,6 @@ textextensions@^3.2.0: resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-3.3.0.tgz#03530d5287b86773c08b77458589148870cc71d3" integrity sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw== -tfunk@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/tfunk/-/tfunk-4.0.0.tgz#de9399feaf2060901d590b7faad80fcd5443077e" - integrity sha512-eJQ0dGfDIzWNiFNYFVjJ+Ezl/GmwHaFTBTjrtqNPW0S7cuVDBrZrmzUz6VkMeCR4DZFqhd4YtLwsw3i2wYHswQ== - dependencies: - chalk "^1.1.3" - dlv "^1.1.3" - through2-concurrent@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/through2-concurrent/-/through2-concurrent-2.0.0.tgz#c9dd2c146504ec9962dbc86a5168b63d662669fa" @@ -5514,15 +5485,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^4.6.2: - version "4.8.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" - integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== - -ua-parser-js@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.2.tgz#e2976c34dbfb30b15d2c300b2a53eac87c57a775" - integrity sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg== +ua-parser-js@^1.0.33: + version "1.0.37" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.37.tgz#b5dc7b163a5c1f0c510b08446aed4da92c46373f" + integrity sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ== uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.6"