moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into types-react

This commit is contained in:
Alex Gleason 2023-01-10 18:03:53 -06:00
parent 5e22d1169f 87aa965069
commit ad18b0f1c9
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
6 changed files with 4 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/soapbox/features/ui/components/pending-status.tsx
View File

@ -70,6 +70,7 @@ const PendingStatus: React.FC<IPendingStatus> = ({ idempotencyKey, className, mu
account={account}
timestamp={status.created_at}
hideActions
withLinkToProfile={false}
/>
</HStack>
</div>

9
app/soapbox/utils/soapbox-prop-types.ts
View File

@ -1,9 +0,0 @@
import PropTypes from 'prop-types';
export default {
me: PropTypes.oneOfType([
PropTypes.string,
PropTypes.oneOf([false, null]),
]),
meLoggedIn: PropTypes.string,
};

10
babel.config.js
View File

@ -28,16 +28,6 @@ module.exports = (api) => {
case 'production':
config.plugins.push(...[
'lodash',
[
'transform-react-remove-prop-types',
{
mode: 'remove',
removeImport: true,
additionalLibraries: [
'react-immutable-proptypes',
],
},
],
'@babel/transform-react-inline-elements',
[
'@babel/transform-runtime',

4
package.json
View File

@ -104,7 +104,6 @@
"babel-plugin-lodash": "^3.3.4",
"babel-plugin-preval": "^5.1.0",
"babel-plugin-react-intl": "^7.5.20",
"babel-plugin-transform-react-remove-prop-types": "^0.4.24",
"babel-plugin-transform-require-context": "^0.1.1",
"blurhash": "^2.0.0",
"bootstrap-icons": "^1.5.0",
@ -144,7 +143,6 @@
"postcss": "^8.4.14",
"postcss-loader": "^7.0.0",
"process": "^0.11.10",
"prop-types": "^15.5.10",
"punycode": "^2.1.1",
"qrcode.react": "^3.0.2",
"react": "^18.0.0",
@ -154,7 +152,6 @@
"react-helmet": "^6.1.0",
"react-hot-toast": "^2.4.0",
"react-hotkeys": "^1.1.4",
"react-immutable-proptypes": "^2.2.0",
"react-immutable-pure-component": "^2.2.2",
"react-inlinesvg": "^3.0.0",
"react-intl": "^5.0.0",
@ -240,6 +237,7 @@
"resolutions": {
"@types/react": "^18.0.26",
"@types/react-dom": "^18.0.10",
"glob-parent": "^6.0.1",
"jsonwebtoken": "^9.0.0",
"loader-utils": "^2.0.3"
}

3
webpack/rules/node-modules.ts
View File

@ -17,9 +17,6 @@ const rule: RuleSetRule = {
loader: 'babel-loader',
options: {
babelrc: false,
plugins: [
'transform-react-remove-prop-types',
],
cacheDirectory: join(settings.cache_path, 'babel-loader-node-modules'),
cacheCompression: env.NODE_ENV === 'production',
compact: false,

23
yarn.lock
View File

@ -3831,11 +3831,6 @@ babel-plugin-react-intl@^7.5.20:
intl-messageformat-parser "^5.3.7"
schema-utils "^2.6.6"
babel-plugin-transform-react-remove-prop-types@^0.4.24:
version "0.4.24"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
babel-plugin-transform-require-context@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-require-context/-/babel-plugin-transform-require-context-0.1.1.tgz#319b545ca83080b5062776b46cc9b8b346fea9a6"
@ -6085,14 +6080,7 @@ gitlab@^10.0.1:
query-string "^6.8.2"
universal-url "^2.0.0"
glob-parent@^5.1.2, glob-parent@~5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
dependencies:
is-glob "^4.0.1"
glob-parent@^6.0.1, glob-parent@^6.0.2:
glob-parent@^5.1.2, glob-parent@^6.0.1, glob-parent@^6.0.2, glob-parent@~5.1.2:
version "6.0.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
@ -6700,7 +6688,7 @@ intl-pluralrules@^1.3.1:
resolved "https://registry.yarnpkg.com/intl-pluralrules/-/intl-pluralrules-1.3.1.tgz#304ec4038a597894f6616633cbf5e66fb3dbee04"
integrity sha512-sNYPls1Q4fyN0EGLFVJ7TIuaMWln01LupLozfIBt69rHK0DHehghMSz6ejfnSklgRddnyQSEaQPIU6d9TCKH3w==
invariant@^2.2.2, invariant@^2.2.4:
invariant@^2.2.4:
version "2.2.4"
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
@ -9453,13 +9441,6 @@ react-hotkeys@^1.1.4:
mousetrap "^1.5.2"
prop-types "^15.6.0"
react-immutable-proptypes@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz#cce96d68cc3c18e89617cbf3092d08e35126af4a"
integrity sha512-Vf4gBsePlwdGvSZoLSBfd4HAP93HDauMY4fDjXhreg/vg6F3Fj/MXDNyTbltPC/xZKmZc+cjLu3598DdYK6sgQ==
dependencies:
invariant "^2.2.2"
react-immutable-pure-component@^2.2.2:
version "2.2.2"
resolved "https://registry.yarnpkg.com/react-immutable-pure-component/-/react-immutable-pure-component-2.2.2.tgz#3014d3e20cd5a7a4db73b81f1f1464f4d351684b"