feat(peggy-loader): allow inject dependencies by importing inline (#1368

)
RocketChat · Oct 17, 2024 · c276aa5 · c276aa5
1 parent 1ca8371
commit c276aa5
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/packages/peggy-loader/src/index.ts b/packages/peggy-loader/src/index.ts
@@ -1,33 +1,32 @@
-import type {
-  BuildOptionsBase,
-  OutputFormatAmdCommonjsEs,
-  OutputFormatBare,
-  OutputFormatGlobals,
-  OutputFormatUmd,
-  SourceOptionsBase,
-} from 'peggy';
+import type { BuildOptionsBase, OutputFormatAmdCommonjsEs } from 'peggy';
 import peggy from 'peggy';
 import type { LoaderContext } from 'webpack';
 
-type Options =
-  | BuildOptionsBase &
-      (
-        | Omit<
-            OutputFormatAmdCommonjsEs<'source'>,
-            keyof SourceOptionsBase<'source'>
-          >
-        | Omit<OutputFormatUmd<'source'>, keyof SourceOptionsBase<'source'>>
-        | Omit<OutputFormatGlobals<'source'>, keyof SourceOptionsBase<'source'>>
-        | Omit<OutputFormatBare<'source'>, keyof SourceOptionsBase<'source'>>
-      );
+type Options = Partial<BuildOptionsBase & OutputFormatAmdCommonjsEs<'source'>>;
 
 function peggyLoader(
   this: LoaderContext<Options>,
   grammarContent: string
 ): string {
+  const dependenciesKeyValue = this.resourceQuery
+    ? [...new URLSearchParams(this.resourceQuery).entries()]
+    : [];
+
+  const fromEntries = (entries: (readonly [string, string])[]) => {
+    const obj: Record<string, string> = {};
+    for (const [key, value] of entries) {
+      obj[key] = value;
+    }
+    return obj;
+  };
+
+  const { dependencies } = this.getOptions();
   const options: Options = {
     format: 'commonjs',
     ...this.getOptions(),
+    ...(dependenciesKeyValue.length && {
+      dependencies: { ...fromEntries(dependenciesKeyValue), ...dependencies },
+    }),
   };
 
   return peggy.generate(grammarContent, {

diff --git a/packages/peggy-loader/tsconfig.json b/packages/peggy-loader/tsconfig.json
@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "target": "es5",
+    "target": "es2015",
     "module": "ESNext",
     "declaration": true,
     "declarationMap": true,