inrupt · james-martin-jd · Dec 18, 2019 · May 31, 2019 · Aug 28, 2019 · Aug 30, 2019
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,37 @@
 # Solid React Application Generator
 
+## 0.7.0 (December 18, 2019)
+
+#### Solid React Application Base
+
+##### Added
+* Text Editor page
+    * New text editor page shows examples of loading files, granting sharing permissions, and saving file changes back to the Pod, as well as creating new files
+* Form Model Converter page
+    * Form Model converter page (found in the top-right profile menu) shows examples of converting a ShEx shape into a Form Model object
+* Form Model Render page
+    * This new page (also found in the top-right profile menu) takes an input of a Form Model IRI and a data source link, and outputs a fully functional (and styled) form
+    * It serves as a living code example of how to integrate the Form Model rendering component into your own application
+
+##### Updated
+* Notifications displayed in the top-right menu are now validated via ShEx against the [core notification shape](https://shexshapes.inrupt.net/public/notifications/core-notification.shex) first. This way if there are nonconformant items in your inbox, the application won't try to render them and potential break the UI
+* Profile page no longer uses deprecated ShExFormBuilder control, and instead replaces it with the new FormModel component
+
+##### Fixed
+* Game files, settings.ttl, and the inbox now autorepair if one or more of them is missing. This is particularly useful if you need to grant extra permissions, or forget to add Control permissions. Not only does it create the correct files and folders, but it also repairs the permissions on the inbox.
+* Removed some dependencies from webpack settings to make the build smaller and simpler
+* Site no longer throws a full page error if no permissions are detected. Previously it was assuming an empty array, but in some cases this can be a null object instead, which caused a code failure
+* Tic Tac Toe external game links are now linked from data.ttl using the `schema:hasPart` predicate, replacing the previous `ldp:contains` link. While this worked fine in Node Solid Server, it went against the spec of how that predicate should work, so we switched it to something more appropriate
+* Fixed an issue where the game status was not updating from invited status in some circumstances
+
+
+## 0.6.2 (September 11, 2019)
+
+#### Solid React Application Base
+
+##### Updated
+* Updated dependency packages to fix security vulnerabilities
+
 ## 0.6.1 (August 28, 2019)
 
 #### Generator
@@ -188,8 +220,8 @@
 - Built scaffolded app with create-react-app, ejected to allow change in webpack configurations
 - [LDFlex for Solid](https://github.com/solid/query-ldflex) added as the primary interface for most Linked Data operations
 - Dependencies from [Solid React SDK](https://github.com/inrupt-inc/solid-react-sdk):
-  - [Atomic Style Guide for Solid](https://github.com/Inrupt-inc/inrupt-atomic-styleguide) to provide global styling
-  - [Solid React Components Library](https://github.com/Inrupt-inc/solid-react-components) to provide reusable core functionality
+  - [Atomic Style Guide for Solid](https://github.com/inrupt/inrupt-atomic-styleguide) to provide global styling
+  - [Solid React Components Library](https://github.com/inrupt/solid-react-components) to provide reusable core functionality
 - [Styled Components](https://www.styled-components.com/) added as dependency to handle layout and custom styling
 - Basic and Authenticated Nav Bar
 - Login page

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,4 +2,5 @@
 
 Thank you for your interest in contributing to the Solid React Generator! 
 
-Before getting started, please review the [Solid React SDK Contributor Guide](https://github.com/Inrupt-inc/solid-react-sdk/blob/master/CONTRIBUTING.md). 
+Before getting started, please review the [Solid React SDK Contributor Guide](https://github.com/inrupt/solid-react-sdk/blob/master/CONTRIBUTING.md)
+and the [Developer Documentation](https://github.com/inrupt/generator-solid-react/blob/develop/docs/development.md).
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ To install the Generator, you will need [npm](https://www.npmjs.com/get-npm), an
 * [npm](https://www.npmjs.com/get-npm) makes it easy for JavaScript developers to share and reuse code, and makes it easy to update the code that you’re sharing. We recommend the use of a node version manager (nvm) to manage multiple versions of npm, and will also set up your npm permissions properly. To install using a nvm, follow the instructions [here](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm#using-a-node-version-manager-to-install-node-js-and-npm).
 * [Yeoman](https://yeoman.io) provides a generator ecosystem to scaffold complete projects. You can install Yeoman by running the command: ```npm install -g yo```
 ### Note on npm permissions
-If you receive EACCES permission errors, or other permission-related errors when trying to run `npm install -g`, please refer to [this npm document](https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally_) on how to set your permissions correctly.
+If you receive EACCES permission errors, or other permission-related errors when trying to run `npm install -g`, please refer to [this npm document](https://docs.npmjs.com/resolving-eacces-permissions-errors-when-installing-packages-globally) on how to set your permissions correctly.
 ## Installation
 
 To install the generator:
@@ -38,6 +38,7 @@ Once the generator is installed, you can create a new application with just a fe
    4. Whether the application is private or public.
 4. Navigate into the new folder.
 5. If you would like to start the application, simply run ``` npm run start ``` in the new folder, otherwise you can begin editing and writing your application!
+   1. If you would like to run the application in HTTPS mode, you can run the command ```HTTPS=true npm start```, which will launch your app on localhost, using the HTTPS protocol.
 
 Note: We have noticed an error is sometimes thrown when the generator tries to install one of the dependencies of application. If this occurs, try installing [Git](https://git-scm.com/downloads) and then recreating your application.
 
@@ -153,6 +154,11 @@ A key part of modern web applications is notifications. Alongside the solid-reac
 
 Notifications are generated via the TicTacToe game example. Invites are sent to webIDs provided in the game creation form, and whenever a move is taken in the game a notification is sent to the opponent.
 
+## Forms and Form Models
+Building forms is a fundamental part of many web applications, and on our Profile page we've given an example of how to build dynamic forms in Solid. This uses a concept called a Form Model to render a profile form, and provides code examples of how to use Form Models on your own application.
+
+For more information, please see the solid-react-components.
+
 ## Deployment
 
 Once your application is ready, you can deploy it to a server of your choice.

diff --git a/docs/development.md b/docs/development.md
@@ -0,0 +1,12 @@
+# Generator development
+
+## Making a change to the generated code
+First, generate an empty generator app and make and test your changes there.
+Then copy the changes you made in the src/ folder of your app to generators/app/src/ folder of the generator.
+
+## Adding a menu item
+See https://github.com/inrupt/generator-solid-react/pull/249 for an example.
+
+## Testing the generator locally
+To try out the generator with your change follow the [`yo` from a local generator](https://github.com/yeoman/yo#usage)
+instructions.
diff --git a/docs/hosting.md b/docs/hosting.md
@@ -0,0 +1,6 @@
+# Hosting
+
+When deploying an app generated with this generator, make sure to deploy the `build/` folder. Depending on your webserver
+setup, you will probably have to set the index.html document as a custom 404 page. Otherwise, routes like
+https://your-app.com/login and https://your-app.com/welcome will not work and display a 404 page instead, when visited
+directly.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -131,10 +131,18 @@ module.exports = class extends Generator {
                     src: 'src/containers/Profile/**',
                     dest: 'src/containers/Profile',
                 },
+                {
+                    src: 'src/containers/TextEditor/**',
+                    dest: 'src/containers/TextEditor',
+                },
                 {
                     src: 'src/containers/TicTacToe/**',
                     dest: 'src/containers/TicTacToe',
                 },
+                {
+                    src: 'src/containers/FormModel/**',
+                    dest: 'src/containers/FormModel',
+                },
                 { src: '.env' }
             );
         } else {

diff --git a/generators/app/templates/config/webpack.config.js b/generators/app/templates/config/webpack.config.js
@@ -599,7 +599,13 @@ module.exports = function(webpackEnv) {
     //  no need to ship React since it's shipped with the main app
     externals: {
       'solid-auth-client': ['solid', 'auth'],
-      '@solid/query-ldflex': ['solid', 'data']
+      '@solid/query-ldflex': ['solid', 'data'],
+      // Disable shims for supported browser features
+      'web-streams-polyfill': 'window',
+      // Exclude the following unneeded modules
+      '@comunica/actor-rdf-serialize-jsonld': 'null',
+      'graphql': 'null',
+      'graphql-to-sparql': 'null',
     },
     // Some libraries import Node modules but don't use them in the browser.
     // Tell Webpack to provide empty mocks for them so importing them works.