fix: update deps, add graphql-tag-min

package.json

@@ -24,8 +24,8 @@
   },
   "devDependencies": {
     "@types/jest": "^29.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
+    "@typescript-eslint/eslint-plugin": "^7.6.0",
+    "@typescript-eslint/parser": "^7.6.0",
     "coveralls": "^3.1.1",
     "eslint": "^8.57.0",
     "eslint-plugin-import": "^2.29.1",
@@ -39,7 +39,7 @@
     "react": "^18.2.0",
     "rimraf": "^5.0.5",
     "ts-jest": "^29.1.2",
-    "typescript": "^5.4.3"
+    "typescript": "^5.4.4"
   },
   "license": "MIT",
   "packageManager": "[email protected]"

packages/bundle/package.json

@@ -28,12 +28,12 @@
     "@types/glob": "^8.1.0",
     "dotenv": "^16.4.5",
     "esbuild": "^0.20.2",
-    "glob": "^10.3.10",
-    "path-to-regexp": "^6.2.1",
-    "watcher": "^2.3.0"
+    "glob": "^10.3.12",
+    "path-to-regexp": "^6.2.2",
+    "watcher": "^2.3.1"
   },
   "devDependencies": {
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.7",
     "typescript-json-schema": "^0.63.0"
   },
   "publishConfig": {

packages/graphql-tag-min/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "@reform/graphql-tag-min",
+  "version": "0.1",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "module": "dist/index.js",
+  "type": "module",
+  "files": [
+    "dist"
+  ],
+  "repository": "https://github.com/izatop/reform",
+  "keywords": [
+    "esbuild",
+    "bundle",
+    "graphql",
+    "react",
+    "typescript"
+  ],
+  "scripts": {
+    "build": "tsc"
+  },
+  "dependencies": {
+    "@reform/bundle": "^0.14.8",
+    "@types/node": "^20.12.7"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "author": {
+    "name": "Artur Bier",
+    "email": "[email protected]"
+  },
+  "license": "MIT"
+}

packages/graphql-tag-min/src/Plugin.ts

@@ -0,0 +1,34 @@
+import {assignWithFilter, BuildContext, PluginAbstract} from "@reform/bundle";
+import {readFile} from "fs/promises";
+
+export type Config = {filter: RegExp};
+
+const extensions = ["ts", "tsx"];
+const defaultFilter = new RegExp(`\\.gql\\.(${extensions.join("|")})$`);
+
+export class Plugin extends PluginAbstract<Config> {
+    public readonly name = "@reform/graphql-tag-min";
+
+    constructor(context: BuildContext, config?: Config) {
+        super(context, assignWithFilter({filter: defaultFilter}, config));
+    }
+
+    public configure(): void {
+        this
+            .on("load", this.config, async ({path}) => {
+                const contents = await readFile(path, {encoding: "utf-8"});
+
+                return {contents: this.#patch(contents), loader: "tsx"};
+            });
+    }
+
+    #patch(contents: string): string {
+        if (contents.includes("gql`")) {
+            return contents.replace(/gql`([^`]+)`;/g, (_, $1) => {
+                return `gql\`${$1.replace(/\s+/g, " ")}\`;`;
+            });
+        }
+
+        return contents;
+    }
+}

packages/graphql-tag-min/src/index.ts

@@ -0,0 +1,3 @@
+import {Plugin} from "./Plugin.js";
+
+export default Plugin;

packages/graphql-tag-min/tsconfig.json

@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig.node.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "rootDir": "src"
+  },
+  "references": [
+    {
+      "path": "../bundle"
+    }
+  ],
+  "include": [
+    "src"
+  ]
+}

packages/graphql/package.json

@@ -23,7 +23,7 @@
     "@graphql-tools/graphql-file-loader": "^8.0.1",
     "@graphql-tools/load": "^8.0.2",
     "@reform/bundle": "^0.14.8",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.7",
     "graphql": "^16.8.1",
     "graphql-tag": "^2.12.6"
   },

packages/graphql/src/Plugin.ts

