Merge branch 'release/2.3.3'

Author: DanielSchaffer

.yarn-offline-mirror/core-js-3.2.1.tgz

@@ -426,7 +426,7 @@ npm start angular-five typescript-plain
 Note that when running all example projects concurrently, you may need to increase
 Node's memory limit:
 ```
-NODE_OPTIONS="--max-old-space-size=8192" npm start
+NODE_OPTIONS="--max-old-space-size 8192" npm start
 ```
 
 Examples will be available at `http://HOST:PORT/examples/EXAMPLE_NAME`.

README.md

@@ -15,7 +15,7 @@
     "es6",
     "es7"
   ],
-  "version": "2.3.1",
+  "version": "2.3.3-next.3",
   "author": {
     "name": "Daniel Schaffer",
     "email": "[email protected]",
@@ -69,7 +69,7 @@
     "@babel/preset-env": "^7.3.1",
     "@babel/runtime": "^7.3.1",
     "babel-loader": "^8.0.5",
-    "core-js": "^3.2.1",
+    "core-js": "^2.6.3",
     "tapable": "^1.1.1",
     "webpack-merge": "^4.2.1",
     "webpack-sources": "^1.3.0"

package.json

@@ -2,12 +2,10 @@ import { BabelPresetOptions } from 'babel-loader'
 
 import { StandardTargetOptionsMap } from './babel.target.options'
 
-export const DEFAULT_COREJS_VERSION = 3
-
 export const DEFAULT_BABEL_PRESET_OPTIONS: BabelPresetOptions = {
   modules: false,
   useBuiltIns: 'usage',
-  corejs: DEFAULT_COREJS_VERSION,
+  corejs: 2,
 }
 
 export const DEFAULT_BABEL_PLUGINS: string[] = [

src/defaults.ts

@@ -361,6 +361,11 @@ export class TargetingPlugin implements Plugin {
       return true
     }
 
+    if (resolveContext.mode === 'sync' && !resolveContext.resourceResolveData) {
+      // Webpack require.context modules
+      return true
+    }
+
     const pkgRoot = resolveContext.resourceResolveData.descriptionFileRoot
     const pkg = resolveContext.resourceResolveData.descriptionFileData
 
@@ -382,7 +387,14 @@ export class TargetingPlugin implements Plugin {
         return false
       }
       if (typeof (pkg.browser === 'object') &&
-        Object.values(pkg.browser).find((entry: string) => resolveContext.resource === path.resolve(pkgRoot, entry))
+        Object.values(pkg.browser).find((entry: string | boolean) => {
+          if (typeof entry === 'string') {
+            return resolveContext.resource === path.resolve(pkgRoot, entry)
+          }
+          // "browser" object values can be `false` when packages want the browser to ignore a module
+          // see https://github.com/defunctzombie/package-browser-field-spec#ignore-a-module
+          return false
+        })
       ) {
         return false
       }

src/targeting.plugin.ts

@@ -1,22 +1,15 @@
 declare module 'babel-loader' {
   import { TransformOptions } from 'babel-core'
 
-  // eslint-disable-next-line no-magic-numbers
-  type CoreJsVersion = 2 | 3
-
   export interface BabelPresetOptions {
-    corejs?: CoreJsVersion | {
-      version: CoreJsVersion
-      proposals?: boolean
-      shippedProposals?: boolean
-    }
     spec?: boolean;
     loose?: boolean;
     modules?: 'amd' | 'umd' | 'systemjs' | 'commonjs' | false;
     debug?: boolean;
     include?: Array<string>;
     exclude?: Array<string>;
     useBuiltIns?: 'usage' | 'entry' | false;
+    corejs?: 2 | 3;
     forceAllTransforms?: boolean;
     configPath?: string;
     ignoreBrowserslistConfig?: boolean;

src/types/babel-loader.d.ts

@@ -2319,16 +2319,11 @@ core-js-compat@^3.1.1:
     browserslist "^4.6.6"
     semver "^6.3.0"
 
-core-js@^2.4.0:
+core-js@^2.4.0, core-js@^2.6.3:
   version "2.6.9"
   resolved "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2"
   integrity sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==
 
-core-js@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.2.1.tgz#cd41f38534da6cc59f7db050fe67307de9868b09"
-  integrity sha512-Qa5XSVefSVPRxy2XfUC13WbvqkxhkwB3ve+pgCQveNgYzbM/UxZeu1dcOX/xr4UmfUd+muuvsaxilQzCyUurMw==
-
 [email protected], core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"