From e4f5c416972e7d89c511ee419a6bbd5c5a48b679 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Tue, 24 Jan 2017 09:22:53 -0500 Subject: [PATCH] Support Steal 1.0 This makes donejs-firebase support Steal 1.0 by setting the "steal" property in package.json when available. Still backwards compatible with Steal 0.16. --- default/index.js | 22 ++++++++++++++-------- test/index.js | 4 ++-- test/templates/package.json | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/default/index.js b/default/index.js index bf84aa7..aef91a8 100644 --- a/default/index.js +++ b/default/index.js @@ -33,19 +33,25 @@ module.exports = generator.Base.extend({ this.conflicter.force = true; // update package.json - this.fs.extendJSON(this.pkgPath, { + var pkg = require(this.pkgPath); + var stealProp = pkg.system ? "system" : "steal"; + + var newPkgConfig = { scripts: { deploy: "firebase deploy", "deploy:ci": "firebase deploy --token \"$FIREBASE_TOKEN\"" - }, - system: { - envs: { - 'server-production': { - renderingBaseURL: 'https://' + firebaseAppName + '.firebaseapp.com/' - } + } + }; + + newPkgConfig[stealProp] = { + envs: { + 'server-production': { + renderingBaseURL: 'https://' + firebaseAppName + '.firebaseapp.com/' } } - }); + }; + + this.fs.extendJSON(this.pkgPath, newPkgConfig); this.fs.extendJSON(this.firebaseJsonPath, { hosting: { diff --git a/test/index.js b/test/index.js index ca6ce93..2163a09 100644 --- a/test/index.js +++ b/test/index.js @@ -29,7 +29,7 @@ describe('donejs-firebase', function() { } }); assert.JSONFileContent('package.json', { - system: { + steal: { envs: { 'server-production': { renderingBaseURL: 'https://firebase-app-name.firebaseapp.com/' @@ -43,7 +43,7 @@ describe('donejs-firebase', function() { assert.file(['package.json']); assert.JSONFileContent('package.json', { name: 'donejs-app', - system: { + steal: { main: 'donejs-app/index.stache!done-autorender', directories: { lib: 'src' diff --git a/test/templates/package.json b/test/templates/package.json index d374ae3..6b03187 100644 --- a/test/templates/package.json +++ b/test/templates/package.json @@ -20,7 +20,7 @@ "src" ], "keywords": [], - "system": { + "steal": { "main": "donejs-app/index.stache!done-autorender", "directories": { "lib": "src"