Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apollographql/graphql-tag
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.12.0
Choose a base ref
...
head repository: apollographql/graphql-tag
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v2.12.1
Choose a head ref
  • 13 commits
  • 7 files changed
  • 4 contributors

Commits on Jan 29, 2021

  1. Verified

    This commit was signed with the committer’s verified signature.
    benjamn Ben Newman
    Copy the full SHA
    6d2f4a8 View commit details

Commits on Feb 12, 2021

  1. Bump rollup from 2.38.1 to 2.38.5 (#343)

    Bumps [rollup](https://github.com/rollup/rollup) from 2.38.1 to 2.38.5.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v2.38.1...v2.38.5)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    eaba5e3 View commit details
  2. Bump typescript from 4.1.3 to 4.1.5 (#346)

    Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.1.3 to 4.1.5.
    - [Release notes](https://github.com/Microsoft/TypeScript/releases)
    - [Commits](microsoft/TypeScript@v4.1.3...v4.1.5)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    e1ecebd View commit details
  3. Bump chai from 4.2.0 to 4.3.0 (#341)

    Bumps [chai](https://github.com/chaijs/chai) from 4.2.0 to 4.3.0.
    - [Release notes](https://github.com/chaijs/chai/releases)
    - [Changelog](https://github.com/chaijs/chai/blob/master/History.md)
    - [Commits](chaijs/chai@4.2.0...4.3.0)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    4c4eaa5 View commit details
  4. Bump @types/chai from 4.2.14 to 4.2.15 (#347)

    Bumps [@types/chai](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chai) from 4.2.14 to 4.2.15.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chai)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    6a3785d View commit details
  5. Bump @types/node from 14.14.22 to 14.14.26 (#348)

    Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.22 to 14.14.26.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b0dff34 View commit details
  6. Fix the npm pack (#338)

    abdonrd authored Feb 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    249e1a8 View commit details
  7. Bump mocha from 8.2.1 to 8.3.0 (#350)

    Bumps [mocha](https://github.com/mochajs/mocha) from 8.2.1 to 8.3.0.
    - [Release notes](https://github.com/mochajs/mocha/releases)
    - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
    - [Commits](mochajs/mocha@v8.2.1...v8.3.0)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    84075de View commit details
  8. Bump rollup from 2.38.5 to 2.39.0 (#349)

    Bumps [rollup](https://github.com/rollup/rollup) from 2.38.5 to 2.39.0.
    - [Release notes](https://github.com/rollup/rollup/releases)
    - [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
    - [Commits](rollup/rollup@v2.38.5...v2.39.0)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a9478eb View commit details
  9. Bump @types/node from 14.14.22 to 14.14.27 (#351)

    Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.14.22 to 14.14.27.
    - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
    - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    dependabot[bot] authored Feb 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    a2109aa View commit details
  10. Partially verified

    This commit is signed with the committer’s verified signature.
    benjamn’s contribution has been verified via GPG key.
    We cannot verify signatures from co-authors, and some of the co-authors attributed to this commit require their commits to be signed.
    Copy the full SHA
    5bbb229 View commit details
  11. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    dfe0e62 View commit details
  12. Bump npm version to 2.12.1.

    benjamn committed Feb 12, 2021

    Verified

    This commit was signed with the committer’s verified signature.
    benjamn Ben Newman
    Copy the full SHA
    c0091e1 View commit details
Showing with 224 additions and 233 deletions.
  1. +0 −9 .npmignore
  2. +5 −0 CHANGELOG.md
  3. +1 −1 LICENSE
  4. +203 −218 package-lock.json
  5. +13 −3 package.json
  6. +1 −1 src/index.ts
  7. +1 −1 src/tests.ts
9 changes: 0 additions & 9 deletions .npmignore

This file was deleted.

5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change log

### v2.12.1

* To accommodate older versions of TypeScript, usage of the `import type ...` syntax (introduced by [#325](https://github.com/apollographql/graphql-tag/pull/325)) has been removed, fixing issue [#345](https://github.com/apollographql/graphql-tag/issues/345). <br/>
[@benjamn](http://github.com/benjamn) in [#352](https://github.com/apollographql/graphql-tag/pull/352)

### v2.12.0

* The `graphql-tag` repository has been converted to TypeScript, adding type safety and enabling both ECMAScript and CommonJS module exports. While these changes are intended to be as backwards-compatible as possible, we decided to bump the minor version to reflect the significant refactoring. <br/>
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2020 Meteor Development Group, Inc.
Copyright (c) 2021 Apollo Graph, Inc. (Formerly Meteor Development Group, Inc.)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
421 changes: 203 additions & 218 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 13 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "graphql-tag",
"version": "2.12.0",
"version": "2.12.1",
"description": "A JavaScript template literal tag that parses GraphQL queries",
"main": "./main.js",
"module": "./lib/index.js",
@@ -11,10 +11,17 @@
"prebuild": "rimraf lib",
"build": "tsc && rollup -c && npm run flow",
"flow": "cp src/index.js.flow lib/graphql-tag.umd.js.flow",
"pretest": "npm run build",
"test": "mocha lib/tests.cjs.js",
"test": "npm run test:ts3 && npm run test:ts4",
"test:ts3": "npm i typescript@3.7.x && npm run test:mocha",
"test:ts4": "npm i typescript@4.x && npm run test:mocha",
"test:mocha": "npm run build && mocha lib/tests.cjs.js",
"prepublish": "npm run build"
},
"files": [
"lib/",
"loader.js",
"main.js"
],
"repository": {
"type": "git",
"url": "git+https://github.com/apollographql/graphql-tag.git"
@@ -44,5 +51,8 @@
},
"peerDependencies": {
"graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
},
"engines": {
"node": ">=10"
}
}
2 changes: 1 addition & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { parse } from 'graphql';

import type {
import {
DocumentNode,
DefinitionNode,
Location,
2 changes: 1 addition & 1 deletion src/tests.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'source-map-support/register';

import { assert } from 'chai';
import type { DocumentNode, FragmentDefinitionNode } from 'graphql';
import { DocumentNode, FragmentDefinitionNode } from 'graphql';

import gql from './index';
const loader = require('../loader');