Skip to content

Commit

Permalink
build: migrate yarn lockfile + .gitignore yarn 2 contents + migrate p…
Browse files Browse the repository at this point in the history
…re-commit scripts to own shell scripts
  • Loading branch information
hydrosquall committed Sep 28, 2022
1 parent 4d367fe commit 37b5d6c
Show file tree
Hide file tree
Showing 6 changed files with 37,325 additions and 27,557 deletions.
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,13 @@ generated-prisma-client
packages/engine-server/prisma/dev.db
dev.db-journal
builds

# Files to ignore when not doing zero-installs
# https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@
"hooks:pre-push": "node ./hooks/pre-push.js",
"gen:meta": "node ./bootstrap/scripts/genMeta.js",
"backend:updateDendronDeps": "node bootstrap/backend/updateDendronhqDeps.js",
"stash:unstaged": "git stash save -k 'pre-linting-stash'",
"stash:pop": "git stash && git stash pop stash@{1} && git read-tree stash && git stash drop",
"stash:unstaged": "./scripts/stash-unstaged.sh",
"stash:pop": "./scripts/stash-pop.sh",
"test": "cross-env LOG_LEVEL=error yarn jest",
"test:cli": "cross-env LOG_LEVEL=error npx jest --selectProjects non-plugin-tests --forceExit",
"test:cli:update-snapshots": "yarn test:cli -u"
Expand Down
4 changes: 2 additions & 2 deletions packages/dendron-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"directory": "packages/dendron-cli"
},
"bin": {
"dendron-cli": "./lib/bin/dendron-cli.js",
"dendron": "./lib/bin/dendron-cli.js"
"dendron": "./lib/bin/dendron-cli.js",
"dendron-cli": "./lib/bin/dendron-cli.js"
},
"author": {
"name": "Kevin Lin",
Expand Down
3 changes: 3 additions & 0 deletions scripts/stash-pop.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

git stash && git stash pop stash@{1} && git read-tree stash && git stash drop
3 changes: 3 additions & 0 deletions scripts/stash-unstaged.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/usr/bin/env bash

git stash save -k 'pre-linting-stash'
Loading

0 comments on commit 37b5d6c

Please sign in to comment.