Skip to content
This repository was archived by the owner on Mar 12, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
2 changes: 1 addition & 1 deletion .babelrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"plugins": ["relay"],
"plugins": [["relay", { "artifactDirectory": "./src/__generated__" }]],
"presets": ["react-native"]
}
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
## Build generated
build/
DerivedData
__generated__
dist

## Various settings
Expand Down
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
src/__generated__/*.ts
26 changes: 18 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
"test": "jest",
"test:ci": "jest --outputFile test-results.json --json",
"testing": "jest --watch",
"relay": "relay-compiler --src ./src --schema data/schema.graphql --extensions ts tsx",
"relay":
"relay-compiler --src ./src --schema data/schema.graphql --language typescript --artifactDirectory ./src/__generated__",
"sync-colors":
"cd externals/elan && git fetch && git checkout origin/master && cp components/lib/variables/colors.json ../../data",
"sync-externals": "npm run-script sync-schema && npm run-script sync-colors",
Expand All @@ -46,7 +47,8 @@
"git push --follow-tags && env EMISSION_ROOT=\"$(pwd)\" pod repo push artsy --allow-warnings --use-json --skip-import-validation",
"postinstall":
"sed -i '' 's/#import <RCTAnimation\\/RCTValueAnimatedNode.h>/#import \"RCTValueAnimatedNode.h\"/' ./node_modules/react-native/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h && ./scripts/post_installs.sh || true",
"prestorybook": "rnstl"
"prestorybook": "rnstl",
"prepare": "patch-package"
},
"repository": {
"type": "git",
Expand All @@ -60,6 +62,10 @@
},
"homepage": "https://github.com/artsy/emission#readme",
"files": ["index.js", "data", "lib"],
"resolutions": {
"graphql": "^0.12.3",
"relay-runtime": "https://github.com/alloy/relay/releases/download/v1.5.0-artsy.1/relay-runtime-1.5.0-artsy.1.tgz"
},
"dependencies": {
"lodash": "^4.17.4",
"moment": "^2.19.4",
Expand All @@ -71,9 +77,9 @@
"react-native-parallax-scroll-view": "https://github.com/orta/react-native-parallax-scroll-view",
"react-native-scrollable-tab-view": "^0.8.0",
"react-native-sentry": "^0.30.2",
"react-relay": "https://github.com/alloy/relay/releases/download/v1.3.0-artsy/react-relay-1.3.0-artsy.1.tgz",
"react-relay": "https://github.com/alloy/relay/releases/download/v1.5.0-artsy.1/react-relay-1.5.0-artsy.1.tgz",
"react-tracking": "^5.0.0",
"relay-runtime": "https://github.com/alloy/relay/releases/download/v1.3.0-artsy/relay-runtime-artsy.1.tgz",
"relay-runtime": "https://github.com/alloy/relay/releases/download/v1.5.0-artsy.1/relay-runtime-1.5.0-artsy.1.tgz",
"remove-markdown": "0.1.0",
"styled-components": "^2.0.0"
},
Expand All @@ -85,13 +91,13 @@
"@types/query-string": "^5.0.0",
"@types/react": "^16.0.5",
"@types/react-native": "^0.48.0",
"@types/react-relay": "^1.3.1",
"@types/react-relay": "^1.3.3",
"@types/react-tracking": "^5.0.0",
"@types/relay-runtime": "^1.3.1",
"@types/relay-runtime": "^1.3.2",
"awesome-typescript-loader": "^3.2.3",
"babel-jest": "^18.0.0",
"babel-plugin-relay":
"https://github.com/alloy/relay/releases/download/v1.3.0-artsy/babel-plugin-relay-1.3.0-artsy.1.tgz",
"https://github.com/alloy/relay/releases/download/v1.5.0-artsy.1/babel-plugin-relay-1.5.0-artsy.1.tgz",
"babel-polyfill": "^6.13.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
Expand All @@ -106,13 +112,17 @@
"jest-react-native": "18.0.0",
"jest-styled-components": "^4.9.0",
"lint-staged": "^6.0.0",
"patch-package": "^5.0.0",
"postinstall-prepare": "^1.0.1",
"prettier": "1.9.2",
"react-dom": "16.0.0-alpha.12",
"react-native-storybook-loader": "^1.6.0",
"react-storybooks-relay-container": "^1.0.0",
"react-test-renderer": "16.0.0-alpha.12",
"recursive-readdir-sync": "^1.0.6",
"relay-compiler": "https://github.com/alloy/relay/releases/download/v1.3.0-artsy/relay-compiler-1.3.0-artsy.1.tgz",
"relay-compiler":
"https://github.com/alloy/relay/releases/download/v1.5.0-artsy.1/relay-compiler-1.5.0-artsy.1.tgz",
"relay-compiler-language-typescript": "^0.9.0",
"relay2ts": "^0.2.0",
"snapshot-diff": "^0.2.1",
"stylelint": "^7.13.0",
Expand Down
82 changes: 82 additions & 0 deletions patches/graphql+0.12.3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
patch-package
--- a/node_modules/graphql/utilities/assertValidName.js
+++ b/node_modules/graphql/utilities/assertValidName.js
@@ -1,18 +1,20 @@
-'use strict';
+"use strict"

Object.defineProperty(exports, "__esModule", {
- value: true
-});
-exports.assertValidName = assertValidName;
-exports.isValidNameError = isValidNameError;
+ value: true,
+})
+exports.assertValidName = assertValidName
+exports.isValidNameError = isValidNameError

-var _GraphQLError = require('../error/GraphQLError');
+var _GraphQLError = require("../error/GraphQLError")

-var _invariant = require('../jsutils/invariant');
+var _invariant = require("../jsutils/invariant")

-var _invariant2 = _interopRequireDefault(_invariant);
+var _invariant2 = _interopRequireDefault(_invariant)

-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) {
+ return obj && obj.__esModule ? obj : { default: obj }
+}

/**
* Copyright (c) 2015-present, Facebook, Inc.
@@ -23,32 +25,35 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
*
*/

