From 8356ece70ef8a4e8dc64174b248aa7745a27545d Mon Sep 17 00:00:00 2001 From: Dessalines Date: Wed, 3 Nov 2021 12:57:13 -0400 Subject: [PATCH] Try fixing crypto node bug. Fixes #473 (#474) * Try fixing crypto node bug. Fixes #473 * v0.13.6-rc.1 --- package.json | 2 +- webpack.config.js | 55 ++++++++++++++++++++++++----------------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 1ee05000..a10a7e66 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "lemmy-ui", "description": "An isomorphic UI for lemmy", - "version": "0.13.0", + "version": "0.13.6-rc.1", "author": "Dessalines ", "license": "AGPL-3.0", "scripts": { diff --git a/webpack.config.js b/webpack.config.js index 8ea0fbd5..315c9001 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,9 +1,9 @@ -const webpack = require('webpack'); -const MiniCssExtractPlugin = require('mini-css-extract-plugin'); -const nodeExternals = require('webpack-node-externals'); -const CopyPlugin = require('copy-webpack-plugin'); -const RunNodeWebpackPlugin = require('run-node-webpack-plugin'); -const { merge } = require('lodash'); +const webpack = require("webpack"); +const MiniCssExtractPlugin = require("mini-css-extract-plugin"); +const nodeExternals = require("webpack-node-externals"); +const CopyPlugin = require("copy-webpack-plugin"); +const RunNodeWebpackPlugin = require("run-node-webpack-plugin"); +const { merge } = require("lodash"); const banner = ` hash:[contentHash], chunkhash:[chunkhash], name:[name], filebase:[base], query:[query], file:[file] @@ -14,11 +14,12 @@ const banner = ` const base = { output: { - filename: 'js/server.js', - publicPath: '/', + filename: "js/server.js", + publicPath: "/", + hashFunction: "xxhash64", }, resolve: { - extensions: ['.js', '.jsx', '.ts', '.tsx'], + extensions: [".js", ".jsx", ".ts", ".tsx"], }, performance: { hints: false, @@ -27,12 +28,12 @@ const base = { rules: [ { test: /\.(scss|css)$/i, - use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'], + use: [MiniCssExtractPlugin.loader, "css-loader", "sass-loader"], }, { test: /\.(js|jsx|tsx|ts)$/, // All ts and tsx files will be process by exclude: /node_modules/, // ignore node_modules - loader: 'babel-loader', + loader: "babel-loader", }, // Due to some weird babel issue: https://github.com/webpack/webpack/issues/11467 { @@ -45,10 +46,10 @@ const base = { }, plugins: [ new MiniCssExtractPlugin({ - filename: 'styles/styles.css', + filename: "styles/styles.css", }), new CopyPlugin({ - patterns: [{ from: './src/assets', to: './assets' }], + patterns: [{ from: "./src/assets", to: "./assets" }], }), new webpack.BannerPlugin({ banner, @@ -59,18 +60,18 @@ const base = { const createServerConfig = (_env, mode) => { const config = merge({}, base, { mode, - entry: './src/server/index.tsx', + entry: "./src/server/index.tsx", output: { - filename: 'js/server.js', + filename: "js/server.js", }, - target: 'node', - externals: [nodeExternals(), 'inferno-helmet'], + target: "node", + externals: [nodeExternals(), "inferno-helmet"], }); - if (mode === 'development') { + if (mode === "development") { config.cache = { - type: 'filesystem', - name: 'server', + type: "filesystem", + name: "server", }; config.plugins.push( @@ -85,16 +86,16 @@ const createServerConfig = (_env, mode) => { const createClientConfig = (_env, mode) => { const config = merge({}, base, { mode, - entry: './src/client/index.tsx', + entry: "./src/client/index.tsx", output: { - filename: 'js/client.js', + filename: "js/client.js", }, }); - if (mode === 'development') { + if (mode === "development") { config.cache = { - type: 'filesystem', - name: 'client', + type: "filesystem", + name: "client", }; } @@ -102,6 +103,6 @@ const createClientConfig = (_env, mode) => { }; module.exports = (env, properties) => [ - createServerConfig(env, properties.mode || 'development'), - createClientConfig(env, properties.mode || 'development'), + createServerConfig(env, properties.mode || "development"), + createClientConfig(env, properties.mode || "development"), ];