Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 8 commits into from
Jan 5, 2017

Conversation

chabou
Copy link
Collaborator

@chabou 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');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

const path = resolve(config.getConfigDir(), '.hyper_plugins')
const localPath = resolve(path, 'local')

?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oups

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes better :)

@@ -6,3 +6,8 @@ node_modules

# logs
npm-debug.log

# optionnal dev config file and plugins directory
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: s/optionnal/optional/

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ty :) it is "optionnel" in french

* master:
  chore(package): update electron to version 1.4.5 (vercel#949)
  add onRendererWindow, because it actually available. check ./lib/utils/plugins.js:193 (vercel#924)
  increase timeout for update checks (vercel#928)
  Change URL regex - fixes vercel#867 (vercel#943)
  Make the close menu items less ambiguous
  Comply to XO's no-warning-comments rule
  Prefer default export to make XO happy (vercel#931)
  chore(package): update ms to version 0.7.2 (vercel#933)
  chore(package): update copy-webpack-plugin to version 4.0.0 (vercel#927)
  log plugins' errors in Electron console (vercel#923)
  Improve tabs title   (vercel#892)
  increase notification timeout up to 30m (vercel#913)
  Create github templates (vercel#919)
  chore(package): update electron to version 1.4.4 (vercel#907)
@chabou
Copy link
Collaborator Author

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
Copy link
Contributor

ppot commented Jan 4, 2017

@chabou first this need rebase.

@chabou
Copy link
Collaborator Author

chabou commented Jan 4, 2017

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

@ppot
Copy link
Contributor

ppot commented Jan 5, 2017

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

@chabou
Copy link
Collaborator Author

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
Copy link
Contributor

ppot commented Jan 5, 2017

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

@ppot ppot merged commit 0c71863 into vercel:master Jan 5, 2017
@chabou
Copy link
Collaborator Author

chabou commented Jan 5, 2017

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

@chabou chabou deleted the dev_use_local_config branch January 5, 2017 01:07
tylerong pushed a commit to tylerong/hyper that referenced this pull request Jul 3, 2017
* Use local config file in dev

* Fix typo

* Reuse path variable to compose localPath

* Fix lint errors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants