From 1e468ab671e7810f0eb48d88528c0f0ea210e8d8 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sat, 24 Oct 2020 12:12:13 -0500 Subject: [PATCH] Upgrading deps, moving to webpack 5 --- package.json | 65 +- src/service-worker.ts | 30 +- src/shared/components/symbols.tsx | 51 +- src/shared/env.ts | 3 +- src/shared/i18next.ts | 2 +- webpack.config.js | 12 +- yarn.lock | 2424 ++++++++++++----------------- 7 files changed, 1077 insertions(+), 1510 deletions(-) diff --git a/package.json b/package.json index 85e99a1..227b27c 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,12 @@ "author": "Dessalines ", "license": "AGPL-3.0", "scripts": { - "build:client:dev": "webpack --env.platform=client --mode=development", - "build:client:prod": "webpack --env.platform=client --mode=production", + "build:client:dev": "webpack --env platform=client --mode=development", + "build:client:prod": "webpack --env platform=client --mode=production", "build:dev": "yarn run build:server:dev && yarn run build:client:dev", "build:prod": "yarn run build:server:prod && yarn run build:client:prod", - "build:server:dev": "webpack --env.platform=server --mode=development", - "build:server:prod": "webpack --env.platform=server --mode=production", + "build:server:dev": "webpack --env platform=server --mode=development", + "build:server:prod": "webpack --env platform=server --mode=production", "clean": "yarn run rimraf dist", "dev": "nodemon --watch ./src/shared/components -e ts,tsx,css,scss --exec yarn run start", "lint": "tsc --noEmit && eslint --report-unused-disable-directives --ext .js,.ts,.tsx src", @@ -20,25 +20,25 @@ }, "repository": "https://github.com/LemmyNet/lemmy-ui", "dependencies": { - "@typescript-eslint/parser": "^4.4.0", + "@typescript-eslint/parser": "^4.5.0", "autosize": "^4.0.2", "choices.js": "^9.0.1", "emoji-short-name": "^1.0.0", "express": "~4.17.1", "i18next": "^19.8.2", - "inferno": "^7.4.5", - "inferno-create-element": "^7.4.5", + "inferno": "^7.4.6", + "inferno-create-element": "^7.4.6", "inferno-helmet": "^5.2.1", - "inferno-hydrate": "^7.4.5", + "inferno-hydrate": "^7.4.6", "inferno-i18next": "github:nimbusec-oss/inferno-i18next#semver:^7.4.2", - "inferno-router": "^7.4.5", - "inferno-server": "^7.4.5", + "inferno-router": "^7.4.6", + "inferno-server": "^7.4.6", "isomorphic-cookie": "^1.2.4", "isomorphic-ws": "^4.0.1", "jwt-decode": "^3.0.0", - "markdown-it": "^11.0.1", + "markdown-it": "^12.0.2", "markdown-it-container": "^3.0.0", - "markdown-it-emoji": "^1.4.0", + "markdown-it-emoji": "^2.0.0", "markdown-it-sub": "^1.0.0", "markdown-it-sup": "^1.0.0", "moment": "^2.29.1", @@ -46,47 +46,48 @@ "register-service-worker": "^1.7.1", "rxjs": "^6.6.3", "serialize-javascript": "^5.0.1", - "tippy.js": "^6.1.1", - "toastify-js": "^1.9.2", + "tippy.js": "^6.2.7", + "toastify-js": "^1.9.3", "tributejs": "^5.1.3", "ws": "^7.3.1" }, "devDependencies": { - "@babel/core": "^7.5.5", - "@babel/plugin-transform-runtime": "^7.11.5", - "@babel/plugin-transform-typescript": "^7.11.0", - "@babel/preset-env": "7.11.5", - "@babel/preset-typescript": "^7.3.3", + "@babel/core": "^7.12.3", + "@babel/plugin-transform-runtime": "^7.12.1", + "@babel/plugin-transform-typescript": "^7.12.1", + "@babel/preset-env": "7.12.1", + "@babel/preset-typescript": "^7.12.1", + "@babel/runtime": "^7.12.1", "@types/autosize": "^3.0.6", "@types/express": "^4.17.8", - "@types/node": "^14.11.8", + "@types/node": "^14.14.2", "@types/node-fetch": "^2.5.7", "@types/serialize-javascript": "^4.0.0", "babel-loader": "^8.0.6", "babel-plugin-inferno": "^6", - "bootstrap": "^4.5.2", - "bootswatch": "^4.5.2", + "bootstrap": "^4.5.3", + "bootswatch": "^4.5.3", "clean-webpack-plugin": "^3.0.0", "copy-webpack-plugin": "^6.2.1", - "css-loader": "^4.3.0", - "eslint": "^7.11.0", - "eslint-plugin-jane": "^9.0.3", + "css-loader": "^5.0.0", + "eslint": "^7.12.0", + "eslint-plugin-jane": "^9.0.4", "husky": "^4.3.0", "lemmy-js-client": "^1.0.14", - "lint-staged": "^10.4.0", - "mini-css-extract-plugin": "^1.0.0", + "lint-staged": "^10.4.2", + "mini-css-extract-plugin": "^1.2.0", "node-fetch": "^2.6.1", "node-sass": "^4.12.0", - "nodemon": "^2.0.4", + "nodemon": "^2.0.6", "prettier": "^2.1.2", "rimraf": "^3.0.2", - "sass-loader": "^10.0.3", + "sass-loader": "^10.0.4", "sortpack": "^2.1.9", "style-loader": "^2.0.0", - "terser": "^5.3.4", + "terser": "^5.3.8", "typescript": "^4.0.3", - "webpack": "4.44.2", - "webpack-cli": "^3.3.6", + "webpack": "5.2.0", + "webpack-cli": "^4.1.0", "webpack-dev-server": "3.11.0", "webpack-node-externals": "^2.5.2" }, diff --git a/src/service-worker.ts b/src/service-worker.ts index a7e1bd5..ca9fe21 100644 --- a/src/service-worker.ts +++ b/src/service-worker.ts @@ -2,21 +2,21 @@ import { register } from 'register-service-worker'; register('/service-worker.js', { registrationOptions: { scope: './' }, - ready(registration) { - console.log('Service worker is active.'); - }, - registered(registration) { - console.log('Service worker has been registered.'); - }, - cached(registration) { - console.log('Content has been cached for offline use.'); - }, - updatefound(registration) { - console.log('New content is downloading.'); - }, - updated(registration) { - console.log('New content is available; please refresh.'); - }, + // ready(registration) { + // console.log('Service worker is active.'); + // }, + // registered(registration) { + // console.log('Service worker has been registered.'); + // }, + // cached(registration) { + // console.log('Content has been cached for offline use.'); + // }, + // updatefound(registration) { + // console.log('New content is downloading.'); + // }, + // updated(registration) { + // console.log('New content is available; please refresh.'); + // }, offline() { console.log( 'No internet connection found. App is running in offline mode.' diff --git a/src/shared/components/symbols.tsx b/src/shared/components/symbols.tsx index 327a40b..a85ed70 100644 --- a/src/shared/components/symbols.tsx +++ b/src/shared/components/symbols.tsx @@ -9,7 +9,12 @@ export class Symbols extends Component { return (