From 2727fb8f20bbb04a0258f3ae0e53f31eef60cb79 Mon Sep 17 00:00:00 2001 From: ewwwwwwww Date: Wed, 22 Jun 2022 08:41:04 -0700 Subject: [PATCH] lint fixes --- .../components/emoji_picker_dropdown.js | Bin 11639 -> 12773 bytes app/soapbox/features/emoji/emoji.js | Bin 3523 -> 3564 bytes .../components/icon_picker_dropdown.js | Bin 6497 -> 6513 bytes .../features/ui/util/async-components.ts | 6 +- package.json | 5 +- yarn.lock | 59 +++++++++--------- 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/app/soapbox/features/compose/components/emoji_picker_dropdown.js b/app/soapbox/features/compose/components/emoji_picker_dropdown.js index ca1fff0186178a834128aff0db5c0df3728295f4..7419f0edf073639a23716ef480c5bf43469d01b3 100644 GIT binary patch delta 2154 zcma)7&2Jk;6jw?}oTd4&lh~wo>}NZP?bfl=h7zfXQ=~SPKoNozA<-ypH|ue->3YZ7 z9S73Y5_&`k6`0;og;2!>2`CB@caREy1xgM`x^BP*FL$C^xzHCxPct-m0CyZQ++m3 z1`paUT0xC6r%R0nG6?wJ-^q79SFOU{k6rI~?>5@DK}>8*Na?TWfzfseZi+Bm@Jrxn z00y>Q0uE|GP5CXB<~1e=ofnHGs4WWRKwX67GK=-LY1J0G1l}f-O|B@J3Pil5qmq=v`Ga#jkK!zYMEu zQpG`}?bxtTH@7)d&0~K)R2SzpUt^Bx*`66*JBoVl?J6JwhEC81c1+}6=FO|YD%S-l zILJUYDU{V!7B#%K5N=s0yxKa0?pzxf*WFO4vnFkuWG7^_tn<2oItqAwi*>hicXyiW z*y`LHmcF5GYphT_hc9~PSg~YmF42i;K+D0cw{}{HH_Q`Ck9t!gVJ%V;G&))w5XrG} zOJk}>5<>J|56{6zD)ABS5DUFAKUKO+Cv;RErChmX@KHw3F)m_LP7O zkbn(B6K|tK!K&yEv}Iv(pylXoZEoc$GZ&E+@v#{4qfm*6{B2xEtj2~)`!JSWM-Kar zWch!3A1<@=u8lzFNf!sq1pdGJe4R2*w>?JL8GI|=fy`sKa8eIvTVUP0c`4a z-9i^Ew%b^Vf|bIwD4Qc;&ssXH!aXuBeX-=TT3wB0__!QIhw1fLR34M#5}Ktdvvtss z;@^!;|9kQCGMnMg1^p(Qpg#|<6jWsYRY+PH`H07{UmT^^^QZRy8cBC`Gh3G)c}>)d2$V1lbe$cjf^G4>SfU3d~pSI- zJ9EYlRDR2x;88rzoUMeK2DY$MD-;4$4hC|OcewOT7?bVcLShn&ITj@JeG9VO_m?om z$pe_+#|HVgCbd?c!uZ-HpYogQ3{;BTd^k5MZFNG37Ix5Sdyu-q|lW@gDT0mkRelZSf+)G;aORjB5L85R;3vp zp6?R`xKP;*z3#@4$%K!gF`Z;4Rx;S=m?A{wGa*E@ajY^nD2fH4OlWCBD93scnw7L^ z6%VM2JkP{nl~pYF z-3?#uIrF^Zu+GV9em*j>S2Y%PwKfOaNneowiMlRsf#-h~z-Art^I?fLz!c9Ma4Eg0 z$!)^A;0yinYBYnj{XSY1Odhv8;q;h}B)x%B(+ueFy5OF(!e+X`JmtP^JDXtx)xe&! z7F4Gfo+6j2^-O(WpH^gx_M6{_x5De1L8y0)K-#5nU9juA2CLB%`7O7<2!>-Kpjd0Z zr{PAq$+UweKno1PlfbVM&H*=r?j+|yh3H-y);MZY7OkfkAG~7~6KNi)@Q|`=l7Q l=3W;&U`vd_XEA62{&*V<$KB8zZ>?mXRqW&S`OWyr^54-=LYM#m diff --git a/app/soapbox/features/emoji/emoji.js b/app/soapbox/features/emoji/emoji.js index 0ce74c4dec65656d766d3bd6c9ebc07ce81230e6..909629979378d8c9b9209e497d8e1c5d132464fb 100644 GIT binary patch delta 124 zcmX>s{YH9&D(~b}UWwG=?99AkD~0H4h2o-QD}~ac9EI9g9WDhh$jnVlPYo@~0gJ-~ u_4O5sGxCc{;`0)7Q$bomG+YZ%wj{Np#7aS39id^eKd%^*zW(HiyhZ>kJ0ej4 delta 53 zcmaDOeOP*fD(~bXUTN8q)QS=-1$A{DE(I`1&CM^#OwP|Mwo-_Woh-|%Fgc1>bnV delta 68 zcmexp^w4OcZni~0W^#6FkwRKgey)OgYHog3rfzOxQHg#^W^svbYO#KDer`d2UTR)R Pv3>zqDU{l{d7lITlUo}1 diff --git a/app/soapbox/features/ui/util/async-components.ts b/app/soapbox/features/ui/util/async-components.ts index a6379b1300..ffb3d9ed22 100644 --- a/app/soapbox/features/ui/util/async-components.ts +++ b/app/soapbox/features/ui/util/async-components.ts @@ -1,6 +1,6 @@ -export function EmojiPicker() { - return import(/* webpackChunkName: "emoji_picker" */'../../emoji/emoji_picker'); -} +// export function EmojiPicker() { +// return import(/* webpackChunkName: "emoji_picker" */'../../emoji/emoji_picker'); +// } export function Notifications() { return import(/* webpackChunkName: "features/notifications" */'../../notifications'); diff --git a/package.json b/package.json index cb9ab4481d..8fdbe6fe49 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "@babel/preset-react": "^7.17.12", "@babel/preset-typescript": "^7.17.12", "@babel/runtime": "^7.18.3", + "@emoji-mart/data": "^1.0.2", "@fontsource/inter": "^4.5.1", "@fontsource/roboto": "^4.5.0", "@gamestdio/websocket": "^0.3.2", @@ -113,7 +114,7 @@ "detect-passive-events": "^2.0.0", "dotenv": "^8.0.0", "emoji-datasource": "5.0.0", - "emoji-mart": "npm:emoji-mart-lazyload", + "emoji-mart": "^5.1.0", "entities": "^3.0.1", "es6-symbol": "^3.1.1", "escape-html": "^1.0.3", @@ -196,7 +197,7 @@ "webpack": "^5.72.1", "webpack-assets-manifest": "^5.1.0", "webpack-bundle-analyzer": "^4.5.0", - "webpack-cli": "^4.9.2", + "webpack-cli": "^4.10.0", "webpack-deadcode-plugin": "^0.1.16", "webpack-merge": "^5.8.0", "wicg-inert": "^3.1.1" diff --git a/yarn.lock b/yarn.lock index 8d22481528..5cc86ff0b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1271,7 +1271,7 @@ dependencies: regenerator-runtime "^0.12.0" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.2.0", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.2.0", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2": version "7.15.4" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a" integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw== @@ -1382,6 +1382,11 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA== +"@emoji-mart/data@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@emoji-mart/data/-/data-1.0.2.tgz#2b94c5b5f2c79611c12238438dad9516576a09ab" + integrity sha512-+ZdzBM4llDJJvjuCEsdOYVoSlNA16MMmxKG3oF5LARkwhx6N5clr6phzneWV1qIwJsywqwG7NaBjH8DV6yzjcA== + "@es-joy/jsdoccomment@~0.29.0": version "0.29.0" resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.29.0.tgz#527c7eefadeaf5c5d0c3b2721b5fa425d2119e98" @@ -3102,22 +3107,22 @@ "@webassemblyjs/ast" "1.11.1" "@xtuc/long" "4.2.2" -"@webpack-cli/configtest@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356" - integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg== +"@webpack-cli/configtest@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5" + integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg== -"@webpack-cli/info@^1.4.1": - version "1.4.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea" - integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA== +"@webpack-cli/info@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1" + integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ== dependencies: envinfo "^7.7.3" -"@webpack-cli/serve@^1.6.1": - version "1.6.1" - resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe" - integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw== +"@webpack-cli/serve@^1.7.0": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1" + integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q== "@xtuc/ieee754@^1.2.0": version "1.2.0" @@ -5038,14 +5043,10 @@ emoji-datasource@5.0.0: resolved "https://registry.yarnpkg.com/emoji-datasource/-/emoji-datasource-5.0.0.tgz#1522fdba3c52223a1cf5a1c1fc282935400eaa06" integrity sha512-LuvLWFnxznTH++GytEzpzOPUo1SB+6CUFqIlVETJJ3x9fpyMCKFfyqberbhMLOpT1qcNe+km+zoyBeUSC3u5Rw== -"emoji-mart@npm:emoji-mart-lazyload": - version "3.0.1-j" - resolved "https://registry.yarnpkg.com/emoji-mart-lazyload/-/emoji-mart-lazyload-3.0.1-j.tgz#87a90d30b79d9145ece078d53e3e683c1a10ce9c" - integrity sha512-0wKF7MR0/iAeCIoiBLY+JjXCugycTgYRC2SL0y9/bjNSQlbeMdzILmPQJAufU/mgLFDUitOvjxLDhOZ9yxZ48g== - dependencies: - "@babel/runtime" "^7.0.0" - intersection-observer "^0.12.0" - prop-types "^15.6.0" +emoji-mart@^5.1.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/emoji-mart/-/emoji-mart-5.1.0.tgz#8a36a872e1297747342d1385bd7b7141ac2f4365" + integrity sha512-ytXgeemyw4FormPQqWd35Vh06ZSnQFhVUqW51kASZzzjhQOPSGtiN3VCC7vDq94Pkxmsbet+Gps/qj5N90mEnw== emoji-regex@^8.0.0: version "8.0.0" @@ -11822,18 +11823,18 @@ webpack-bundle-analyzer@^4.5.0: sirv "^1.0.7" ws "^7.3.1" -webpack-cli@^4.9.2: - version "4.9.2" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d" - integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ== +webpack-cli@^4.10.0: + version "4.10.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31" + integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w== dependencies: "@discoveryjs/json-ext" "^0.5.0" - "@webpack-cli/configtest" "^1.1.1" - "@webpack-cli/info" "^1.4.1" - "@webpack-cli/serve" "^1.6.1" + "@webpack-cli/configtest" "^1.2.0" + "@webpack-cli/info" "^1.5.0" + "@webpack-cli/serve" "^1.7.0" colorette "^2.0.14" commander "^7.0.0" - execa "^5.0.0" + cross-spawn "^7.0.3" fastest-levenshtein "^1.0.12" import-local "^3.0.2" interpret "^2.2.0"