nodejs
diff --git a/Collapse file
‎lib/internal/modules/esm/default_resolve.js‎
Copy file name to clipboardExpand all lines: lib/internal/modules/esm/default_resolve.js
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎lib/internal/modules/esm/default_resolve.js‎
Copy file name to clipboardExpand all lines: lib/internal/modules/esm/default_resolve.js
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎lib/internal/modules/esm/translators.js‎
Copy file name to clipboardExpand all lines: lib/internal/modules/esm/translators.js
+1-1Lines changed: 1 addition & 1 deletion b/Collapse file
‎lib/internal/modules/esm/translators.js‎
Copy file name to clipboardExpand all lines: lib/internal/modules/esm/translators.js
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/Collapse file
‎test/es-module/test-esm-data-urls.js‎
Copy file name to clipboardExpand all lines: test/es-module/test-esm-data-urls.js
+41Lines changed: 41 additions & 0 deletions b/Collapse file
‎test/es-module/test-esm-data-urls.js‎
Copy file name to clipboardExpand all lines: test/es-module/test-esm-data-urls.js
+41Lines changed: 41 additions & 0 deletions
@@ -53,7 +53,7 @@ function resolve(specifier, parentURL) {
   try {
     const parsed = new URL(specifier);
     if (parsed.protocol === 'data:') {
-      const [ , mime ] = /^([^/]+\/[^;,]+)(;base64)?,/.exec(parsed.pathname) || [ null, null, null ];
+      const [ , mime ] = /^([^/]+\/[^;,]+)(?:[^,]*?)(;base64)?,/.exec(parsed.pathname) || [ null, null, null ];
       const format = ({
         '__proto__': null,
         'text/javascript': 'module',
 
@@ -39,7 +39,7 @@ const debug = debuglog('esm');
 const translators = new SafeMap();
 exports.translators = translators;
 
-const DATA_URL_PATTERN = /^[^/]+\/[^,;]+(;base64)?,([\s\S]*)$/;
+const DATA_URL_PATTERN = /^[^/]+\/[^,;]+(?:[^,]*?)(;base64)?,([\s\S]*)$/;
 function getSource(url) {
   const parsed = new URL(url);
   if (parsed.protocol === 'file:') {
 
@@ -35,6 +35,47 @@ function createBase64URL(mime, body) {
     assert.deepStrictEqual(Object.keys(ns), ['default']);
     assert.deepStrictEqual(ns.default, plainESMURL);
   }
+  {
+    const body = 'export default import.meta.url;';
+    const plainESMURL = createURL('text/javascript;charset=UTF-8', body);
+    const ns = await import(plainESMURL);
+    assert.deepStrictEqual(Object.keys(ns), ['default']);
+    assert.deepStrictEqual(ns.default, plainESMURL);
+  }
+  {
+    const body = 'export default import.meta.url;';
+    const plainESMURL = createURL('text/javascript;charset="UTF-8"', body);
+    const ns = await import(plainESMURL);
+    assert.deepStrictEqual(Object.keys(ns), ['default']);
+    assert.deepStrictEqual(ns.default, plainESMURL);
+  }
+  {
+    const body = 'export default import.meta.url;';
+    const plainESMURL = createURL('text/javascript;;a=a;b=b;;', body);
+    const ns = await import(plainESMURL);
+    assert.deepStrictEqual(Object.keys(ns), ['default']);
+    assert.deepStrictEqual(ns.default, plainESMURL);
+  }
+  {
+    const ns = await import('data:application/json;foo="test,"this"');
+    assert.deepStrictEqual(Object.keys(ns), ['default']);
+    assert.deepStrictEqual(ns.default, 'this');
+  }
+  {
+    const ns = await import(`data:application/json;foo=${
+      encodeURIComponent('test,')
+    },0`);
+    assert.deepStrictEqual(Object.keys(ns), ['default']);
+    assert.deepStrictEqual(ns.default, 0);
+  }
+  {
+    await assert.rejects(async () => {
+      return import('data:application/json;foo="test,",0');
+    }, {
+      name: 'SyntaxError',
+      message: /Unexpected end of JSON input/
+    });
+  }
   {
     const body = '{"x": 1}';
     const plainESMURL = createURL('application/json', body);