@@ -11,7 +11,7 @@ const extensions = ["gql", "graphql"];
 const defaultFilter = new RegExp(`\\.(${extensions.join("|")})$`);
 
 export class Plugin extends PluginAbstract<Config> {
-    public readonly name = "@reform/bundle-graphql";
+    public readonly name = "@reform/graphql";
 
     constructor(context: BuildContext, config?: Config) {
         super(context, assignWithFilter({filter: defaultFilter}, config));

packages/html/package.json

@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@reform/bundle": "^0.14.8",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.7",
     "@types/parse5": "^7.0.0",
     "esbuild": "^0.20.2",
     "parse5": "^7.1.2"

packages/html/src/Plugin.ts

@@ -8,7 +8,7 @@ export const artifacts = "^.+$";
 export const attach: AttachFileType[] = ["stylesheet"];
 
 export class Plugin extends PluginAbstract<Config> {
-    public readonly name = "@reform/bundle-html-entry";
+    public readonly name = "@reform/html";
 
     readonly #documents = new Map<string, DocFile>();
 

packages/sass/package.json

@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@reform/bundle": "^0.14.8",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.12.7",
     "@types/node-sass": "^4.11.7",
     "node-sass": "^9.0.0"
   },

packages/sass/src/Plugin.ts

@@ -8,7 +8,7 @@ export type Config = {filter: RegExp; resolves?: string[]; compress?: boolean};
 const stripRe = /[?#].+$/;
 
 export class Plugin extends PluginAbstract<Config> {
-    public readonly name = "@reform/bundle-sass";
+    public readonly name = "@reform/sass";
 
     constructor(context: BuildContext, config?: Config) {
         super(context, assignWithFilter({filter: /\.(scss|sass)$/}, config));

packages/test/bundle.json

@@ -4,7 +4,8 @@
       "base": "src",
       "plugins": {
         "@reform/sass": {},
-        "@reform/html": {}
+        "@reform/html": {},
+        "@reform/graphql-tag-min": {}
       },
       "bundle": true,
       "format": "esm",

packages/test/package.json

@@ -8,7 +8,7 @@
     "test": "yarn build"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^6.5.1",
+    "@fortawesome/fontawesome-free": "^6.5.2",
     "@reform/bundle": "^0.14.8",
     "esbuild": "^0.20.2",
     "graphql": "^16.8.1"
@@ -20,8 +20,9 @@
   "private": true,
   "license": "MIT",
   "dependencies": {
-    "@types/react": "^18.2.71",
-    "@types/react-dom": "^18.2.22",
+    "@types/react": "^18.2.75",
+    "@types/react-dom": "^18.2.24",
+    "graphql-tag": "^2.12.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   }

packages/test/src/page/Hello.tsx

@@ -1,6 +1,6 @@
 import icon from "../icons/icon.png";
 import svg from "../icons/icon.svg";
-import {HelloQuery} from "../query";
+import {HelloQuery, InlineQuery1, InlineQuery2} from "../query";
 import {Card} from "./Card";
 
 export const Hello: React.FC = () => {
@@ -24,6 +24,9 @@ export const Hello: React.FC = () => {
             <section>
                 <pre>{JSON.stringify(HelloQuery, null, 2)}</pre>
             </section>
+            <section>
+                <pre>{JSON.stringify({InlineQuery1, InlineQuery2}, null, 2)}</pre>
+            </section>
         </div>
     );
 };

packages/test/src/query/index.ts

@@ -1,3 +1,5 @@
+
 import HelloQuery from "./HelloQuery.graphql";
 
+export * from "./inline.gql";
 export {HelloQuery};

packages/test/src/query/inline.gql.ts

@@ -0,0 +1,9 @@
+import gql from "graphql-tag";
+
+export const InlineQuery1 = gql`query InlineQuery1 {
+    message
+}`;
+
+export const InlineQuery2 = gql`query InlineQuery2 {
+    message
+}`;

packages/tsconfig.json

@@ -11,6 +11,9 @@
     {
       "path": "graphql"
     },
+    {
+      "path": "graphql-tag-min"
+    },
     {
       "path": "html"
     }