More babel plugin progress

Author: emmatown

packages/babel-plugin/package.json

@@ -3,10 +3,16 @@
   "version": "0.0.0",
   "main": "dist/babel-plugin.cjs.js",
   "module": "dist/babel-plugin.esm.js",
+  "files": [
+    "dist",
+    "!**/*.d.ts"
+  ],
   "license": "MIT",
   "dependencies": {
     "@babel/helper-module-imports": "^7.8.3",
-    "@babel/runtime": "^7.9.2",
+    "@babel/runtime": "^7.9.2"
+  },
+  "devDependencies": {
     "@types/babel__core": "^7.1.7"
   },
   "repository": "https://github.com/Thinkmill/ts-gql/tree/master/packages/babel-plugin"

packages/next/package.json

@@ -5,14 +5,16 @@
   "module": "dist/next.esm.js",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.9.2"
+    "@babel/runtime": "^7.9.2",
+    "@ts-gql/babel-plugin": "^0.0.0"
   },
   "peerDependencies": {
+    "@ts-gql/compiler": "*",
     "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0"
   },
   "devDependencies": {
-    "@ts-gql/compiler": "^0.0.0",
-    "graphql": "^14.0.0"
+    "graphql": "^14.0.0",
+    "@ts-gql/compiler": "^0.0.0"
   },
   "repository": "https://github.com/Thinkmill/ts-gql/tree/master/packages/next"
 }

packages/next/src/index.ts

@@ -11,7 +11,22 @@ export const withTsGql = (internalConfig: any = {}) => (
   if (phase === "phase-development-server") {
     watch(process.cwd());
   }
-  return typeof internalConfig === "function"
-    ? internalConfig(phase, thing)
-    : internalConfig;
+  let internalConfigObj =
+    typeof internalConfig === "function"
+      ? internalConfig(phase, thing)
+      : internalConfig;
+  return {
+    ...internalConfigObj,
+    webpack(webpackConfig: any, options: any) {
+      if (!options.defaultLoaders.babel.options.plugins) {
+        options.defaultLoaders.babel.options.plugins = [];
+      }
+      options.defaultLoaders.babel.options.plugins.unshift(
+        require.resolve("@ts-gql/babel-plugin")
+      );
+      return internalConfigObj.webpack
+        ? internalConfigObj.webpack(webpackConfig, options)
+        : webpackConfig;
+    },
+  };
 };

pnpm-lock.yaml

@@ -35,6 +35,8 @@ let someMutation = gql`
   }
 ` as import("../__generated__/ts-gql/SomeMutationApollo").type;
 
+console.log({ query, someMutation });
+
 export default () => {
   // let client = useApolloClient();
   // const { data } = useQuery(query, { variables: { arg: "" } });

test-app/__generated__/ts-gql/SomeMutationUrql.ts

@@ -27,7 +27,7 @@ let query = gql`
 let someMutation = gql`
   mutation SomeMutationUrql($arg: String!) {
     optional(thing: $arg)
-    ye: somethin
+    ye: something
   }
 ` as import("../__generated__/ts-gql/SomeMutationUrql").type;