fix: 🐛 script does not format when type is module

shufo · Jul 23, 2023 · 044fcd2 · 044fcd2
1 parent 1d96a63
commit 044fcd2
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 1 deletion.
diff --git a/__tests__/formatter.test.ts b/__tests__/formatter.test.ts
@@ -4245,6 +4245,75 @@ describe('formatter', () => {
     await util.doubleFormatCheck(content, expected);
   });
 
+  test('script tag with module type', async () => {
+    const content = [
+      `@push('scripts')`,
+      `    <script type="module">`,
+      `    $("#table-kategori").DataTable({`,
+      `    processing: true,`,
+      `    serverSide: true,ajax: "{{ route('kategori.list') }}",`,
+      `    columns: [{data: "DT_RowIndex",`,
+      `       name: "DT_RowIndex",orderable: false,searchable: false`,
+      `     },`,
+      `        {    data: "nama",name: "nama"`,
+      `      },`,
+      `         {`,
+      `         data: "jumlah_barang",`,
+      `         name: "jumlah_barang"`,
+      `       },`,
+      `       {`,
+      `       data: "created_at",`,
+      `       name: "created_at"`,
+      `       },`,
+      `       {`,
+      `       data: "action",`,
+      `       name: "action"`,
+      `       },`,
+      `       ],`,
+      `        });`,
+      `    </script>`,
+      `@endpush`,
+    ].join('\n');
+
+    const expected = [
+      `@push('scripts')`,
+      `    <script type="module">`,
+      `        $("#table-kategori").DataTable({`,
+      `            processing: true,`,
+      `            serverSide: true,`,
+      `            ajax: "{{ route('kategori.list') }}",`,
+      `            columns: [{`,
+      `                    data: "DT_RowIndex",`,
+      `                    name: "DT_RowIndex",`,
+      `                    orderable: false,`,
+      `                    searchable: false`,
+      `                },`,
+      `                {`,
+      `                    data: "nama",`,
+      `                    name: "nama"`,
+      `                },`,
+      `                {`,
+      `                    data: "jumlah_barang",`,
+      `                    name: "jumlah_barang"`,
+      `                },`,
+      `                {`,
+      `                    data: "created_at",`,
+      `                    name: "created_at"`,
+      `                },`,
+      `                {`,
+      `                    data: "action",`,
+      `                    name: "action"`,
+      `                },`,
+      `            ],`,
+      `        });`,
+      `    </script>`,
+      `@endpush`,
+      ``,
+    ].join('\n');
+
+    await util.doubleFormatCheck(content, expected);
+  });
+
   test('escaped quote in raw php directive #669', async () => {
     const content = [
       `    @php`,

diff --git a/src/formatter.ts b/src/formatter.ts
@@ -856,7 +856,7 @@ export default class Formatter {
   async preserveNonnativeScripts(content: string) {
     return _.replace(
       content,
-      /<script[^>]*?type=(["'])(?!text\/javascript)[^\1]*?\1[^>]*?>.*?<\/script>/gis,
+      /<script[^>]*?type=(["'])(?!(text\/javascript|module))[^\1]*?\1[^>]*?>.*?<\/script>/gis,
       (match: string) => this.storeNonnativeScripts(match),
     );
   }