From 7e889ef50d94041a9e5e1f44fca322c563cfbe16 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 29 Mar 2015 23:05:32 +1030 Subject: [PATCH] Get ember-cli to watch the flarum-common addon for changes by linking it --- framework/core/ember/admin/package.json | 5 +++-- framework/core/ember/common/index.js | 5 ++++- framework/core/ember/forum/package.json | 5 +++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/framework/core/ember/admin/package.json b/framework/core/ember/admin/package.json index ab902b052..118b80b25 100644 --- a/framework/core/ember/admin/package.json +++ b/framework/core/ember/admin/package.json @@ -9,7 +9,8 @@ "scripts": { "start": "ember server", "build": "ember build", - "test": "ember test" + "test": "ember test", + "preinstall": "sudo npm link ../common" }, "repository": "", "engines": { @@ -36,6 +37,6 @@ "broccoli-ember-inline-template-compiler": "tobscure/broccoli-ember-inline-template-compiler#f884d11", "express": "^4.8.5", "glob": "^4.0.5", - "flarum-common": "file:../common" + "flarum-common": "*" } } diff --git a/framework/core/ember/common/index.js b/framework/core/ember/common/index.js index da3cda672..66e6565e5 100644 --- a/framework/core/ember/common/index.js +++ b/framework/core/ember/common/index.js @@ -2,5 +2,8 @@ 'use strict'; module.exports = { - name: 'flarum-common' + name: 'flarum-common', + isDevelopingAddon: function() { + return true; + } }; diff --git a/framework/core/ember/forum/package.json b/framework/core/ember/forum/package.json index 6ea8a80b3..425bee397 100644 --- a/framework/core/ember/forum/package.json +++ b/framework/core/ember/forum/package.json @@ -9,7 +9,8 @@ "scripts": { "start": "ember server", "build": "ember build", - "test": "ember test" + "test": "ember test", + "preinstall": "sudo npm link ../common" }, "repository": "", "engines": { @@ -36,6 +37,6 @@ "broccoli-ember-inline-template-compiler": "tobscure/broccoli-ember-inline-template-compiler#f884d11", "express": "^4.8.5", "glob": "^4.0.5", - "flarum-common": "file:../common" + "flarum-common": "*" } }