Skip to content

Commit

Permalink
Merge pull request #299 from input-output-hk/develop
Browse files Browse the repository at this point in the history
Release 1.0.0-rc.2 merge
  • Loading branch information
rhyslbw authored May 14, 2020
2 parents d3e997e + dbe5ee5 commit 85d8625
Show file tree
Hide file tree
Showing 13 changed files with 1,423 additions and 788 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ yarn-error.log
.DS_Store
.env
generated/
result*
7 changes: 7 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,18 @@ module.exports = withPlugins(
},
webpack(config, options) {

if (options.isServer) {
config.externals = ['react', 'react-dom', 'react-ssr-prepass', ...config.externals]
}

// Alias react with Preact
config.resolve.alias = {
...config.resolve.alias,
'react': "preact/compat",
'react$': "preact/compat",
"react-dom": "preact/compat",
'react-dom$': 'preact/compat',
"react-ssr-prepass": "preact-ssr-prepass",
};

config.plugins.push(new LodashModuleReplacementPlugin());
Expand Down
17 changes: 17 additions & 0 deletions nix/node-packages/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# This file has been generated by node2nix 1.7.0. Do not edit!

{ pkgs
, nodejs
}:

let
nodeEnv = import ./node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};
in
import ./node-packages.nix {
inherit (pkgs) fetchurl fetchgit;
inherit nodeEnv;
}
Loading

0 comments on commit 85d8625

Please sign in to comment.