From fe11b7977a0c06cd53b7b4603564a1d78160d4ff Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Wed, 25 Jul 2018 01:59:34 +0200 Subject: [PATCH 1/4] minor fixs --- generators/app/index.js | 2 +- generators/app/templates/controller.xql | 2 +- test/generated-pkg/app-polymer-element.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/generators/app/index.js b/generators/app/index.js index a6e547dd..ba064fce 100644 --- 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 index edceba62..f7f9ff68 100755 --- 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 - + <% } %> diff --git a/test/generated-pkg/app-polymer-element.js b/test/generated-pkg/app-polymer-element.js index 49b52d56..056a9953 100644 --- a/test/generated-pkg/app-polymer-element.js +++ b/test/generated-pkg/app-polymer-element.js @@ -4,7 +4,7 @@ var assert = require('yeoman-assert') var helpers = require('yeoman-test') var fs = require('fs-extra') -describe('polymer element', function () { +describe.only('polymer element', function () { before(function () { this.timeout(30000) return helpers.run(path.join(__dirname, '../../generators/app')) From 23200d89511488cace61b4e855b2a2b3ffbfb99b Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Wed, 25 Jul 2018 18:54:06 +0200 Subject: [PATCH 2/4] readme edits polymer-cli is out --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 5c421948..b7dcd68a 100644 --- 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. From 525b93d31dfb010784f9f5fdacb17635df7597ae Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Wed, 25 Jul 2018 20:24:15 +0200 Subject: [PATCH 3/4] =?UTF-8?q?use=20dev=20in=20example=20=E2=80=A6=20poly?= =?UTF-8?q?=20stuff=20works=20better?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- generators/app/templates/github/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/app/templates/github/readme.md b/generators/app/templates/github/readme.md index 020fc1bc..61f1bae1 100644 --- 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). From 5e51a65ef12b92970ba79ae602bfe168979cda2c Mon Sep 17 00:00:00 2001 From: Duncan Paterson Date: Wed, 25 Jul 2018 20:58:20 +0200 Subject: [PATCH 4/4] cleanup --- test/generated-pkg/app-polymer-element.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/generated-pkg/app-polymer-element.js b/test/generated-pkg/app-polymer-element.js index 056a9953..49b52d56 100644 --- a/test/generated-pkg/app-polymer-element.js +++ b/test/generated-pkg/app-polymer-element.js @@ -4,7 +4,7 @@ var assert = require('yeoman-assert') var helpers = require('yeoman-test') var fs = require('fs-extra') -describe.only('polymer element', function () { +describe('polymer element', function () { before(function () { this.timeout(30000) return helpers.run(path.join(__dirname, '../../generators/app'))