Update

* Updated dependencies * Added esbuild 20.x a supported version * Switched to ESM * Added new parameter to support a custom matching filter and multiple instances.
ApelegHQ · Feb 23, 2024 · 826f986 · 826f986
1 parent 89aee26
commit 826f986
Show file tree

Hide file tree

Showing 7 changed files with 334 additions and 1,223 deletions.
diff --git a/.mocharc.json b/.mocharc.json
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,8 @@
 {
   "name": "@exact-realty/esbuild-plugin-inline-js",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "description": "esbuild plugin for inline scripts",
+  "type": "module",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
   "exports": {
@@ -15,8 +16,8 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "lintFix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
     "build": "tsc --emitDeclarationOnly --declarationMap && node esbuild.mjs",
-    "test": "mocha",
-    "prepare": "npm run build",
+    "test": "node --loader ts-node/esm test/esbuild.test.ts",
+    "prepack": "npm run build",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",
     "version": "npm run lint && git add -A src",
@@ -29,21 +30,19 @@
   "author": "Exact Realty Limited",
   "license": "ISC",
   "devDependencies": {
-    "@types/mocha": "^10.0.1",
-    "@types/node": "^20.8.2",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
-    "esbuild": "^0.19.4",
-    "eslint": "^8.50.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "mocha": "^10.2.0",
-    "prettier": "^3.0.3",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "@types/node": "^20.11.20",
+    "@typescript-eslint/eslint-plugin": "^7.0.2",
+    "@typescript-eslint/parser": "^7.0.2",
+    "esbuild": "^0.20.1",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "prettier": "^3.2.5",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   },
   "peerDependencies": {
-    "esbuild": "^0.17.0 || ^0.18.0 || ^0.19.0"
+    "esbuild": "^0.17.0 || ^0.18.0 || ^0.19.0 || ^0.20.0"
   },
   "keywords": [
     "esbuild",

diff --git a/src/index.ts b/src/index.ts
@@ -21,8 +21,11 @@ export default (
 		esbuild.BuildOptions,
 		'entryPoints' | 'outdir' | 'outfile' | 'write'
 	>,
+	filter?: RegExp,
 ): esbuild.Plugin => {
+	const mainFilter = filter ?? /^inline:/;
 	const skipResolve = {};
+	const instanceName = `${((0, Math.random)() * 1000) | 0}-${mainFilter}`;
 
 	config = { ...config };
 
@@ -32,12 +35,12 @@ export default (
 	delete (config as esbuild.BuildOptions).write;
 
 	return {
-		name: '@exact-realty/esbuild-plugin-inline-js',
+		name: `@exact-realty/esbuild-plugin-inline-js/${instanceName}`,
 		setup(build) {
 			build.onLoad(
 				{
-					filter: /.*/,
-					namespace: '@exact-realty/esbuild-plugin-inline-js/loader',
+					filter: /./,
+					namespace: `@exact-realty/esbuild-plugin-inline-js/loader/${instanceName}`,
 				},
 				async ({ path }) => {
 					const outfile = randomBytes(9).toString('base64url');
@@ -88,13 +91,13 @@ export default (
 				},
 			);
 
-			build.onResolve({ filter: /^inline:/ }, async (a) => {
+			build.onResolve({ filter: mainFilter }, async (a) => {
 				const { path, resolveDir, pluginData, namespace, kind } = a;
 				if (
 					kind === 'entry-point' ||
 					pluginData === skipResolve ||
 					namespace ===
-						'@exact-realty/esbuild-plugin-inline-js/loader'
+						`@exact-realty/esbuild-plugin-inline-js/loader/${instanceName}`
 				) {
 					return;
 				}
@@ -114,7 +117,7 @@ export default (
 
 				return {
 					external: false,
-					namespace: '@exact-realty/esbuild-plugin-inline-js/loader',
+					namespace: `@exact-realty/esbuild-plugin-inline-js/loader/${instanceName}`,
 					path: result.path,
 					suffix: undefined,
 					watchDirs: [],
@@ -125,20 +128,20 @@ export default (
 			build.onResolve(
 				{
 					filter: /.*/,
-					namespace: '@exact-realty/esbuild-plugin-inline-js/loader',
+					namespace: `@exact-realty/esbuild-plugin-inline-js/loader/${instanceName}`,
 				},
 				({ path, pluginData }) => ({
 					external: false,
-					namespace: '@exact-realty/esbuild-plugin-inline-js/content',
+					namespace: `@exact-realty/esbuild-plugin-inline-js/content/${instanceName}`,
 					path: path.replace(/\.inline\.[jt]sx?$/, '.js'),
 					pluginData: pluginData,
 				}),
 			);
 
 			build.onLoad(
 				{
-					filter: /.*/,
-					namespace: '@exact-realty/esbuild-plugin-inline-js/content',
+					filter: /./,
+					namespace: `@exact-realty/esbuild-plugin-inline-js/content/${instanceName}`,
 				},
 				({ pluginData }) => ({
 					contents: pluginData,

diff --git a/test/esbuild.test.ts b/test/esbuild.test.ts
@@ -15,9 +15,14 @@
 
 import esbuild from 'esbuild';
 import path from 'node:path';
-import is from '../src';
+import is from '../src/index.js';
 
 import assert from 'node:assert/strict';
+import { dirname } from 'node:path';
+import { describe, it } from 'node:test';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 describe('Test', () => {
 	describe('Import results in the right values', () => {
@@ -32,7 +37,7 @@ describe('Test', () => {
 						entryPoints: [path.join(__dirname, `${test}.ts`)],
 						outdir: path.join(__dirname, 'build'),
 						bundle: true,
-						format: 'cjs',
+						format: 'esm',
 						publicPath: 'http://invalid/assets',
 						plugins: [is({ format: 'esm' })],
 						platform: 'node',
@@ -59,7 +64,7 @@ describe('Test', () => {
 						entryPoints: [path.join(__dirname, `${test}.ts`)],
 						outdir: path.join(__dirname, 'build'),
 						bundle: true,
-						format: 'cjs',
+						format: 'esm',
 						publicPath: 'http://invalid/assets',
 						plugins: [is({ format: 'esm' })],
 						platform: 'node',
@@ -88,9 +93,11 @@ describe('Test', () => {
 							err[0] instanceof Object,
 							'Error description is not an object',
 						);
+						const expectedName =
+							'@exact-realty/esbuild-plugin-inline-js/';
 						assert.equal(
-							err[0].pluginName,
-							'@exact-realty/esbuild-plugin-inline-js',
+							err[0].pluginName?.slice(0, expectedName.length),
+							expectedName,
 						);
 					});
 			});
@@ -105,7 +112,7 @@ describe('Test', () => {
 						entryPoints: [path.join(__dirname, `${test}.ts`)],
 						outdir: path.join(__dirname, 'build'),
 						bundle: true,
-						format: 'cjs',
+						format: 'esm',
 						publicPath: 'http://invalid/assets',
 						plugins: [
 							is({

diff --git a/test/test-path-import.ts b/test/test-path-import.ts
@@ -15,11 +15,14 @@
 
 import assert from 'node:assert/strict';
 import { createHash } from 'node:crypto';
-import { join } from 'node:path';
 import { readFileSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
 
 import * as x from 'inline:./external.inline.ts';
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
 assert.notEqual(x.default, '');
 assert.equal(
 	x.contentBase64,

diff --git a/tsconfig.json b/tsconfig.json
@@ -1,8 +1,8 @@
 {
 	"compilerOptions": {
 		"target": "es6",
-		"module": "commonjs",
-		"moduleResolution": "node",
+		"module": "NodeNext",
+		"moduleResolution": "NodeNext",
 		"outDir": "dist",
 		"strict": true,
 		"strictNullChecks": true,
@@ -15,6 +15,9 @@
 		"lib": ["es6", "ES2019.object", "dom"],
 		"declaration": true
 	},
+	"ts-node": {
+		"experimentalResolver": true,
+	},
 	"include": ["src/**/*"],
 	"exclude": [
 		"node_modules",