Merge pull request #33 from mean-expert-official/development

Development
mean-expert-official · Dec 22, 2016 · 2284736 · 2284736
2 parents d50dc97 + 7720457
commit 2284736
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@ FireLoop Project Change Log
 ===========================
 
 
+### Release 1.0.0-beta.1.3
+
+- Replaces 1.0.0-beta.1.2
+- Fix npm keepme bug, not replicable in local using npm link
+
 ### Release 1.0.0-beta.1
 
 - Angular 2 (ng2web, ng2native, ng2ionic, ng2universal)

diff --git a/fireloop-cli/package.json b/fireloop-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@mean-expert/fireloop",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.1.3",
   "description": "This CLI Tool generates FireLoop projects and provides a handful way to work with MEAN Stack based Applications.",
   "main": "index.js",
   "bin": {
@@ -27,7 +27,7 @@
     "angular-cli": "^1.0.0-beta.24",
     "chalk": "1.1.3",
     "extfs": "0.0.7",
-    "generator-fireloop": "1.0.0-beta.1",
+    "generator-fireloop": "1.0.0-beta.1.3",
     "yargs": "6.3.0",
     "yeoman-environment": "1.6.5"
   }

diff --git a/generator-fireloop/generators/server/index.js b/generator-fireloop/generators/server/index.js
diff --git a/generator-fireloop/generators/server/index.js.map b/generator-fireloop/generators/server/index.js.map
diff --git a/generator-fireloop/package.json b/generator-fireloop/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-fireloop",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.1.3",
   "main": "generators/app/index.js",
   "author": {
     "name": "Jonathan Casarrubias",
@@ -30,7 +30,7 @@
     "chalk": "1.1.3",
     "change-case": "3.0.0",
     "command-exists": "1.0.2",
-    "generator-fllb": "1.0.0-beta.1",
+    "generator-fllb": "1.0.0-beta.1.3",
     "nodemon": "1.11.0",
     "rimraf": "2.5.4",
     "snyk": "1.19.1",

diff --git a/generator-fireloop/src/server/index.ts b/generator-fireloop/src/server/index.ts
@@ -71,11 +71,6 @@ module.exports = generators.Base.extend({
         output: { directory: 'server', file: 'model-config.json' },
         params: {}
       },
-      {
-        template: 'templates/.keepme',
-        output: { directory: 'tests', file: '.keepme' },
-        params: {}
-      },
       {
         template: 'templates/fireloop/testing.ts',
         output: { directory: 'server/boot', file: 'testing.ts' },
@@ -100,6 +95,11 @@ module.exports = generators.Base.extend({
         template: 'templates/fireloop/tsconfig.json',
         output: { directory: './', file: 'tsconfig.json' },
         params: {}
+      },
+      {
+        template: 'templates/tests/keepme.txt',
+        output: { directory: 'tests', file: '.keepme' },
+        params: {}
       }
     ].forEach(function (config: any) {
       console.info('Generating: %s', "" + config.output.file);

diff --git a/generator-fireloop/templates/.keepme → ...rator-fireloop/templates/tests/keepme.txt b/generator-fireloop/templates/.keepme → ...rator-fireloop/templates/tests/keepme.txt
diff --git a/generator-fllb/package.json b/generator-fllb/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-fllb",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.1.3",
   "description": "Yeoman generator for LoopBack within FireLoop environment",
   "license": "MIT",
   "main": "app/index.js",