Merge pull request #73 from duncdrum/poly-party

Poly party
eXist-db · Jul 25, 2018 · 0c48384 · 0c48384
2 parents ff96840 + 5e51a65
commit 0c48384
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -31,8 +31,6 @@ npm i
 npm link
 ```
 
-Note: The generator extends the [polymer CLI](https://www.polymer-project.org/1.0/docs/tools/polymer-cli) for use with eXist. Unfortunately, this means we also inherit some warnings about its dependencies. You can safely ignore them. It also means that the initial installation can take a minute or two. Please be patient.
-
 ## Using the Generator
 Then generate your new project: Create a new project folder and navigate to it in you CLI.
 
@@ -48,7 +46,7 @@ yo exist
 
 [![asciicast](https://asciinema.org/a/MqB6TyzdyBJImItHLsfC99Ufj.png)](https://asciinema.org/a/MqB6TyzdyBJImItHLsfC99Ufj)
 
-Note: If you told yeoman to use Github for your new project, your project will start initialised with all files added, out of the box.
+Note: If you told yeoman to use Github for your new project, your project will start initialized with all files added, out of the box.
 
 Some of the answers, such as username will be stored after the initial run of the generator. So you only have to type them once.
 

diff --git a/generators/app/index.js b/generators/app/index.js
@@ -968,7 +968,6 @@ module.exports = class extends Generator {
     // }
   }
 
-  // TODO: conditionally gulp watch
   end () {
     if (this.props.github) {
       this.spawnCommandSync('git', ['init'])
@@ -977,6 +976,7 @@ module.exports = class extends Generator {
     }
     this.spawnCommandSync('ant', '-q')
 
+    // conditional gulp watch
     // if (this.props.apptype[0] === 'polymer') {
     //   this.spawnCommandSync('gulp', ['watch'])
     // }

diff --git a/generators/app/templates/controller.xql b/generators/app/templates/controller.xql
@@ -65,7 +65,7 @@ else if (contains($exist:path, "/$shared/")) then
 <%_ if (apptype == 'polymer') { %>
   else if ($exist:path eq "/demo/") then
     <dispatch xmlns="http://exist.sourceforge.net/NS/exist">
-      <redirect url="/demo/index.html"/>
+      <redirect url="./index.html"/>
     </dispatch>
 <% } %>
 

diff --git a/generators/app/templates/github/readme.md b/generators/app/templates/github/readme.md
@@ -33,7 +33,7 @@ ant
 ```
    1. to only build a specific target call either ``dev`` or ``deploy`` like this:
    ```bash   
-   ant deploy
+   ant dev
    ```   
 
 If you see ``BUILD SUCCESSFUL`` ant has generated a ``<%- title %>-<%- version %>.xar`` file in the ``build/`` folder. To install it, follow the instructions [above](#installation).
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ ant @@
     ```
 . to only build a specific target call either ``dev`` or ``deploy`` like this:
        ```bash
-       ant deploy
+       ant dev
        ```
     If you see ``BUILD SUCCESSFUL`` ant has generated a ``<%- title %>-<%- version %>.xar`` file in the ``build/`` folder. To install it, follow the instructions [above](#installation).
@@ Expand Down @@