Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try fixing crypto node bug. Fixes #473 #474

Merged
merged 2 commits into from
Nov 3, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
"license": "AGPL-3.0",
"scripts": {
Expand Down
55 changes: 28 additions & 27 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -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]
Expand All @@ -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,
Expand All @@ -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
{
Expand All @@ -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,
Expand All @@ -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(
Expand All @@ -85,23 +86,23 @@ 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",
};
}

return config;
};

module.exports = (env, properties) => [
createServerConfig(env, properties.mode || 'development'),
createClientConfig(env, properties.mode || 'development'),
createServerConfig(env, properties.mode || "development"),
createClientConfig(env, properties.mode || "development"),
];