Remove dependency Drupal's core libraries.

Author: hugronaphor

dist/init.js

@@ -1,44 +1,36 @@
-(function (drupalSettings) {
+if (window.wire === undefined) {
+  window.wire = new Wire();
+  window.Wire = window.wire;
+}
 
-  var isDebug = drupalSettings.wireIsDebug || false;
-
-  if (window.wire === undefined) {
-    window.wire = new Wire();
-    window.wire.devTools(isDebug);
-    window.Wire = window.wire;
-    window.wire_app_url = drupalSettings.wireAppUrl || '/';
-  }
-
-  if (isDebug && window.Alpine) {
-    document.addEventListener("DOMContentLoaded", function () {
-      setTimeout(function () {
-        console.warn("Wire: It looks like AlpineJS has already been loaded. Make sure Wire\'s scripts are loaded before Alpine.\\n\\n Reference docs for more info: https://wire-drupal.com/docs/alpine-js")
-      })
-    });
-  }
-
-  window.deferLoadingAlpine = function (callback) {
-    window.addEventListener('wire:load', function () {
-      callback();
-    });
-  };
+if (window.Alpine) {
+  document.addEventListener("DOMContentLoaded", function () {
+    setTimeout(function () {
+      console.warn("Wire: It looks like AlpineJS has already been loaded. Make sure Wire\'s scripts are loaded before Alpine.\\n\\n Reference docs for more info: https://wire-drupal.com/docs/alpine-js")
+    })
+  });
+}
 
-  var started = false;
+window.deferLoadingAlpine = function (callback) {
+  window.addEventListener('wire:load', function () {
+    callback();
+  });
+};
 
-  window.addEventListener('alpine:initializing', function () {
-    if (!started) {
-      window.wire.start();
+var started = false;
 
-      started = true;
-    }
-  });
+window.addEventListener('alpine:initializing', function () {
+  if (!started) {
+    window.wire.start();
 
-  document.addEventListener("DOMContentLoaded", function () {
-    if (!started) {
-      window.wire.start();
+    started = true;
+  }
+});
 
-      started = true;
-    }
-  });
+document.addEventListener("DOMContentLoaded", function () {
+  if (!started) {
+    window.wire.start();
 
-})(drupalSettings);
+    started = true;
+  }
+});

dist/manifest.json

@@ -1 +1 @@
-{"/wire.js":"/wire.js?id=0cca5d7f474f99be4663"}
+{"/wire.js":"/wire.js?id=60ae6f8eea0ee779d6d3"}

dist/wire.js

@@ -76,7 +76,7 @@ class UploadManager {
 
         let csrfToken = getCsrfToken()
 
-        if (csrfToken) headers['X-CSRF-TOKEN'] = csrfToken
+        if (csrfToken) headers['W-CSRF-TOKEN'] = csrfToken
 
         this.makeRequest(name, formData, 'post', url, headers, response => {
             return response.paths

dist/wire.js.map

@@ -1,6 +1,6 @@
 import store from '@/Store'
 import componentStore from '../Store'
-import { getCsrfToken } from '@/util'
+import { getCsrfToken, getAppUrl } from '@/util'
 
 export default class Connection {
     constructor() {
@@ -30,7 +30,7 @@ export default class Connection {
     sendMessage(message) {
         let payload = message.payload()
         let csrfToken = getCsrfToken()
-        let appUrl = window.wire_app_url
+        let appUrl = getAppUrl()
 
         if (this.shouldUseLocalePrefix(payload)) {
             appUrl = `${appUrl}/${payload.fingerprint.locale}`

js/component/UploadManager.js

@@ -0,0 +1,9 @@
+export function getAppUrl() {
+    const appUrlTag = document.head.querySelector('meta[name="w-app-url"]')
+
+    if (appUrlTag) {
+        return appUrlTag.content
+    }
+
+    return window.wire_app_url ?? window.location.origin ?? ''
+}

js/connection/index.js

@@ -4,6 +4,7 @@ export * from './wire-directives'
 export * from './walk'
 export * from './dispatch'
 export * from './getCsrfToken'
+export * from './getAppUrl'
 
 export function kebabCase(subject) {
     return subject.replace(/([a-z])([A-Z])/g, '$1-$2').replace(/[_\s]/, '-').toLowerCase()

js/util/getAppUrl.js

@@ -1,11 +1,10 @@
 init:
-  version: 0.0.2
+  version: 0.0.3
   js:
     dist/init.js: {
       minified: false
     }
   dependencies:
-    - core/drupalSettings
     - wire/js-base
     - wire/styles
 
@@ -18,7 +17,7 @@ styles:
       }
 
 js-base:
-  version: 0cca5d7f474f99be4663
+  version: 60ae6f8eea0ee779d6d3
   js:
     dist/wire.js: {
       minified: true,

js/util/index.js

@@ -11,14 +11,17 @@
 function wire_page_attachments(array &$page): void {
 
   $request = Drupal::request();
-  $container = \Drupal::getContainer();
 
-  // Add needed values.
-  $page['#attached']['drupalSettings'] = [
-    'wireAppUrl' => $request->getSchemeAndHttpHost(),
-    'wireIsDebug' => $container->hasParameter('twig.config')
-      && \is_array($container->getParameter('twig.config'))
-      && $container->getParameter('twig.config')['debug'],
+  // Add App url to the page.
+  $page['#attached']['html_head'][] = [
+    [
+      '#tag' => 'meta',
+      '#attributes' => [
+        'name' => 'w-app-url',
+        'content' => Drupal::request()->getSchemeAndHttpHost(),
+      ],
+    ],
+    'wire-app-url',
   ];
 
   // Add CSRF token to the page for authenticated users.