feat: 🎸 ESM support

__tests__/formatter.test.ts

@@ -1,7 +1,7 @@
 import assert from 'assert';
 import path from 'path';
 import fs from 'fs';
-import { BladeFormatter, Formatter } from '../src/main';
+import { BladeFormatter, Formatter } from '../src/main.js';
 import * as cmd from './support/cmd';
 import * as util from './support/util';
 
@@ -1057,7 +1057,7 @@ describe('formatter', () => {
   });
 
   test('should consider directive in html tag', async () => {
-    const cmdResult = await cmd.execute(path.resolve('bin', 'blade-formatter'), [
+    const cmdResult = await cmd.execute(path.resolve('bin', 'blade-formatter.js'), [
       path.resolve('__tests__', 'fixtures', 'inline_php_tag.blade.php'),
     ]);
 
@@ -2445,11 +2445,11 @@ describe('formatter', () => {
 
   test('sort tailwindcss classs option can work', function () {
     const content = [
-      `<div class="justify-center z-50 z-10 z-20 container text-left foo md:text-center">`,
+      `<div class="justify-center z-10 z-20 z-50 container text-left foo md:text-center">`,
       `</div>`,
     ].join('\n');
     const expected = [
-      `<div class="foo container z-50 z-10 z-20 justify-center text-left md:text-center">`,
+      `<div class="foo container z-10 z-20 z-50 justify-center text-left md:text-center">`,
       `</div>`,
       ``,
     ].join('\n');
@@ -2475,7 +2475,7 @@ describe('formatter', () => {
     ].join('\n');
 
     const expected = [
-      `<div class="foo container z-50 z-10 z-20 justify-center text-left md:text-center">`,
+      `<div class="foo container z-10 z-20 z-50 justify-center text-left md:text-center">`,
       `</div>`,
       ``,
     ].join('\n');
@@ -2494,7 +2494,7 @@ describe('formatter', () => {
     ].join('\n');
 
     const expected = [
-      `<div class="foo container z-50 z-10 z-20 justify-center text-left md:text-center">`,
+      `<div class="foo container z-10 z-20 z-50 justify-center text-left md:text-center">`,
       `</div>`,
       ``,
     ].join('\n');

__tests__/support/assertion.ts

@@ -3,7 +3,7 @@ import path from 'path';
 import * as cmd from './cmd';
 
 export function assertFormatted(file: any) {
-  const response = cmd.executeSync(path.resolve('bin', 'blade-formatter'), [file, '-c']);
+  const response = cmd.executeSync(path.resolve('bin', 'blade-formatter.js'), [file, '-c']);
 
   const output = response.output.join('\n');
   const exitCode = response.status;
@@ -21,7 +21,7 @@ export function assertNotFormatted(file: any) {
     }
   });
 
-  const response = cmd.executeSync(path.resolve('bin', 'blade-formatter'), [file, '-c']);
+  const response = cmd.executeSync(path.resolve('bin', 'blade-formatter.js'), [file, '-c']);
 
   const output = response.output.join('\n');
   const exitCode = response.status;

__tests__/support/util.ts

@@ -8,7 +8,7 @@ export function populateFixtures(targetDir: any) {
 }
 
 export async function checkIfTemplateIsFormattedTwice(input: any, target: any, options: string[] = []) {
-  const cmdResult = await cmd.execute(path.resolve('bin', 'blade-formatter'), [
+  const cmdResult = await cmd.execute(path.resolve('bin', 'blade-formatter.js'), [
     ...options,
     path.resolve('__tests__', 'fixtures', input),
   ]);
@@ -17,7 +17,7 @@ export async function checkIfTemplateIsFormattedTwice(input: any, target: any, o
 
   expect(cmdResult).toEqual(formatted.toString('utf-8'));
 
-  const cmdResult2 = await cmd.execute(path.resolve('bin', 'blade-formatter'), [
+  const cmdResult2 = await cmd.execute(path.resolve('bin', 'blade-formatter.js'), [
     ...options,
     path.resolve('__tests__', 'fixtures', target),
   ]);

bin/blade-formatter.cjs

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+"use strict";
+
+function runCli(cli) {
+  return cli.default.default();
+}
+
+var dynamicImport = new Function("module", "return import(module)");
+
+module.exports.promise = dynamicImport("../dist/cli-bundle.cjs").then(runCli);

bin/blade-formatter.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+import './blade-formatter.cjs';

index.d.ts

@@ -1,4 +1,4 @@
 declare module 'concat-stream';
 declare module 'glob';
 declare module 'fs-extra';
-declare module '@prettier/plugin-php/standalone';
+declare module '@prettier/plugin-php/standalone.js';

package.json

@@ -10,28 +10,31 @@
   ],
   "version": "1.32.13",
   "description": "An opinionated blade template formatter for Laravel",
-  "main": "./dist/bundle.js",
+  "main": "./dist/bundle.cjs",
   "types": "./dist/types/main.d.ts",
   "type": "module",
   "exports": {
     ".": {
+      "import": "./dist/bundle.js",
+      "require": "./dist/bundle.cjs",
       "default": "./dist/bundle.js"
-    }
+    },
+    "./*": "./*"
   },
   "scripts": {
-    "build": "cross-env NODE_ENV=production node esbuild.ts",
+    "build": "cross-env NODE_ENV=production node esbuild.js && cross-env NODE_ENV=production ESM_BUILD=true node esbuild.js",
     "prepublish": "tsc src/main.ts --declaration --emitDeclarationOnly --outDir ./dist/types || true",
-    "watch": "node esbuild.ts",
+    "watch": "node esbuild.js",
     "test": "yarn run build && node --experimental-vm-modules node_modules/.bin/jest",
     "lint": "eslint src -c .eslintrc.js --ext ts",
     "fix": "prettier {src,__tests__}/**/*.ts --write",
     "check_formatted": "prettier **/*.ts -c",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
     "prepare": "husky install",
-    "bin": "cross-env ./bin/blade-formatter"
+    "bin": "cross-env ./bin/blade-formatter.cjs"
   },
   "bin": {
-    "blade-formatter": "bin/blade-formatter"
+    "blade-formatter": "bin/blade-formatter.cjs"
   },
   "author": "Shuhei Hayashibara",
   "license": "MIT",

src/util.ts

@@ -3,9 +3,9 @@ import _ from 'lodash';
 import fs from 'fs';
 import os from 'os';
 import chalk from 'chalk';
-import prettier from 'prettier/standalone';
+import prettier from 'prettier/standalone.js';
 // @ts-ignore
-import phpPlugin from '@prettier/plugin-php/standalone';
+import phpPlugin from '@prettier/plugin-php/standalone.js';
 import detectIndent from 'detect-indent';
 import { indentStartTokens, phpKeywordStartTokens, phpKeywordEndTokens } from './indent';
 import { nestedParenthesisRegex } from './regex';

src/vsctm.ts

@@ -18,7 +18,7 @@ export class VscodeTextmate {
     return (async () => {
       this.vsctm = vsctm.default ?? vsctm;
       // @ts-ignore
-      this.oniguruma = oniguruma || vscodeOniguruma.default || vscodeOniguruma;
+      this.oniguruma = oniguruma || vscodeOniguruma?.default || vscodeOniguruma;
       await this.loadWasm();
       return this;
     })();