Merge commit '6aeb162927e6f9bbfd597632a10d82d9656c2385' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes.
This commit is contained in:
		
							
								
								
									
										13
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								package.json
									
									
									
									
									
								
							@@ -53,13 +53,13 @@
 | 
			
		||||
    "cocoon-js-vanilla": "^1.3.0",
 | 
			
		||||
    "color-blend": "^4.0.0",
 | 
			
		||||
    "compression-webpack-plugin": "^6.1.1",
 | 
			
		||||
    "core-js": "^3.30.2",
 | 
			
		||||
    "cross-env": "^7.0.3",
 | 
			
		||||
    "css-loader": "^5.2.7",
 | 
			
		||||
    "cssnano": "^6.0.1",
 | 
			
		||||
    "detect-passive-events": "^2.0.3",
 | 
			
		||||
    "dotenv": "^16.0.3",
 | 
			
		||||
    "emoji-mart": "npm:emoji-mart-lazyload@latest",
 | 
			
		||||
    "es6-symbol": "^3.1.3",
 | 
			
		||||
    "escape-html": "^1.0.3",
 | 
			
		||||
    "exif-js": "^2.3.0",
 | 
			
		||||
    "express": "^4.18.2",
 | 
			
		||||
@@ -83,14 +83,11 @@
 | 
			
		||||
    "mini-css-extract-plugin": "^1.6.2",
 | 
			
		||||
    "mkdirp": "^2.1.6",
 | 
			
		||||
    "npmlog": "^7.0.1",
 | 
			
		||||
    "object-assign": "^4.1.1",
 | 
			
		||||
    "object.values": "^1.1.6",
 | 
			
		||||
    "path-complete-extname": "^1.0.0",
 | 
			
		||||
    "pg": "^8.5.0",
 | 
			
		||||
    "pg-connection-string": "^2.5.0",
 | 
			
		||||
    "postcss": "^8.4.23",
 | 
			
		||||
    "postcss-loader": "^4.3.0",
 | 
			
		||||
    "promise.prototype.finally": "^3.1.4",
 | 
			
		||||
    "prop-types": "^15.8.1",
 | 
			
		||||
    "punycode": "^2.3.0",
 | 
			
		||||
    "react": "^16.14.0",
 | 
			
		||||
@@ -129,7 +126,7 @@
 | 
			
		||||
    "tesseract.js": "^2.1.5",
 | 
			
		||||
    "tiny-queue": "^0.2.1",
 | 
			
		||||
    "twitter-text": "3.1.0",
 | 
			
		||||
    "uuid": "^8.3.1",
 | 
			
		||||
    "uuid": "^9.0.0",
 | 
			
		||||
    "webpack": "^4.46.0",
 | 
			
		||||
    "webpack-assets-manifest": "^4.0.6",
 | 
			
		||||
    "webpack-bundle-analyzer": "^4.8.0",
 | 
			
		||||
@@ -179,11 +176,11 @@
 | 
			
		||||
    "@types/react-toggle": "^4.0.3",
 | 
			
		||||
    "@types/redux-immutable": "^4.0.3",
 | 
			
		||||
    "@types/requestidlecallback": "^0.3.5",
 | 
			
		||||
    "@types/uuid": "^8.3.4",
 | 
			
		||||
    "@types/uuid": "^9.0.0",
 | 
			
		||||
    "@types/webpack": "^4.41.33",
 | 
			
		||||
    "@types/yargs": "^17.0.24",
 | 
			
		||||
    "@typescript-eslint/eslint-plugin": "^5.59.2",
 | 
			
		||||
    "@typescript-eslint/parser": "^5.59.2",
 | 
			
		||||
    "@typescript-eslint/eslint-plugin": "^5.59.5",
 | 
			
		||||
    "@typescript-eslint/parser": "^5.59.5",
 | 
			
		||||
    "babel-jest": "^29.5.0",
 | 
			
		||||
    "eslint": "^8.39.0",
 | 
			
		||||
    "eslint-plugin-formatjs": "^4.10.1",
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user