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

Support Linux without requiring external dependency (xclip) #394

Merged
merged 1 commit into from Jun 6, 2018

Conversation

Projects
None yet
2 participants
@cmalard
Copy link
Contributor

cmalard commented Jun 4, 2018

I replaced copy-paste by clipboardy.

It is more actively maintained and it fixes many of that module's issues.
https://stackoverflow.com/a/43153941/2787235

Ref #35

@@ -397,7 +397,7 @@
},
"gitlens.explorers.commitFormat": {
"type": "string",
"default": "${message} \u00a0\u2022\u00a0 ${authorAgoOrDate} \u00a0 (${id})",
"default": "${message}  •  ${authorAgoOrDate}   (${id})",

This comment has been minimized.

@cmalard

cmalard Jun 4, 2018

Author Contributor

NPM did all those changes automatically with npm install. I can revert them if requested, but it should happen to everyone doing npm install?

This comment has been minimized.

@eamodio

eamodio Jun 4, 2018

Owner

Yes, please revert any changes that aren't absolutely required. Sadly the package.json rewriting by npm is a constant source of pain (but if the changes are allowed it screws up the encoding of the file and causes other issues across platforms). I typically just run npm install --no-save to avoid that rewriting, but obviously you can't if you are adding/updating a package. Its a total PITA, sorry.

@eamodio

This comment has been minimized.

Copy link
Owner

eamodio commented Jun 4, 2018

Awesome! Thank you for this -- I've been meaning to get around to switching over to clipboardy 👍

"postinstall": "node ./node_modules/vscode/bin/install && pushd \"./src/ui\" && npm install --no-save && popd",
"prepush": "npm run build",
"vscode:prepublish": "npm run reset && npm run bundle"
},
"dependencies": {
"copy-paste": "1.3.0",
"clipboardy": "^1.2.3",

This comment has been minimized.

@eamodio

eamodio Jun 4, 2018

Owner

Please remove the ^ -- I like to have the dependencies locked down for reproducible builds

@@ -3241,7 +3340,7 @@
"tslib": "1.9.2"
},
"devDependencies": {
"@types/copy-paste": "1.1.30",
"@types/clipboardy": "^1.1.0",

This comment has been minimized.

@eamodio

eamodio Jun 4, 2018

Owner

Same here

@eamodio

This comment has been minimized.

Copy link
Owner

eamodio commented Jun 4, 2018

Also please target the develop branch for this PR -- thanks!

@cmalard cmalard changed the base branch from master to develop Jun 4, 2018

@cmalard cmalard force-pushed the cmalard:clipboardy branch 3 times, most recently from aafd588 to ed4928b Jun 4, 2018

@cmalard cmalard force-pushed the cmalard:clipboardy branch from ed4928b to c14bdf5 Jun 4, 2018

@cmalard

This comment has been minimized.

Copy link
Contributor Author

cmalard commented Jun 4, 2018

👍

@eamodio eamodio merged commit 43b87c3 into eamodio:develop Jun 6, 2018

@eamodio

This comment has been minimized.

Copy link
Owner

eamodio commented Jun 6, 2018

Awesome! Thanks for you contribution!

eamodio added a commit that referenced this pull request Jun 6, 2018

@cmalard cmalard deleted the cmalard:clipboardy branch Jun 11, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.