@strapi/plugin-graphql 4.15.1 → 4.15.3-alpha.0

package/.eslintignore

@@ -1,2 +1 @@
-node_modules/
-.eslintrc.js
+dist

package/.eslintrc

@@ -0,0 +1,14 @@
+{
+  "root": true,
+  "overrides": [
+    {
+      "files": ["admin/**/*"],
+      "extends": ["custom/front"]
+    },
+    {
+      "files": ["**/*"],
+      "excludedFiles": ["admin/**/*"],
+      "extends": ["custom/back"]
+    }
+  ]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-graphql",
-  "version": "4.15.1",
+  "version": "4.15.3-alpha.0",
   "description": "Adds GraphQL endpoint with default API methods.",
   "repository": {
     "type": "git",
@@ -20,16 +20,34 @@
       "url": "https://strapi.io"
     }
   ],
+  "exports": {
+    "./strapi-admin": {
+      "source": "./admin/src/index.js",
+      "import": "./dist/admin/index.mjs",
+      "require": "./dist/admin/index.js",
+      "default": "./dist/admin/index.js"
+    },
+    "./strapi-server": {
+      "source": "./strapi-server.js",
+      "require": "./strapi-server.js",
+      "default": "./strapi-server.js"
+    },
+    "./package.json": "./package.json"
+  },
   "scripts": {
-    "lint": "run -T eslint ."
+    "build": "pack-up build",
+    "clean": "run -T rimraf dist",
+    "lint": "run -T eslint .",
+    "prepublishOnly": "yarn clean && yarn build",
+    "watch": "pack-up watch"
   },
   "dependencies": {
     "@graphql-tools/schema": "8.5.1",
     "@graphql-tools/utils": "^8.13.1",
     "@strapi/design-system": "1.13.0",
-    "@strapi/helper-plugin": "4.15.1",
+    "@strapi/helper-plugin": "4.15.3-alpha.0",
     "@strapi/icons": "1.13.0",
-    "@strapi/utils": "4.15.1",
+    "@strapi/utils": "4.15.3-alpha.0",
     "apollo-server-core": "3.12.1",
     "apollo-server-koa": "3.10.0",
     "graphql": "^15.5.1",
@@ -43,6 +61,8 @@
     "pluralize": "8.0.0"
   },
   "devDependencies": {
+    "@strapi/pack-up": "4.15.3-alpha.0",
+    "@strapi/strapi": "4.15.3-alpha.0",
     "cross-env": "^7.0.3",
     "koa": "2.13.4",
     "react": "^18.2.0",
@@ -54,8 +74,8 @@
     "@strapi/strapi": "^4.0.0",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0",
-    "react-router-dom": "5.3.4",
-    "styled-components": "5.3.3"
+    "react-router-dom": "^5.2.0",
+    "styled-components": "^5.2.1"
   },
   "engines": {
     "node": ">=18.0.0 <=20.x.x",
@@ -67,5 +87,5 @@
     "description": "Adds GraphQL endpoint with default API methods.",
     "kind": "plugin"
   },
-  "gitHead": "b6c085052f108fcfe47d22972a664dfa85aa0358"
+  "gitHead": "81425b4b9803fd4df570e050c40dd984ebd28ac6"
 }

package/packup.config.ts

@@ -0,0 +1,42 @@
+import { Config, defineConfig } from '@strapi/pack-up';
+import { transformWithEsbuild } from 'vite';
+
+const config: Config = defineConfig({
+  bundles: [
+    {
+      source: './admin/src/index.js',
+      import: './dist/admin/index.mjs',
+      require: './dist/admin/index.js',
+      runtime: 'web',
+    },
+  ],
+  dist: './dist',
+  /**
+   * Because we're exporting a server & client package
+   * which have different runtimes we want to ignore
+   * what they look like in the package.json
+   */
+  exports: {},
+  plugins: [
+    {
+      name: 'treat-js-files-as-jsx',
+      async transform(code, id) {
+        /**
+         * Matches all files in src/ and ee/ that end with .js
+         */
+        if (!id.match(/src\/.*\.js$/) && !id.match(/ee\/.*\.js$/)) {
+          return null;
+        }
+
+        // Use the exposed transform from vite, instead of directly
+        // transforming with esbuild
+        return transformWithEsbuild(code, id, {
+          loader: 'tsx',
+          jsx: 'automatic',
+        });
+      },
+    },
+  ],
+});
+
+export default config;

package/server/services/builders/resolvers/component.js

@@ -13,10 +13,10 @@ module.exports = ({ strapi }) => ({
       const component = strapi.getModel(componentName);
 
       const transformedArgs = transformArgs(args, { contentType: component, usePagination: true });
-      await validate.contentAPI.query(transformedArgs, contentType, {
+      await validate.contentAPI.query(transformedArgs, component, {
         auth: ctx?.state?.auth,
       });
-      const sanitizedQuery = await sanitize.contentAPI.query(transformedArgs, contentType, {
+      const sanitizedQuery = await sanitize.contentAPI.query(transformedArgs, component, {
         auth: ctx?.state?.auth,
       });
       return strapi.entityService.load(contentTypeUID, parent, attributeName, sanitizedQuery);

package/.eslintrc.js

@@ -1,14 +0,0 @@
-module.exports = {
-  root: true,
-  overrides: [
-    {
-      files: ['admin/**/*'],
-      extends: ['custom/front'],
-    },
-    {
-      files: ['**/*'],
-      excludedFiles: ['admin/**/*'],
-      extends: ['custom/back'],
-    },
-  ],
-};

package/strapi-admin.js

@@ -1,3 +0,0 @@
-'use strict';
-
-module.exports = require('./admin/src').default;