Merge branch 'master' of github.com:ndelangen/corejs-upgrade-webpack-…

…plugin
ndelangen · Jun 20, 2019 · d9205ef · d9205ef
2 parents 1f0ebda + 8cb7afb
commit d9205ef
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/index.test.js b/src/index.test.js
@@ -40,12 +40,18 @@ describe('rewriteCoreJsRequest', () => {
  });
  });
 
- describe('rewrite `core-js/library/fn/*`', () => {
+ describe('rewrite `core-js/library/fn/*` and `core-js/fn/*`', () => {
  it('should rewrite `core-js/library/*` import to `core-js-pure/features/*`', () => {
  expect(rewriteCoreJsRequest('core-js/library/fn/object/assign')).toBe(
  'core-js-pure/features/object/assign'
  );
  });
+
+ it('should rewrite `core-js/fn/*` import to `core-js-pure/features/*`', () => {
+ expect(rewriteCoreJsRequest('core-js/fn/object/assign')).toBe(
+ 'core-js-pure/features/object/assign'
+ );
+ });
  });
 
  describe('rewrite `core-js/es(5|6|7)/*`', () => {

diff --git a/src/index.ts b/src/index.ts
@@ -34,8 +34,8 @@ export const rewriteCoreJsRequest = (originalRequest: string, lowerVersion = fal
  }
  }
 
- if (/core-js\/library\/fn\/(.*)/.test(originalRequest)) {
- const [,matchedPath] = originalRequest.match(/core-js\/library\/fn\/(.*)/);
+ if (/core-js(?:\/library)?\/fn\/(.*)/.test(originalRequest)) {
+ const [,matchedPath] = originalRequest.match(/core-js(?:\/library)?\/fn\/(.*)/);
 
  const path = rewriteRenamedModules(matchedPath);