vite-plugin-drupal-t 1.0.3 → 1.0.5

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import type { Plugin } from 'rollup';
+import type { Plugin } from 'vite';
 export interface ExtractDrupalTOptions {
     include?: string | string[];
     exclude?: string | string[];

package/dist/index.js

@@ -4,6 +4,20 @@ export default function extractDrupalT(options = {}) {
     const translations = new Set();
     return {
         name: 'extract-drupal-t',
+        config() {
+            return {
+                build: {
+                    rollupOptions: {
+                        external: ['Drupal'],
+                        output: {
+                            globals: {
+                                Drupal: 'Drupal',
+                            },
+                        },
+                    },
+                },
+            };
+        },
         transform(code, id) {
             if (!filter(id))
                 return null;
@@ -30,7 +44,7 @@ export default function extractDrupalT(options = {}) {
                 // Format each translation as a comment.
                 // Replace '(Drupal)' with 'Drupal' for consistency.
                 // Drupal can find the translations it needs to include.
-                .map((translation) => `// ${translation.replace('(Drupal)', 'Drupal')}`)
+                .map((translation) => translation.replace('(Drupal)', 'Drupal').split('\n').map(line => `// ${line}`).join('\n'))
                 .join('\n');
             this.emitFile({
                 type: 'asset',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-drupal-t",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "A Vite plugin that automatically extracts Drupal.t() and Drupal.formatPlural() translation calls for seamless internationalization",
   "author": "Märt Rang <rang501@gmail.com>",
   "license": "MIT",
@@ -40,7 +40,8 @@
     "formatPlural"
   ],
   "dependencies": {
-    "@rollup/pluginutils": "^4.2.1"
+    "@rollup/pluginutils": "^4.2.1",
+    "ts-for-drupal-core": "^0.0.7"
   },
   "devDependencies": {
     "@types/estree": "^1.0.7",

package/src/index.test.ts

@@ -161,7 +161,7 @@ multiline string\`);`;
       const output = generateOutput(plugin);
 
       expect(output).toContain('// Drupal.t(`This is a');
-      expect(output).toContain('multiline string`)');
+      expect(output).toContain('// multiline string`)');
     });
 
     it('should extract single-line template literals', () => {
@@ -193,7 +193,7 @@ Line 2\`, {});`;
       const output = generateOutput(plugin);
 
       expect(output).toContain('// Drupal.t(`Line 1');
-      expect(output).toContain('Line 2`, {})');
+      expect(output).toContain('// Line 2`, {})');
     });
 
     it('should extract multiline formatPlural strings', () => {
@@ -205,11 +205,9 @@ items\`, {});`;
       callTransform(plugin, code, id);
       const output = generateOutput(plugin);
 
-      expect(output).toContain('// Drupal.formatPlural(5,');
-      expect(output).toContain('`One');
-      expect(output).toContain('item`');
-      expect(output).toContain('`Many');
-      expect(output).toContain('items`, {})');
+      expect(output).toContain('// Drupal.formatPlural(5, `One');
+      expect(output).toContain('// item`, `Many');
+      expect(output).toContain('// items`, {})');
     });
   });
 

package/src/index.ts

@@ -1,5 +1,5 @@
 import { createFilter } from '@rollup/pluginutils';
-import type { Plugin } from 'rollup';
+import type { Plugin } from 'vite';
 
 export interface ExtractDrupalTOptions {
   include?: string | string[];
@@ -12,6 +12,20 @@ export default function extractDrupalT(options: ExtractDrupalTOptions = {}): Plu
 
   return {
     name: 'extract-drupal-t',
+    config() {
+      return {
+        build: {
+          rollupOptions: {
+            external: ['Drupal'],
+            output: {
+              globals: {
+                Drupal: 'Drupal',
+              },
+            },
+          },
+        },
+      };
+    },
     transform(code: string, id: string) {
       if (!filter(id)) return null;
 
@@ -42,7 +56,7 @@ export default function extractDrupalT(options: ExtractDrupalTOptions = {}): Plu
         // Format each translation as a comment.
         // Replace '(Drupal)' with 'Drupal' for consistency.
         // Drupal can find the translations it needs to include.
-        .map((translation) => `// ${translation.replace('(Drupal)', 'Drupal')}`)
+        .map((translation) => translation.replace('(Drupal)', 'Drupal').split('\n').map(line => `// ${line}`).join('\n'))
         .join('\n');
 
       this.emitFile({

package/src/drupal.d.ts

@@ -1,41 +0,0 @@
-declare namespace Drupal {
-  /**
-   * Translates a string to the current language.
-   *
-   * @param str
-   *   A string containing the English text to translate.
-   * @param args
-   *   An object of replacements pairs to make after translation. Incidences
-   *   of any key in this array are replaced with the corresponding value.
-   * @param options
-   *   Additional options for translation.
-   * @returns
-   *   The translated string.
-   */
-  function t(str: string, args?: Record<string, string>, options?: { context?: string }): string;
-
-  /**
-   * Translates a string to the current language and formats it as a plural.
-   *
-   * @param count
-   *   The number to determine the plural form.
-   * @param singular
-   *   The singular form of the string.
-   * @param plural
-   *   The plural form of the string.
-   * @param args
-   *   An object of replacements pairs to make after translation. Incidences
-   *   of any key in this array are replaced with the corresponding value.
-   * @param options
-   *   Additional options for translation.
-   * @returns
-   *   The translated string in the correct plural form.
-   */
-  function formatPlural(
-    count: number,
-    singular: string,
-    plural: string,
-    args?: Record<string, string>,
-    options?: { context?: string }
-  ): string;
-}