BREAKING CHANGE: Import path spec

ApelegHQ · May 5, 2023 · 4eeff8f · 4eeff8f
1 parent badee8e
commit 4eeff8f
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 59 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@exact-realty/esbuild-plugin-inline-js",
-  "version": "1.0.8",
+  "version": "1.1.0",
   "description": "esbuild plugin for inline scripts",
   "main": "dist/index.js",
   "module": "./dist/index.mjs",
@@ -31,7 +31,7 @@
   "license": "ISC",
   "devDependencies": {
     "@types/mocha": "^10.0.1",
-    "@types/node": "^18.16.3",
+    "@types/node": "^18.16.5",
     "@typescript-eslint/eslint-plugin": "^5.59.2",
     "@typescript-eslint/parser": "^5.59.2",
     "esbuild": "^0.17.18",

diff --git a/src/index.ts b/src/index.ts
@@ -88,41 +88,39 @@ export default (
 				},
 			);
 
-			build.onResolve(
-				{ filter: /\.inline\.(js|jsx|ts|tsx)$/ },
-				async (a) => {
-					const { path, resolveDir, pluginData, namespace, kind } = a;
-					if (
-						kind === 'entry-point' ||
-						pluginData === skipResolve ||
-						namespace ===
-							'@exact-realty/esbuild-plugin-inline-js/loader'
-					) {
-						return;
-					}
+			build.onResolve({ filter: /^inline:/ }, async (a) => {
+				const { path, resolveDir, pluginData, namespace, kind } = a;
+				if (
+					kind === 'entry-point' ||
+					pluginData === skipResolve ||
+					namespace ===
+						'@exact-realty/esbuild-plugin-inline-js/loader'
+				) {
+					return;
+				}
 
-					const result = await build.resolve(path, {
-						resolveDir,
-						pluginData: skipResolve,
-						kind: 'require-resolve',
-						namespace,
-					});
+				const pathWP = path.slice(7);
 
-					if (result.errors.length > 0) {
-						return { errors: result.errors };
-					}
+				const result = await build.resolve(pathWP, {
+					resolveDir,
+					pluginData: skipResolve,
+					kind: 'require-resolve',
+					namespace,
+				});
 
-					return {
-						external: false,
-						namespace:
-							'@exact-realty/esbuild-plugin-inline-js/loader',
-						path: result.path,
-						suffix: undefined,
-						watchDirs: [],
-						watchFiles: [result.path],
-					};
-				},
-			);
+				if (result.errors.length > 0) {
+					return { errors: result.errors };
+				}
+
+				return {
+					external: false,
+					namespace: '@exact-realty/esbuild-plugin-inline-js/loader',
+					path: result.path,
+					suffix: undefined,
+					watchDirs: [],
+					watchFiles: [result.path],
+				};
+			});
 
 			build.onResolve(
 				{

diff --git a/test/test-default-import.ts b/test/test-default-import.ts
@@ -15,7 +15,7 @@
 
 import assert from 'node:assert/strict';
 
-import x from './sample.inline.ts';
+import x from 'inline:./sample.inline.ts';
 
 assert.notEqual(x, '');
 assert.equal((new Function(x)(), globalThis.result), 'Hello, World!');
diff --git a/test/test-non-existing.ts b/test/test-non-existing.ts
@@ -13,4 +13,4 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-export * as default from './this.file.does.not.exist.inline.ts';
+export * as default from 'inline:./this.file.does.not.exist.inline.ts';
diff --git a/test/test-path-import.ts b/test/test-path-import.ts
@@ -18,7 +18,7 @@ import { createHash } from 'node:crypto';
 import { join } from 'node:path';
 import { readFileSync } from 'node:fs';
 
-import * as x from './external.inline.ts';
+import * as x from 'inline:./external.inline.ts';
 
 assert.notEqual(x.default, '');
 assert.equal(

diff --git a/test/test-recursive-outer.inline.ts b/test/test-recursive-outer.inline.ts
@@ -1,4 +1,4 @@
-import * as inner from './test-recursive-inner.inline.ts';
+import * as inner from 'inline:./test-recursive-inner.inline.ts';
 
 (function () {
 	new Function(inner.default)();

diff --git a/test/test-recursive.ts b/test/test-recursive.ts
@@ -15,7 +15,7 @@
 
 import assert from 'node:assert/strict';
 
-import x from './test-recursive-outer.inline.ts';
+import x from 'inline:./test-recursive-outer.inline.ts';
 
 assert.notEqual(x, '');
 assert.equal((new Function(x)(), globalThis.result), 'Hello, World!');
diff --git a/test/test-simple.ts b/test/test-simple.ts
@@ -16,7 +16,7 @@
 import assert from 'node:assert/strict';
 import { createHash } from 'node:crypto';
 
-import * as x from './sample.inline.ts';
+import * as x from 'inline:./sample.inline.ts';
 
 assert.notEqual(x.default, '');
 assert.equal(

diff --git a/test/test.d.ts b/test/test.d.ts
@@ -13,16 +13,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-declare module '*.inline.ts' {
-	const content: string;
-	export const contentBase64: string;
-	export const path: string;
-	export const sri: string;
-
-	export default content;
-}
-
-declare module '*.inline.js' {
+declare module 'inline:*' {
 	const content: string;
 	export const contentBase64: string;
 	export const path: string;

diff --git a/tsconfig.json b/tsconfig.json
@@ -15,10 +15,9 @@
 		"lib": ["es6", "ES2019.object", "dom"],
 		"declaration": true
 	},
-	"include": ["src/**/*", "types/**/*"],
+	"include": ["src/**/*"],
 	"exclude": [
 		"node_modules",
 		"build"
-	],
-	"types": ["node"]
+	]
 }