Use local config file in dev. Fix #903 #904

Merged
merged 8 commits into from Jan 5, 2017

Projects

None yet

4 participants

@chabou
Contributor
chabou commented Oct 19, 2016

No description provided.

@@ -16,8 +16,8 @@ const notify = require('./notify');
const cache = new Config();
// modules path
-const path = resolve(homedir(), '.hyper_plugins');
-const localPath = resolve(homedir(), '.hyper_plugins', 'local');
+const path = resolve(config.getConfigDir(), '.hyper_plugins');
@albinekb
albinekb Oct 19, 2016 Collaborator
const path = resolve(config.getConfigDir(), '.hyper_plugins')
const localPath = resolve(path, 'local')

?

@chabou
chabou Oct 19, 2016 Contributor

oups

@albinekb
albinekb Oct 19, 2016 Collaborator

no it was like this before, but when you're already at it 😉

@chabou
chabou Oct 19, 2016 Contributor

yes better :)

.gitignore
@@ -6,3 +6,8 @@ node_modules
# logs
npm-debug.log
+
+# optionnal dev config file and plugins directory
@TooTallNate
TooTallNate Oct 19, 2016 Member

nit: s/optionnal/optional/

@chabou
chabou Oct 19, 2016 Contributor

ty :) it is "optionnel" in french

chabou added some commits Oct 19, 2016
@chabou chabou Fix typo dc99482
@chabou chabou Reuse path variable to compose localPath d2959bd
@chabou chabou Merge branch 'master' into dev_use_local_config a442516
@chabou chabou Fix lint errors 31447a4
@chabou chabou Merge branch 'master' into dev_use_local_config
* master:
  chore(package): update electron to version 1.4.5 (#949)
  add onRendererWindow, because it actually available. check ./lib/utils/plugins.js:193 (#924)
  increase timeout for update checks (#928)
  Change URL regex - fixes #867 (#943)
  Make the close menu items less ambiguous
  Comply to XO's no-warning-comments rule
  Prefer default export to make XO happy (#931)
  chore(package): update ms to version 0.7.2 (#933)
  chore(package): update copy-webpack-plugin to version 4.0.0 (#927)
  log plugins' errors in Electron console (#923)
  Improve tabs title   (#892)
  increase notification timeout up to 30m (#913)
  Create github templates (#919)
  chore(package): update electron to version 1.4.4 (#907)
23015c2
@chabou chabou Merge branch 'master' into dev_use_local_config
* master: (68 commits)
a6ec8f5
@chabou chabou Merge remote-tracking branch 'origin/master' into dev_use_local_config
126117e
@chabou
Contributor
chabou commented Jan 3, 2017

Do you plan to merge it ? 😊
Really cool to have a no-plugin config to work on Hyper app or a special config to work on a local and experimental plugin. (And continue to use prod version of Hyper in the same time).
I can add instructions in Contribute section of Readme but warning : I'm not an english native speaker 😆

@ppot
Collaborator
ppot commented Jan 4, 2017

@chabou first this need rebase.

@chabou
Contributor
chabou commented Jan 4, 2017

@ppot I made a rebase 8 hours ago and this PR seems up-to-date, no ?

@ppot
Collaborator
ppot commented Jan 5, 2017

@chabou I can't see when the rebase is done 😂

@chabou
Contributor
chabou commented Jan 5, 2017

Ahah of course but I made a rebase before my comment "Do you plan..."
So I didn't understand your comment 😄

@ppot
Collaborator
ppot commented Jan 5, 2017 edited

This will need some upgrades. But okay for a start!
Let me test this locally first.

@ppot
ppot approved these changes Jan 5, 2017 View changes
@ppot ppot merged commit 0c71863 into zeit:master Jan 5, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@chabou
Contributor
chabou commented Jan 5, 2017

Hou yeah ! Thank you !!
Feel free to ask improvements!

@chabou chabou deleted the chabou:dev_use_local_config branch Jan 5, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment