Sync the next branch with master

.all-contributorsrc

@@ -76,6 +76,17 @@
         "example",
         "plugin"
       ]
+    },
+    {
+      "login": "rayandrews",
+      "name": "Ray Andrew",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/4437323?v=4",
+      "profile": "https://www.linkedin.com/in/ray-andrew/",
+      "contributions": [
+        "code",
+        "example",
+        "plugin"
+      ]
     }
   ]
 }

.github/stale.yml

@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: stale
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  Hola! So here's the deal, between open source and my day job and life and what not, I have a lot to manage, so I use a GitHub bot to automate a few things here and there. This particular GitHub bot is going to mark this as stale because it has not had
+  recent activity for a while. It will be closed if no further activity occurs in a few days. Do not take this personally--seriously--this is a completely automated action. If this is a mistake, just make a comment, DM me, send a carrier pidgeon, or a smoke signal. 
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  ProBot automatically closed this due to inactivity. Holler if this is a mistake, and we'll re-open it.

CHANGELOG.md

@@ -0,0 +1 @@
+See [Release Notes](https://github.com/jaredpalmer/razzle/releases)

examples/basic/package.json

@@ -1,6 +1,6 @@
 {
   "name": "razzle-examples-basic",
-  "version": "2.0.0-alpha.12",
+  "version": "2.4.0",
   "license": "MIT",
   "scripts": {
     "start": "razzle start",
@@ -14,6 +14,6 @@
     "react-dom": "^16.0.0"
   },
   "devDependencies": {
-    "razzle": "^2.0.0-alpha.12"
+    "razzle": "^2.4.0"
   }
 }

examples/basic/src/index.js

@@ -1,9 +1,15 @@
 import express from 'express';
-import app from './server';
+
+let app = require('./server').default;
 
 if (module.hot) {
   module.hot.accept('./server', function() {
     console.log('🔁  HMR Reloading `./server`...');
+    try {
+      app = require('./server').default;
+    } catch (error) {
+      console.error(error);
+    }
   });
   console.info('✅  Server-side HMR Enabled!');
 }

examples/with-afterjs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "razzle-examples-with-afterjs",
-  "version": "2.0.0-alpha.12",
+  "version": "2.4.0",
   "license": "MIT",
   "scripts": {
     "start": "razzle start",
@@ -11,7 +11,7 @@
   "dependencies": {
     "@jaredpalmer/after": "latest",
     "express": "^4.16.2",
-    "razzle": "^2.0.0-alpha.12",
+    "razzle": "^2.4.0",
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-helmet": "^5.2.0",

examples/with-afterjs/src/index.js

@@ -1,26 +1,27 @@
-import app from './server';
-import http from 'http';
+import express from 'express';
 
-const server = http.createServer(app);
-
-let currentApp = app;
-
-server.listen(process.env.PORT || 3000, error => {
-  if (error) {
-    console.log(error);
-  }
-
-  console.log('🚀 started');
-});
+let app = require('./server').default;
 
 if (module.hot) {
-  console.log('✅  Server-side HMR Enabled!');
-
-  module.hot.accept('./server', () => {
+  module.hot.accept('./server', function() {
     console.log('🔁  HMR Reloading `./server`...');
-    server.removeListener('request', currentApp);
-    const newApp = require('./server').default;
-    server.on('request', newApp);
-    currentApp = newApp;
+    try {
+      app = require('./server').default;
+    } catch (error) {
+      console.error(error);
+    }
   });
+  console.info('✅  Server-side HMR Enabled!');
 }
+
+const port = process.env.PORT || 3000;
+
+export default express()
+  .use((req, res) => app.handle(req, res))
+  .listen(port, function(err) {
+    if (err) {
+      console.error(err);
+      return;
+    }
+    console.log(`> Started on port ${port}`);
+  });

examples/with-custom-babel-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "razzle-examples-with-custom-babel-config",
-  "version": "2.0.0-alpha.12",
+  "version": "2.4.0",
   "license": "MIT",
   "scripts": {
     "start": "razzle start",
@@ -17,6 +17,6 @@
   },
   "devDependencies": {
     "babel-preset-stage-0": "^6.22.0",
-    "razzle": "^2.0.0-alpha.12"
+    "razzle": "^2.4.0"
   }
 }

examples/with-custom-babel-config/src/index.js

@@ -1,9 +1,15 @@
 import express from 'express';
-import app from './server';
+
+let app = require('./server').default;
 
 if (module.hot) {
   module.hot.accept('./server', function() {
     console.log('🔁  HMR Reloading `./server`...');
+    try {
+      app = require('./server').default;
+    } catch (error) {
+      console.error(error);
+    }
   });
   console.info('✅  Server-side HMR Enabled!');
 }

examples/with-custom-environment-variables/package.json

@@ -1,6 +1,6 @@
 {
   "name": "razzle-examples-with-custom-environment-variables",
-  "version": "2.0.0-alpha.12",
+  "version": "2.4.0",
   "license": "MIT",
   "scripts": {
     "start": "razzle start",
@@ -15,6 +15,6 @@
     "serialize-javascript": "^1.3.0"
   },
   "devDependencies": {
-    "razzle": "^2.0.0-alpha.12"
+    "razzle": "^2.4.0"
   }
 }

examples/with-custom-environment-variables/src/index.js

@@ -1,9 +1,15 @@
 import express from 'express';
-import app from './server';
+
+let app = require('./server').default;
 
 if (module.hot) {
   module.hot.accept('./server', function() {
     console.log('🔁  HMR Reloading `./server`...');
+    try {
+      app = require('./server').default;
+    } catch (error) {
+      console.error(error);
+    }
   });
   console.info('✅  Server-side HMR Enabled!');
 }

examples/with-custom-webpack-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "razzle-examples-with-custom-webpack-config",
-  "version": "2.0.0-alpha.12",
+  "version": "2.4.0",
   "license": "MIT",
   "scripts": {
     "start": "razzle start",
@@ -15,6 +15,6 @@
     "serialize-javascript": "^1.3.0"
   },
   "devDependencies": {
-    "razzle": "^2.0.0-alpha.12"
+    "razzle": "^2.4.0"
   }
 }

examples/with-custom-webpack-config/src/index.js

@@ -1,9 +1,15 @@
 import express from 'express';
-import app from './server';
+
+let app = require('./server').default;
 
 if (module.hot) {
   module.hot.accept('./server', function() {
     console.log('🔁  HMR Reloading `./server`...');
+    try {
+      app = require('./server').default;
+    } catch (error) {
+      console.error(error);
+    }
   });
   console.info('✅  Server-side HMR Enabled!');
 }

examples/with-elm/README.md

@@ -1,6 +1,7 @@
 # Razzle Elm Example
 
 ## How to use
+
 Download the example [or clone the whole project](https://github.com/jaredpalmer/razzle.git):
 
 ```bash
@@ -16,18 +17,19 @@ yarn start
 ```
 
 ## Idea behind the example
+
 This is a basic example of how to use Razzle and Elm, it uses:
 
-- [elm-static-html](https://github.com/eeue56/elm-static-html-lib) to convert Elm views into raw html
-- [elm-webpack-loader](https://github.com/elm-community/elm-webpack-loader) load elm files and import them into javascript
-- [elm-hot-loader](https://github.com/fluxxu/elm-hot-loader) hot reload all Elm files while dev
+* [elm-static-html](https://github.com/eeue56/elm-static-html-lib) to convert Elm views into raw html
+* [elm-webpack-loader](https://github.com/elm-community/elm-webpack-loader) load elm files and import them into javascript
+* [elm-hot-loader](https://github.com/fluxxu/elm-hot-loader) hot reload all Elm files while dev
 
 `src/client.js` contains all the js code required to load Elm, you can configure Elm ports here
 `src/server.js` the server side, here call `elm-static-html-lib` with the respective module to render the view
 
 ---
 
-If you want to activate the Elm debug mode or other tooling and debug utilites of Elm edit `razzle.config.js`: 
+If you want to activate the Elm debug mode or other tooling and debug utilites of Elm edit `razzle.config.js`:
 
 ```js
 {
@@ -40,3 +42,5 @@ If you want to activate the Elm debug mode or other tooling and debug utilites o
     }
 }
 ```
+
+As of Razzle 2.0, you can now use [razzle-plugin-elm](../../packages/razzle-plugin-elm/README.md) instead of adding the webpack loaders on your own.

examples/with-elm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "razzle-examples-with-elm",
-  "version": "2.0.0-alpha.12",
+  "version": "2.4.0",
   "license": "MIT",
   "scripts": {
     "postinstall": "elm-package install -y",
@@ -16,6 +16,6 @@
   "devDependencies": {
     "elm-hot-loader": "^0.5.4",
     "elm-webpack-loader": "4.5.0",
-    "razzle": "^2.0.0-alpha.12"
+    "razzle": "^2.4.0"
   }
 }

examples/with-elm/razzle.config.js

@@ -4,50 +4,43 @@ module.exports = {
   modify(config, { target, dev }, webpack) {
     const appConfig = config; // stay immutable here
 
-    appConfig.module.rules[2].exclude.push(/\.(elm)$/)
+    appConfig.module.rules[2].exclude.push(/\.(elm)$/);
 
-    appConfig.module.noParse = [/.elm$/]
-    appConfig.resolve.extensions = config.resolve.extensions.concat([
-        '.elm'
-      ]);
-
-    if(dev) {
-      appConfig.module.rules.push(
-        {
+    appConfig.module.noParse = [/.elm$/];
+    appConfig.resolve.extensions.push('.elm');
+
+    if (dev) {
+      appConfig.module.rules.push({
         test: /\.elm$/,
         exclude: [/elm-stuff/, /node_modules/],
         use: [
-          {
-            loader: 'elm-hot-loader'
-          },
           {
             loader: 'elm-webpack-loader',
             options: {
               verbose: true,
               warn: true,
               pathToMake: require('elm/platform').executablePaths['elm-make'],
-              forceWatch: true
-            }
-          }
+              forceWatch: true,
+            },
+          },
         ],
-      })
-    }
-    else { // Production
-      appConfig.module.rules.push(
-        {
+      });
+    } else {
+      // Production
+      appConfig.module.rules.push({
         test: /\.elm$/,
         exclude: [/elm-stuff/, /node_modules/],
         use: [
           {
             loader: 'elm-webpack-loader',
             options: {
               pathToMake: require('elm/platform').executablePaths['elm-make'],
-            }
-          }
+            },
+          },
         ],
-      })
+      });
     }
-    
+
     return appConfig;
   },
-};
+};

examples/with-elm/src/client.js

@@ -1,7 +1,7 @@
-var Elm = require('./Main');
+import Elm from './Main';
 
 // We need embed the Elm app to the div, if we call fullscreen we will have duplicated html
-Elm.Main.embed( document.getElementById( "root" ) );
+Elm.Main.embed(document.getElementById('root'));
 
 if (module.hot) {
   module.hot.accept();