-var NAME_RX = /^[_a-zA-Z][_a-zA-Z0-9]*$/;
+var NAME_RX = /^[_a-zA-Z][_a-zA-Z0-9]*$/

/**
* Upholds the spec rules about naming.
*/
function assertValidName(name) {
- var error = isValidNameError(name);
+ var error = isValidNameError(name)
if (error) {
- throw error;
+ throw error
}
- return name;
+ return name
}

/**
* Returns an Error if a name is invalid.
*/
function isValidNameError(name, node) {
- !(typeof name === 'string') ? (0, _invariant2.default)(0, 'Expected string') : void 0;
- if (name.length > 1 && name[0] === '_' && name[1] === '_' &&
- // Note: this special case is not part of the spec and exists only to
- // support legacy server configurations. Do not rely on this special case
- // as it may be removed at any time.
- name !== '__configs__') {
- return new _GraphQLError.GraphQLError('Name "' + name + '" must not begin with "__", which is reserved by ' + 'GraphQL introspection.', node);
- }
+ !(typeof name === "string") ? (0, _invariant2.default)(0, "Expected string") : void 0
+ // if (name.length > 1 && name[0] === '_' && name[1] === '_' &&
+ // // Note: this special case is not part of the spec and exists only to
+ // // support legacy server configurations. Do not rely on this special case
+ // // as it may be removed at any time.
+ // name !== '__configs__') {
+ // return new _GraphQLError.GraphQLError('Name "' + name + '" must not begin with "__", which is reserved by ' + 'GraphQL introspection.', node);
+ // }
if (!NAME_RX.test(name)) {
- return new _GraphQLError.GraphQLError('Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but "' + name + '" does not.', node);
+ return new _GraphQLError.GraphQLError(
+ 'Names must match /^[_a-zA-Z][_a-zA-Z0-9]*$/ but "' + name + '" does not.',
+ node
+ )
}
}
106 changes: 106 additions & 0 deletions src/__generated__/About_artist.graphql.ts

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

55 changes: 55 additions & 0 deletions src/__generated__/About_gene.graphql.ts

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

Loading