Merge pull request #4 from morganney/develop

fix: ignore imports inside strings better

Author: morganney

README.md

@@ -34,7 +34,7 @@ If you must have a multiline comment then this style is ok (only one `import()`
  */
 ```
 
-This module uses a [RegExp](https://github.com/morganney/magic-comments-loader/blob/master/src/loader.js#L8) not a parser. If you would like to add better support for ignoring `import()` behind multiline comments please open a pull request. See some more [examples on regexr](https://regexr.com/65fg0).
+This module uses a RegExp not a parser. If you would like to add better support for ignoring `import()` behind multiline comments please open a pull request. See some more [examples on regexr](https://regexr.com/65fg0).
 
 ### Configuration
 

__tests__/util.js

@@ -1,4 +1,33 @@
-import { pathIsMatch, getOverrideConfig } from '../src/util.js'
+import {
+  pathIsMatch,
+  getOverrideConfig,
+  dynamicImportsWithoutComments
+} from '../src/util.js'
+
+describe('dynamicImportsWithoutComments', () => {
+  it('is a regex to match dyanmic imports', () => {
+    expect(
+      `const str = 'import("some/path")'`.replace(dynamicImportsWithoutComments, 'test')
+    ).toEqual(`const str = 'import("some/path")'`)
+    expect('import("some/path")'.replace(dynamicImportsWithoutComments, 'test')).toEqual(
+      'test'
+    )
+    expect(
+      `import(
+      "some/path"
+    )`.replace(dynamicImportsWithoutComments, 'test')
+    ).toEqual('test')
+    expect(
+      `import(/* with comments */ "some/path")`.replace(
+        dynamicImportsWithoutComments,
+        'test'
+      )
+    ).toEqual(`import(/* with comments */ "some/path")`)
+    expect(
+      `console.log('import("some/path")')`.replace(dynamicImportsWithoutComments, 'test')
+    ).toEqual(`console.log('import("some/path")')`)
+  })
+})
 
 describe('pathIsMatch', () => {
   it('compares a filepath to glob patterns', () => {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "magic-comments-loader",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Add webpack magic comments to your dynamic imports during build time",
   "main": "dist",
   "type": "module",

package.json

@@ -3,9 +3,8 @@ import { validate } from 'schema-utils'
 
 import { schema } from './schema.js'
 import { getCommenter } from './comment.js'
+import { dynamicImportsWithoutComments } from './util.js'
 
-const dynamicImportsWithoutComments =
-  /(?<![\w.]|#!|\*[\s\w]*?|\/\/\s*)import\s*\((?!\s*\/\*)(?<path>\s*?['"`][^)]+['"`]\s*)\)(?![\s]*?\*\/)/g
 const loader = function (source, map, meta) {
   const options = getOptions(this)
   const optionKeys = Object.keys(options)

src/loader.js

@@ -56,5 +56,13 @@ const getOverrideConfig = (overrides, filepath, config) => {
   return config
 }
 const importPrefix = /^(?:(\.{1,2}\/)+)|^\/|^.+:\/\/\/?[.-\w]+\//
+const dynamicImportsWithoutComments =
+  /(?<![\w.]|#!|\*[\s\w]*?|\/\/\s*|['"`][^)$]*)import\s*\((?!\s*\/\*)(?<path>\s*?['"`][^)]+['"`]\s*)\)(?!\s*?\*\/)/g
 
-export { getOverrideConfig, getOverrideSchema, pathIsMatch, importPrefix }
+export {
+  getOverrideConfig,
+  getOverrideSchema,
+  pathIsMatch,
+  importPrefix,
+  dynamicImportsWithoutComments
+}