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.

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

Jump to bottom

Simplify scripts #147

Merged
merged 2 commits into from
Oct 26, 2020
Merged

Simplify scripts #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f8ac84
Use 'wsrun' for pre-commit hook
smithki Oct 26, 2020
e2d95aa
Add '-c' flag to 'paths' script in package.json
smithki Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"clean": "$INIT_CWD/scripts/clean.sh",
"lint": "$INIT_CWD/scripts/lint.sh",
"test": "yarn wsrun --serial --fast-exit -c $INIT_CWD/scripts/test.sh",
"paths": "yarn --silent wsrun --parallel --no-prefix -r silent $INIT_CWD/scripts/cwd.ts",
"paths": "yarn --silent wsrun --parallel --no-prefix -r -c $INIT_CWD/scripts/cwd.ts",
"snyk-protect": "snyk protect",
"prepare": "yarn run snyk-protect"
},
Expand Down Expand Up @@ -40,7 +40,7 @@
"eslint-plugin-react": "~7.20.0",
"eslint-plugin-react-hooks": "~4.0.4",
"glob": "^7.1.6",
"husky": "^4.2.3",
"husky": "^4.3.0",
"import-fresh": "^3.2.1",
"lerna": "^3.21.0",
"lint-staged": "^10.0.7",
Expand All @@ -62,7 +62,7 @@
},
"husky": {
"hooks": {
"pre-commit": "lerna run --concurrency 1 --stream precommit --since HEAD --exclude-dependents"
"pre-commit": "yarn wsrun --concurrency 1 --changedSince HEAD -c lint-staged"
}
},
"snyk": true,
Expand Down
3 changes: 0 additions & 3 deletions packages/provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
"main": "dist/commonjs/index.js",
"module": "dist/module/index.js",
"types": "dist/commonjs/index.d.ts",
"scripts": {
"precommit": "lint-staged"
},
"dependencies": {
"@magic-sdk/types": "^2.0.1",
"eventemitter3": "^4.0.4",
Expand Down
3 changes: 0 additions & 3 deletions packages/react-native/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
"main": "dist/commonjs/index.js",
"module": "dist/module/index.js",
"types": "dist/commonjs/index.d.ts",
"scripts": {
"precommit": "lint-staged"
},
"dependencies": {
"@aveq-research/localforage-asyncstorage-driver": "~1.1.5",
"@babel/core": "~7.10.4",
Expand Down
3 changes: 0 additions & 3 deletions packages/types/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,5 @@
"main": "dist/commonjs/index.js",
"module": "dist/module/index.js",
"types": "dist/commonjs/index.d.ts",
"scripts": {
"precommit": "lint-staged"
},
"gitHead": "1ef062ea699d48d5e9a9375a93b7c147632b05ca"
}
3 changes: 0 additions & 3 deletions packages/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@
"module": "dist/module/index.js",
"types": "dist/commonjs/index.d.ts",
"umd:main": "dist/magic.js",
"scripts": {
"precommit": "lint-staged"
},
"dependencies": {
"@babel/core": "^7.9.6",
"@babel/runtime": "^7.9.6",
Expand Down
18 changes: 0 additions & 18 deletions scripts/glob.ts
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/runner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@

export PATH=$PWD/node_modules/.bin:$INIT_CWD/node_modules/.bin:$PATH

VERBOSE='1'
if [ "$1" == 'silent' ]; then VERBOSE=''; shift; fi
if [ "$1" == 'run' ]; then shift; fi

RUNCMD=$(node -pe "require('$INIT_CWD/package.json').scripts['$1']")
Expand All @@ -17,5 +15,4 @@ then
fi

BASHCMD="$RUNCMD ${@:2}"
if [ $VERBOSE ]; then echo '$' $BASHCMD; fi;
exec bash -c "$BASHCMD"
2 changes: 1 addition & 1 deletion scripts/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RAW_INPUT=$1

runTests() {
# Parse a glob of input test files (relative to the package directory).
input=$(echo $($INIT_CWD/scripts/glob.ts $RAW_INPUT))
input=$(glob $RAW_INPUT) || ''

export TS_NODE_PROJECT="./test/tsconfig.json"

Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4901,7 +4901,7 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=

cosmiconfig@7.0.0:
cosmiconfig@7.0.0, cosmiconfig@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3"
integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA==
Expand Down Expand Up @@ -7270,15 +7270,15 @@ humanize-ms@^1.2.1:
dependencies:
ms "^2.0.0"

husky@^4.2.3:
version "4.2.5"
resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.5.tgz#2b4f7622673a71579f901d9885ed448394b5fa36"
integrity sha512-SYZ95AjKcX7goYVZtVZF2i6XiZcHknw50iXvY7b0MiGoj5RwdgRQNEHdb+gPDPCXKlzwrybjFjkL6FOj8uRhZQ==
husky@^4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/husky/-/husky-4.3.0.tgz#0b2ec1d66424e9219d359e26a51c58ec5278f0de"
integrity sha512-tTMeLCLqSBqnflBZnlVDhpaIMucSGaYyX6855jM4AguGeWCeSzNdb1mfyWduTZ3pe3SJVvVWGL0jO1iKZVPfTA==
dependencies:
chalk "^4.0.0"
ci-info "^2.0.0"
compare-versions "^3.6.0"
cosmiconfig "^6.0.0"
cosmiconfig "^7.0.0"
find-versions "^3.2.0"
opencollective-postinstall "^2.0.2"
pkg-dir "^4.2.0"
Expand Down