Merge pull request #4 from wp-graphql/feature/add-dir-constant

Define constant for the plugin dir url, to make it easier to enqueue …
wp-graphql · Jan 29, 2018 · 95e86a4 · 95e86a4
2 parents 0d3de72 + 90c27cf
commit 95e86a4
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 25 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ node_modules/
 *.sql
 *.tar.gz
 *.zip
+.idea*
diff --git a/assets/app/build/asset-manifest.json b/assets/app/build/asset-manifest.json
@@ -1,6 +1,6 @@
 {
   "main.css": "static/css/main.b25a6b44.css",
   "main.css.map": "static/css/main.b25a6b44.css.map",
-  "main.js": "static/js/main.44364570.js",
-  "main.js.map": "static/js/main.44364570.js.map"
+  "main.js": "static/js/main.6ad70e09.js",
+  "main.js.map": "static/js/main.6ad70e09.js.map"
 }
diff --git a/assets/app/build/favicon.ico b/assets/app/build/favicon.ico
diff --git a/assets/app/build/index.html b/assets/app/build/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>React App</title><link href="/static/css/main.b25a6b44.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="wp-graphiql"></div><script type="text/javascript" src="/static/js/main.44364570.js"></script></body></html>
+<head><link href="/static/css/main.b25a6b44.css" rel="stylesheet"></head><script type="text/javascript" src="/static/js/main.6ad70e09.js"></script>
diff --git a/assets/app/build/manifest.json b/assets/app/build/manifest.json
diff --git a/assets/app/build/service-worker.js b/assets/app/build/service-worker.js
diff --git a/assets/app/build/static/css/main.b25a6b44.css b/assets/app/build/static/css/main.b25a6b44.css
diff --git a/assets/app/build/static/js/main.44364570.js → assets/app/build/static/js/main.6ad70e09.js b/assets/app/build/static/js/main.44364570.js → assets/app/build/static/js/main.6ad70e09.js
diff --git a/.../app/build/static/js/main.44364570.js.map → .../app/build/static/js/main.6ad70e09.js.map b/.../app/build/static/js/main.44364570.js.map → .../app/build/static/js/main.6ad70e09.js.map
diff --git a/assets/app/package.json b/assets/app/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "app",
+  "name": "wp-graphiql",
   "version": "0.0.1",
   "private": true,
   "devDependencies": {

diff --git a/wp-graphiql.php b/wp-graphiql.php
@@ -22,6 +22,9 @@
 class WPGraphiQL {
 
 	public function init() {
+		if ( ! defined( 'WPGRAPHIQL_PLUGIN_DIR' ) ) {
+			define( 'WPGRAPHIQL_PLUGIN_DIR', plugin_dir_url( __FILE__ ) );
+		}
 		add_action( 'admin_menu', [ $this, 'register_admin_page' ] );
 		add_action( 'admin_enqueue_scripts', [ $this, 'enqueue_react_app' ] );
 	}
@@ -72,7 +75,7 @@ public function get_app_stylesheet() {
 		if ( empty( $manifest['main.css'] ) ) {
 			return '';
 		}
-		return plugins_url( 'wp-graphiql/assets/app/build/' . $manifest['main.css'] );
+		return WPGRAPHIQL_PLUGIN_DIR . 'assets/app/build/' . $manifest['main.css'];
 	}
 
 	/**
@@ -85,15 +88,15 @@ public function get_app_script() {
 		if ( empty( $manifest['main.js'] ) ) {
 			return '';
 		}
-		return plugins_url( 'wp-graphiql/assets/app/build/' . $manifest['main.js'] );
+		return WPGRAPHIQL_PLUGIN_DIR . 'assets/app/build/' . $manifest['main.js'];
 	}
 
 	public function get_app_script_helpers() {
 		$manifest = $this->get_app_manifest();
 		if ( empty( $manifest['main.js'] ) ) {
 			return '';
 		}
-		return plugins_url( 'wp-graphiql/assets/js/wp-graphiql-helpers.js' );
+		return WPGRAPHIQL_PLUGIN_DIR . 'assets/js/wp-graphiql-helpers.js';
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ node_modules/ @@
     *.sql
     *.tar.gz
     *.zip
+    .idea*
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>React App</title><link href="/static/css/main.b25a6b44.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="wp-graphiql"></div><script type="text/javascript" src="/static/js/main.44364570.js"></script></body></html>
		<head><link href="/static/css/main.b25a6b44.css" rel="stylesheet"></head><script type="text/javascript" src="/static/js/main.6ad70e09.js"></script>