Merge pull request #20 from jsjoeio/master

feat(readme, package.json, Post.js):add "clean" script and update slugify function

Author: dwwoelfel

README.md

@@ -12,12 +12,13 @@ If you'd like to learn more about persisted queries, email [[email protected]
 
 ## Setup
 
-Use an existing OneGraph app or sign up sign up at [OneGraph](https://www.onegraph.com) to create a new app. Update the `/.env` file to update the `RAZZLE_ONEGRAPH_APP_ID`  with your app's id. This would also be a good time to replace `REPOSITORY_FIXED_VARIABLES` in the `/.env` file with the repo name and owner for the repo you'd like to back your blog (it uses this repo's issues by default).
+Use an existing OneGraph app or sign up sign up at [OneGraph](https://www.onegraph.com) to create a new app. Update the `/.env` file to update the `RAZZLE_ONEGRAPH_APP_ID` with your app's id. This would also be a good time to replace `REPOSITORY_FIXED_VARIABLES` in the `/.env` file with the repo name and owner for the repo you'd like to back your blog (it uses this repo's issues by default).
 
 Remove the generated files (they're tied to the OneGraph app they were generated with)
 
 ```
-rm -r src/__generated__
+yarn relay:clean
+# which runs rm -r src/__generated__
 ```
 
 (Note: any time you change the variables in `.env`, it's a good idea to stop the relay compiler, remove the files in `src/__generated__`, and restart the compiler)
@@ -46,7 +47,6 @@ OG_GITHUB_TOKEN='<your-github-token>' \
 
 You may need to install [watchman](https://facebook.github.io/watchman/), a file watching service. On mac, do `brew install watchman`. On Windows or Linux, follow the instructions at [https://facebook.github.io/watchman/docs/install.html](https://facebook.github.io/watchman/docs/install.html).
 
-
 ### Start the server
 
 Now that we've generated the relay files, we can start the server.
@@ -57,7 +57,6 @@ yarn start
 
 The project will load at [http://localhost:3000](http://localhost:3000).
 
-
 ## Deploying
 
 The project comes with setups for deploying to Google's Firebase, Zeit's Now, Netlify, and Fly.io.

package.json

@@ -39,6 +39,7 @@
     "test": "razzle test --env=jsdom",
     "start:prod": "NODE_ENV=production node build/server.js",
     "relay": "relay-compiler --src ./src --schema ./schema.graphql --persistFunction scripts/persistQuery.js",
+    "relay:clean": "rm -r src/__generated__",
     "flow": "flow",
     "fetch-schema": "node scripts/fetchSchema.js --path schema.graphql",
     "analyze": "source-map-explorer 'build/public/static/js/*.js'",

src/Post.js

@@ -347,7 +347,13 @@ export const ReactionBar = ({
 };
 
 function slugify(s: string): string {
-  return lowerCase(s).replace(/[^A-Za-z0-9-]+/g, '-');
+  return lowerCase(s)
+    .replace(/\s+/g, '-') // Replace spaces with -
+    .replace(/&/g, '-and-') // Replace & with 'and'
+    .replace(/[^\w\-]+/g, '') // Remove all non-word characters
+    .replace(/\-\-+/g, '-') // Replace multiple - with single -
+    .trimStart() // Trim from start of text
+    .trimEnd(); // Trim from end of text
 }
 
 export function postUrl({