Skip to content

vscode dependency -> @types/vscode #280

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Aug 26, 2020
Merged

vscode dependency -> @types/vscode #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd9bf2c
vscode dependency -> @types/vscode
expipiplus1 Aug 26, 2020
6b58a5c
Add notice to default mentioning to build yarn.nix
expipiplus1 Aug 26, 2020
37bb418
Remove old vscode scripts
lukel97 Aug 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{ pkgs ? import <nixpkgs> {} }:
with pkgs;
pkgs.mkYarnPackage {
name = "vscode-haskell";
Copy link
Collaborator

Choose a reason for hiding this comment

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

Ah does this need to match up with the package name inside package.json?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't think it's important actually. (of course line 14 needs to be correct either way)


# Please run `yarn import` first to generate yarn.lock!
pkgs.mkYarnPackage rec {
name = "haskell";
src = ./.;
packageJSON = ./package.json;
yarnLock = ./yarn.lock;

installPhase = ''
mkdir -p "$out/dist"
yarn vscode:prepublish --output-path "$out/dist"
mv deps/vscode-haskell/{package.json,hie-vscode.sh,hie-vscode.bat} "$out"
mv deps/${name}/package.json "$out"
'';

distPhase = ''
Expand Down
195 changes: 6 additions & 189 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@
"vscode:prepublish": "webpack --mode production",
"compile": "webpack --mode none",
"watch": "webpack --mode none --watch --info-verbosity verbose",
"postinstall": "node ./node_modules/vscode/bin/install",
"tslint": "tslint -p tsconfig.json -c tslint.json --format stylish 'src/**/*.ts'",
"tslint-fix": "tslint --fix -p tsconfig.json -c tslint.json --format stylish 'src/**/*.ts'",
"push-tag": "git tag -a $npm_package_version -m \"Version $npm_package_version\" && git push origin $npm_package_version"
Expand All @@ -188,6 +187,7 @@
"@types/lru-cache": "^4.1.2",
"@types/node": "^14.0.3",
"@types/request-promise-native": "^1.0.17",
"@types/vscode": "^1.48.0",
"@types/yauzl": "^2.9.1",
"husky": "^4.2.5",
"prettier": "^2.0.5",
Expand All @@ -196,7 +196,6 @@
"tslint": "^5.20.1",
"tslint-loader": "^3.5.4",
"typescript": "^3.9.5",
"vscode": "^1.1.36",
"webpack": "^4.42.1",
"webpack-cli": "^3.3.11"
},
Expand Down