From 97ec794bca67d5528ad503c658d1e42574b18fe4 Mon Sep 17 00:00:00 2001 From: Sam Kvale Date: Fri, 13 Apr 2018 05:29:25 -0500 Subject: [PATCH] chore(deps): Remove babel-runtime (#206) * Remove unnecessary dependency * Remove babel-runtime transform * Use Travis' yarn version --- .babelrc | 2 +- .travis.yml | 5 ----- package.json | 14 ++++++-------- packages/graphile-build-pg/package.json | 5 ++--- packages/graphile-build/package.json | 3 +-- packages/graphql-parse-resolve-info/package.json | 7 +++---- packages/postgraphile-core/package.json | 5 ++--- yarn.lock | 13 +++---------- 8 files changed, 18 insertions(+), 36 deletions(-) diff --git a/.babelrc b/.babelrc index 336415f7b..7e6a511e8 100644 --- a/.babelrc +++ b/.babelrc @@ -1,5 +1,5 @@ { - "plugins": ["transform-runtime", "transform-es2015-modules-commonjs", "syntax-object-rest-spread"], + "plugins": ["transform-es2015-modules-commonjs", "syntax-object-rest-spread"], "presets": [ ["env", { "targets": { diff --git a/.travis.yml b/.travis.yml index 58da36abb..136a08efc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,11 +16,6 @@ cache: - $NVM_DIR - $HOME/.yarn -before_install: - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 0.28.1 - - export PATH="$HOME/.yarn/bin:$PATH" - - install: - yarn - lerna bootstrap diff --git a/package.json b/package.json index b03628d41..4798503fc 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "eslint-plugin-flowtype": "^2.35.0", "eslint-plugin-jest": "^20.0.3", "eslint-plugin-prettier": "^2.1.2", + "flow-copy-source": "^1.2.0", "jest": "^20.0.4", "lerna": "^2.0.0", "prettier": "^1.4.4" @@ -21,25 +22,22 @@ "flow:check": "flow check", "test": "lerna run test", "prepublish:all": "for I in packages/*/; do echo \"cd $I && npm run prepublish\" | perl -p -e 's/\\n/\\0/;'; done | xargs -0 node_modules/.bin/concurrently", - "watch": "for I in packages/*/; do echo \"cd $I && npm run watch\" | perl -p -e 's/\\n/\\0/;'; done | xargs -0 node_modules/.bin/concurrently --kill-others" - }, - "jest": { - "testRegex": "__tests__/.*\\.test\\.js$" + "watch": "for I in packages/*/; do echo \"cd $I && npm run watch\" | perl -p -e 's/\\n/\\0/;'; done | xargs -0 node_modules/.bin/concurrently --kill-others", + "clean": "for I in packages/*/; do rm -Rf \"$I/node8plus/\"; done" }, "dependencies": { "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1", "babel-plugin-transform-runtime": "^6.23.0", "babel-preset-flow": "^6.23.0", "flow-bin": "0.66.0", - "flow-copy-source": "^1.2.0", "graphql": ">=0.9 <0.14", - "pg": ">=6.1.0 <8", - "sql-formatter": "^1.2.2" + "pg": ">=6.1.0 <8" }, "workspaces": [ "packages/*" ], "engines": { - "node": ">=8.6" + "node": ">=8.6", + "yarn": ">=1.3.2" } } diff --git a/packages/graphile-build-pg/package.json b/packages/graphile-build-pg/package.json index 0e2e8ec30..2ecf77f84 100644 --- a/packages/graphile-build-pg/package.json +++ b/packages/graphile-build-pg/package.json @@ -5,7 +5,7 @@ "main": "node8plus/index.js", "scripts": { "test": "jest", - "prepublish": "mkdir -p node8plus && babel -s true --out-dir node8plus src && ../../node_modules/.bin/flow-copy-source src node8plus", + "prepublish": "mkdir -p node8plus && babel -s true --out-dir node8plus src && flow-copy-source src node8plus", "watch": "mkdir -p node8plus && babel -s true --watch --out-dir node8plus src" }, "repository": { @@ -34,7 +34,6 @@ }, "homepage": "https://github.com/graphile/graphile-build#readme", "dependencies": { - "babel-runtime": ">=6 <7", "chalk": "^2.1.0", "debug": ">=2 <3", "graphile-build": "4.0.0-beta.2", @@ -53,7 +52,7 @@ "devDependencies": { "babel-cli": "^6.24.1", "flow-copy-source": "^1.2.0", - "jest": "20.0.4" + "jest": "^20.0.4" }, "jest": { "testRegex": "__tests__/.*\\.test\\.js$" diff --git a/packages/graphile-build/package.json b/packages/graphile-build/package.json index b10e71f4f..3ed1d2426 100644 --- a/packages/graphile-build/package.json +++ b/packages/graphile-build/package.json @@ -5,7 +5,7 @@ "main": "node8plus/index.js", "scripts": { "test": "jest", - "prepublish": "mkdir -p node8plus && babel -s true --out-dir node8plus src && ../../node_modules/.bin/flow-copy-source src node8plus", + "prepublish": "mkdir -p node8plus && babel -s true --out-dir node8plus src && flow-copy-source src node8plus", "watch": "mkdir -p node8plus && babel -s true --watch --out-dir node8plus src" }, "repository": { @@ -27,7 +27,6 @@ }, "homepage": "https://github.com/graphile/graphile-build#readme", "dependencies": { - "babel-runtime": ">=6 <7", "debug": ">=2 <3", "graphql-parse-resolve-info": "4.0.0-beta.2" }, diff --git a/packages/graphql-parse-resolve-info/package.json b/packages/graphql-parse-resolve-info/package.json index 08f13146c..8d47250bb 100644 --- a/packages/graphql-parse-resolve-info/package.json +++ b/packages/graphql-parse-resolve-info/package.json @@ -4,8 +4,8 @@ "description": "Parse GraphQLResolveInfo (the 4th argument of resolve) into a simple tree", "main": "node8plus/index.js", "scripts": { - "test": "jest .", - "prepublish": "mkdir -p node8plus && babel -s true --out-dir node8plus src && ../../node_modules/.bin/flow-copy-source src node8plus", + "test": "jest", + "prepublish": "mkdir -p node8plus && babel -s true --out-dir node8plus src && flow-copy-source src node8plus", "watch": "mkdir -p node8plus && babel -s true --watch --out-dir node8plus src" }, "repository": { @@ -31,13 +31,12 @@ "devDependencies": { "babel-cli": "^6.24.1", "flow-copy-source": "^1.2.0", - "jest": "20.0.4" + "jest": "^20.0.4" }, "jest": { "testRegex": "__tests__/.*\\.test\\.js$" }, "dependencies": { - "babel-runtime": ">=6 <7", "debug": ">=2 <3" }, "files": [ diff --git a/packages/postgraphile-core/package.json b/packages/postgraphile-core/package.json index cb1f28c72..97477e8fd 100644 --- a/packages/postgraphile-core/package.json +++ b/packages/postgraphile-core/package.json @@ -5,7 +5,7 @@ "main": "node8plus/index.js", "scripts": { "test": "scripts/test", - "prepublish": "mkdir -p node8plus && babel -s true --out-dir node8plus src && ../../node_modules/.bin/flow-copy-source src node8plus", + "prepublish": "mkdir -p node8plus && babel -s true --out-dir node8plus src && flow-copy-source src node8plus", "watch": "mkdir -p node8plus && babel -s true --watch --out-dir node8plus src" }, "repository": { @@ -18,14 +18,13 @@ "url": "https://github.com/graphile/graphile-build/issues" }, "dependencies": { - "babel-runtime": ">=6 <7", "graphile-build": "4.0.0-beta.2", "graphile-build-pg": "4.0.0-beta.2" }, "devDependencies": { "babel-cli": "^6.24.1", "flow-copy-source": "^1.2.0", - "jest": "20.0.4", + "jest": "^20.0.4", "jsonwebtoken": "^8.1.1" }, "jest": { diff --git a/yarn.lock b/yarn.lock index 176d81040..53fd3e478 100644 --- a/yarn.lock +++ b/yarn.lock @@ -842,7 +842,7 @@ babel-register@^6.24.1, babel-register@^6.26.0: mkdirp "^0.5.1" source-map-support "^0.4.15" -"babel-runtime@>=6 <7", babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: +babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" dependencies: @@ -3027,7 +3027,7 @@ jest-validate@^20.0.3: leven "^2.1.0" pretty-format "^20.0.3" -jest@20.0.4, jest@^20.0.4: +jest@^20.0.4: version "20.0.4" resolved "https://registry.yarnpkg.com/jest/-/jest-20.0.4.tgz#3dd260c2989d6dad678b1e9cc4d91944f6d602ac" dependencies: @@ -3369,7 +3369,7 @@ lodash.templatesettings@^4.0.0: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" -lodash@^4.14.0, lodash@^4.16.0, lodash@^4.2.0, lodash@^4.5.1: +lodash@^4.14.0, lodash@^4.2.0, lodash@^4.5.1: version "4.17.4" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae" @@ -4506,13 +4506,6 @@ sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" -sql-formatter@^1.2.2: - version "1.3.0" - resolved "https://registry.yarnpkg.com/sql-formatter/-/sql-formatter-1.3.0.tgz#69975b0c2ee840b14445fc13ebc3d3fbe5488d45" - dependencies: - babel-runtime "^6.18.0" - lodash "^4.16.0" - sshpk@^1.7.0: version "1.13.1" resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.13.1.tgz#512df6da6287144316dc4c18fe1cf1d940739be3"