Skip to content

Commit

Permalink
Merge pull request #6 from Terminal-Systems/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
dmerrill6 authored Jan 3, 2019
2 parents 03979be + da4fbc7 commit 1a400d8
Show file tree
Hide file tree
Showing 10 changed files with 3,631 additions and 33 deletions.
13 changes: 13 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"presets": [
[
"@babel/preset-env",
{
"targets": {
"node": "current"
}
}
]
],
"plugins": []
}
8 changes: 8 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
module.exports = {
"extends": ["airbnb-base", "plugin:jest/recommended"],
"rules": {
"no-console": "off",
"import/no-dynamic-require": "off",
"global-require": "off"
}
};
19 changes: 19 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# OSX trash
.DS_Store

# Node packages
node_modules/
**/node_modules/

# Local testing databases
*.sqlite3
**/*.sqlite3

# Lint cache
.eslintcache

# Logs
yarn-error.log

# compiled/distributable files
dist/
10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@ Pull requests are welcome, specially to implement new connectors for different O

When submitting a pull request, please include tests for the code you are submitting, and check that you did not break any working test.

### Testing and publishing changes

1- Code your changes

2- Run `yarn build`. This will generate a `dist` folder with the distributable files

3- `cd` into the test app and run `yarn install` and then `yarn test`. Check that all tests pass.

4- Send the PR. When accepted, the maintainer will publish a new version to npm using the new `dist` folder.

### Running the test suite

1- `cd tests/test-app`
Expand Down
29 changes: 29 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "apollo-cursor-pagination",
"version": "0.1.0",
"description": "Relay's Connection implementation for Apollo Server GraphQL library",
"main": "index.js",
"repository": "https://github.com/Terminal-Systems/apollo-cursor-pagination",
"author": "Daniel Merrill <[email protected]>",
"license": "MIT",
"private": false,
"dependencies": {
"base-64": "^0.1.0"
},
"scripts": {
"build": "babel src --out-dir dist"
},
"devDependencies": {
"@babel/cli": "^7.1.2",
"@babel/core": "^7.1.2",
"@babel/node": "^7.0.0",
"@babel/preset-env": "^7.1.0",
"babel-core": "^7.0.0-bridge.0",
"babel-jest": "^23.6.0",
"eslint": "^5.6.1",
"eslint-config-airbnb-base": "^13.1.0",
"eslint-plugin-import": "^2.14.0",
"eslint-plugin-jest": "^21.25.0",
"regenerator-runtime": "^0.12.1"
}
}
13 changes: 0 additions & 13 deletions src/package.json

This file was deleted.

8 changes: 0 additions & 8 deletions src/yarn.lock

This file was deleted.

6 changes: 3 additions & 3 deletions tests/test-app/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "api-gateway",
"name": "test-app",
"version": "0.1.0",
"description": "Gate of entry to all the other services in the back-end. Should be built mostly using GraphQL.",
"description": "App made to test apollo-cursor-pagination lib",
"main": "index.js",
"author": "Daniel Merrill",
"license": "MIT",
"private": false,
"dependencies": {
"apollo-cursor-pagination": "file:../../src",
"apollo-cursor-pagination": "file:../../dist",
"apollo-link-http": "^1.5.5",
"apollo-server": "^2.1.0",
"glob": "^7.1.3",
Expand Down
11 changes: 2 additions & 9 deletions tests/test-app/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -920,10 +920,8 @@ apollo-cache-control@^0.2.5:
apollo-server-env "^2.0.3"
graphql-extensions "^0.2.1"

"apollo-cursor-pagination@file:../../src":
version "0.1.0"
dependencies:
base-64 "^0.1.0"
"apollo-cursor-pagination@file:../../dist":
version "0.0.0"

apollo-datasource@^0.1.3:
version "0.1.3"
Expand Down Expand Up @@ -1406,11 +1404,6 @@ balanced-match@^1.0.0:
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=

base-64@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/base-64/-/base-64-0.1.0.tgz#780a99c84e7d600260361511c4877613bf24f6bb"
integrity sha1-eAqZyE59YAJgNhURxId2E78k9rs=

base@^0.11.1:
version "0.11.2"
resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
Expand Down
Loading

0 comments on commit 1a400d8

Please sign in to comment.