@parcel/transformer-react-refresh-wrap 2.0.0-beta.1 → 2.0.0-nightly.1002

package/lib/ReactRefreshWrapTransformer.js

@@ -5,107 +5,71 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _semver = _interopRequireDefault(require("semver"));
+function _path() {
+  const data = _interopRequireDefault(require("path"));
 
-var _path = _interopRequireDefault(require("path"));
+  _path = function () {
+    return data;
+  };
 
-var _babelAstUtils = require("@parcel/babel-ast-utils");
-
-var _plugin = require("@parcel/plugin");
-
-var _utils = require("@parcel/utils");
-
-var _template = _interopRequireDefault(require("@babel/template"));
+  return data;
+}
 
-var t = _interopRequireWildcard(require("@babel/types"));
+function _plugin() {
+  const data = require("@parcel/plugin");
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+  _plugin = function () {
+    return data;
+  };
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+  return data;
+}
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const WRAPPER = _path.default.join(__dirname, 'helpers', 'helpers.js');
-
-const wrapper = _template.default.statements(`
-var helpers = require(%%helper%%);
-var prevRefreshReg = window.$RefreshReg$;
-var prevRefreshSig = window.$RefreshSig$;
-helpers.prelude(module);
-
-try {
-  %%module%%
-  helpers.postlude(module);
-} finally {
-  window.$RefreshReg$ = prevRefreshReg;
-  window.$RefreshSig$ = prevRefreshSig;
-}
-`);
-
 function shouldExclude(asset, options) {
-  return !asset.isSource || !options.hot || !asset.env.isBrowser() || options.mode !== 'development' || !asset.getDependencies().find(v => v.moduleSpecifier === 'react');
+  return !asset.isSource || !options.hmrOptions || !asset.env.isBrowser() || asset.env.isWorker() || asset.env.isWorklet() || options.mode !== 'development' || !asset.getDependencies().find(v => v.specifier === 'react' || v.specifier === 'react/jsx-runtime' || v.specifier === 'react/jsx-dev-runtime');
 }
 
-var _default = new _plugin.Transformer({
-  canReuseAST({
-    ast
-  }) {
-    return ast.type === 'babel' && _semver.default.satisfies(ast.version, '^7.0.0');
-  },
-
-  async parse({
-    asset,
-    options
-  }) {
-    if (shouldExclude(asset, options)) {
-      return null;
-    }
-
-    return (0, _babelAstUtils.parse)({
-      asset,
-      code: await asset.getCode(),
-      options
-    });
-  },
-
+var _default = new (_plugin().Transformer)({
   async transform({
     asset,
     options
   }) {
-    let ast = await asset.getAST();
-
-    if (!ast || shouldExclude(asset, options)) {
+    if (shouldExclude(asset, options)) {
       return [asset];
     }
 
-    let wrapperPath = (0, _utils.relativePath)(_path.default.dirname(asset.filePath), WRAPPER);
+    let wrapperPath = `@parcel/transformer-react-refresh-wrap/${_path().default.basename(__dirname)}/helpers/helpers.js`;
+    let code = await asset.getCode();
+    let map = await asset.getMap();
+    let name = `$parcel$ReactRefreshHelpers$${asset.id.slice(-4)}`;
+    code = `var ${name} = require(${JSON.stringify(wrapperPath)});
+var prevRefreshReg = window.$RefreshReg$;
+var prevRefreshSig = window.$RefreshSig$;
+${name}.prelude(module);
 
-    if (!wrapperPath.startsWith('.')) {
-      wrapperPath = './' + wrapperPath;
-    }
+try {
+${code}
+  ${name}.postlude(module);
+} finally {
+  window.$RefreshReg$ = prevRefreshReg;
+  window.$RefreshSig$ = prevRefreshSig;
+}`;
+    asset.setCode(code);
+
+    if (map) {
+      map.offsetLines(1, 6);
+      asset.setMap(map);
+    } // The JSTransformer has already run, do it manually
 
-    ast.program.program.body = wrapper({
-      helper: t.stringLiteral(wrapperPath),
-      module: ast.program.program.body
-    });
-    asset.setAST(ast); // The JSTransformer has already run, do it manually
 
     asset.addDependency({
-      moduleSpecifier: wrapperPath
+      specifier: wrapperPath,
+      specifierType: 'esm',
+      resolveFrom: __filename
     });
     return [asset];
-  },
-
-  generate({
-    asset,
-    ast,
-    options
-  }) {
-    return (0, _babelAstUtils.generate)({
-      asset,
-      ast,
-      options
-    });
   }
 
 });

package/lib/helpers/helpers.js

@@ -92,6 +92,7 @@ function isReactRefreshBoundary(exports) {
 
   var hasExports = false;
   var areAllExportsComponents = true;
+  let isESM = ('__esModule' in exports);
 
   for (var key in exports) {
     hasExports = true;
@@ -102,8 +103,8 @@ function isReactRefreshBoundary(exports) {
 
     var desc = Object.getOwnPropertyDescriptor(exports, key);
 
-    if (desc && desc.get) {
-      // Don't invoke getters as they may have side effects.
+    if (desc && desc.get && !isESM) {
+      // Don't invoke getters for CJS as they may have side effects.
       return false;
     }
 
@@ -145,6 +146,8 @@ function getRefreshBoundarySignature(exports) {
     return signature;
   }
 
+  let isESM = ('__esModule' in exports);
+
   for (var key in exports) {
     if (key === '__esModule') {
       continue;
@@ -152,7 +155,8 @@ function getRefreshBoundarySignature(exports) {
 
     var desc = Object.getOwnPropertyDescriptor(exports, key);
 
-    if (desc && desc.get) {
+    if (desc && desc.get && !isESM) {
+      // Don't invoke getters for CJS as they may have side effects.
       continue;
     }
 
@@ -175,11 +179,13 @@ function registerExportsForReactRefresh(module) {
     return;
   }
 
+  let isESM = ('__esModule' in exports);
+
   for (var key in exports) {
     var desc = Object.getOwnPropertyDescriptor(exports, key);
 
-    if (desc && desc.get) {
-      // Don't invoke getters as they may have side effects.
+    if (desc && desc.get && !isESM) {
+      // Don't invoke getters for CJS as they may have side effects.
       continue;
     }
 

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@parcel/transformer-react-refresh-wrap",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-nightly.1002+5530a6ef",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/parcel"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/parcel-bundler/parcel.git"
@@ -12,22 +16,13 @@
   "main": "lib/ReactRefreshWrapTransformer.js",
   "source": "src/ReactRefreshWrapTransformer.js",
   "engines": {
-    "node": ">= 10.0.0",
-    "parcel": "^2.0.0-alpha.1.1"
+    "node": ">= 12.0.0",
+    "parcel": "2.0.0-nightly.1000+5530a6ef"
   },
   "dependencies": {
-    "@babel/generator": "^7.0.0",
-    "@babel/parser": "^7.0.0",
-    "@babel/template": "^7.0.0",
-    "@babel/types": "^7.0.0",
-    "@parcel/babel-ast-utils": "2.0.0-beta.1",
-    "@parcel/plugin": "2.0.0-beta.1",
-    "@parcel/utils": "2.0.0-beta.1",
-    "react-refresh": "^0.6.0",
-    "semver": "^5.4.1"
-  },
-  "peerDependencies": {
-    "@parcel/core": "^2.0.0-alpha.3.1"
+    "@parcel/plugin": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/utils": "2.0.0-nightly.1002+5530a6ef",
+    "react-refresh": "^0.9.0"
   },
-  "gitHead": "74335525be92e23bac4ed1bf30595443cfb238e3"
+  "gitHead": "5530a6eff8b619873353baeb0457ae4ec591e9fa"
 }

package/src/ReactRefreshWrapTransformer.js

@@ -1,88 +1,67 @@
 // @flow
 
-import type {StringLiteral, Statement} from '@babel/types';
-
-import semver from 'semver';
 import path from 'path';
-import {generate, parse} from '@parcel/babel-ast-utils';
 import {Transformer} from '@parcel/plugin';
-import {relativePath} from '@parcel/utils';
-import template from '@babel/template';
-import * as t from '@babel/types';
-
-const WRAPPER = path.join(__dirname, 'helpers', 'helpers.js');
-
-const wrapper = template.statements<{|
-  helper: StringLiteral,
-  module: Array<Statement>,
-|}>(`
-var helpers = require(%%helper%%);
-var prevRefreshReg = window.$RefreshReg$;
-var prevRefreshSig = window.$RefreshSig$;
-helpers.prelude(module);
-
-try {
-  %%module%%
-  helpers.postlude(module);
-} finally {
-  window.$RefreshReg$ = prevRefreshReg;
-  window.$RefreshSig$ = prevRefreshSig;
-}
-`);
 
 function shouldExclude(asset, options) {
   return (
     !asset.isSource ||
-    !options.hot ||
+    !options.hmrOptions ||
     !asset.env.isBrowser() ||
+    asset.env.isWorker() ||
+    asset.env.isWorklet() ||
     options.mode !== 'development' ||
-    !asset.getDependencies().find(v => v.moduleSpecifier === 'react')
+    !asset
+      .getDependencies()
+      .find(
+        v =>
+          v.specifier === 'react' ||
+          v.specifier === 'react/jsx-runtime' ||
+          v.specifier === 'react/jsx-dev-runtime',
+      )
   );
 }
 
-export default new Transformer({
-  canReuseAST({ast}) {
-    return ast.type === 'babel' && semver.satisfies(ast.version, '^7.0.0');
-  },
-
-  async parse({asset, options}) {
+export default (new Transformer({
+  async transform({asset, options}) {
     if (shouldExclude(asset, options)) {
-      return null;
+      return [asset];
     }
 
-    return parse({
-      asset,
-      code: await asset.getCode(),
-      options,
-    });
-  },
+    let wrapperPath = `@parcel/transformer-react-refresh-wrap/${path.basename(
+      __dirname,
+    )}/helpers/helpers.js`;
 
-  async transform({asset, options}) {
-    let ast = await asset.getAST();
-    if (!ast || shouldExclude(asset, options)) {
-      return [asset];
-    }
+    let code = await asset.getCode();
+    let map = await asset.getMap();
+    let name = `$parcel$ReactRefreshHelpers$${asset.id.slice(-4)}`;
 
-    let wrapperPath = relativePath(path.dirname(asset.filePath), WRAPPER);
-    if (!wrapperPath.startsWith('.')) {
-      wrapperPath = './' + wrapperPath;
-    }
+    code = `var ${name} = require(${JSON.stringify(wrapperPath)});
+var prevRefreshReg = window.$RefreshReg$;
+var prevRefreshSig = window.$RefreshSig$;
+${name}.prelude(module);
 
-    ast.program.program.body = wrapper({
-      helper: t.stringLiteral(wrapperPath),
-      module: ast.program.program.body,
-    });
-    asset.setAST(ast);
+try {
+${code}
+  ${name}.postlude(module);
+} finally {
+  window.$RefreshReg$ = prevRefreshReg;
+  window.$RefreshSig$ = prevRefreshSig;
+}`;
+
+    asset.setCode(code);
+    if (map) {
+      map.offsetLines(1, 6);
+      asset.setMap(map);
+    }
 
     // The JSTransformer has already run, do it manually
     asset.addDependency({
-      moduleSpecifier: wrapperPath,
+      specifier: wrapperPath,
+      specifierType: 'esm',
+      resolveFrom: __filename,
     });
 
     return [asset];
   },
-
-  generate({asset, ast, options}) {
-    return generate({asset, ast, options});
-  },
-});
+}): Transformer);

package/src/helpers/helpers.js

@@ -2,21 +2,21 @@ var Refresh = require('react-refresh/runtime');
 
 function debounce(func, delay) {
   if (process.env.NODE_ENV === 'test') {
-    return function(args) {
+    return function (args) {
       func.call(null, args);
     };
   } else {
     var timeout = undefined;
-    return function(args) {
+    return function (args) {
       clearTimeout(timeout);
-      timeout = setTimeout(function() {
+      timeout = setTimeout(function () {
         timeout = undefined;
         func.call(null, args);
       }, delay);
     };
   }
 }
-var enqueueUpdate = debounce(function() {
+var enqueueUpdate = debounce(function () {
   Refresh.performReactRefresh();
 }, 30);
 
@@ -24,19 +24,19 @@ var enqueueUpdate = debounce(function() {
 // https://github.com/facebook/metro/blob/61de16bd1edd7e738dd0311c89555a644023ab2d/packages/metro/src/lib/polyfills/require.js
 // MIT License - Copyright (c) Facebook, Inc. and its affiliates.
 
-module.exports.prelude = function(module) {
-  window.$RefreshReg$ = function(type, id) {
+module.exports.prelude = function (module) {
+  window.$RefreshReg$ = function (type, id) {
     Refresh.register(type, module.id + ' ' + id);
   };
   window.$RefreshSig$ = Refresh.createSignatureFunctionForTransform;
 };
 
-module.exports.postlude = function(module) {
+module.exports.postlude = function (module) {
   if (isReactRefreshBoundary(module.exports)) {
     registerExportsForReactRefresh(module);
 
     if (module.hot) {
-      module.hot.dispose(function(data) {
+      module.hot.dispose(function (data) {
         if (Refresh.hasUnrecoverableErrors()) {
           window.location.reload();
         }
@@ -44,7 +44,7 @@ module.exports.postlude = function(module) {
         data.prevExports = module.exports;
       });
 
-      module.hot.accept(function(getParents) {
+      module.hot.accept(function (getParents) {
         var prevExports = module.hot.data.prevExports;
         var nextExports = module.exports;
         // Since we just executed the code for it, it's possible
@@ -88,14 +88,15 @@ function isReactRefreshBoundary(exports) {
   }
   var hasExports = false;
   var areAllExportsComponents = true;
+  let isESM = '__esModule' in exports;
   for (var key in exports) {
     hasExports = true;
     if (key === '__esModule') {
       continue;
     }
     var desc = Object.getOwnPropertyDescriptor(exports, key);
-    if (desc && desc.get) {
-      // Don't invoke getters as they may have side effects.
+    if (desc && desc.get && !isESM) {
+      // Don't invoke getters for CJS as they may have side effects.
       return false;
     }
     var exportValue = exports[key];
@@ -129,12 +130,14 @@ function getRefreshBoundarySignature(exports) {
     // (This is important for legacy environments.)
     return signature;
   }
+  let isESM = '__esModule' in exports;
   for (var key in exports) {
     if (key === '__esModule') {
       continue;
     }
     var desc = Object.getOwnPropertyDescriptor(exports, key);
-    if (desc && desc.get) {
+    if (desc && desc.get && !isESM) {
+      // Don't invoke getters for CJS as they may have side effects.
       continue;
     }
     var exportValue = exports[key];
@@ -153,10 +156,11 @@ function registerExportsForReactRefresh(module) {
     // (This is important for legacy environments.)
     return;
   }
+  let isESM = '__esModule' in exports;
   for (var key in exports) {
     var desc = Object.getOwnPropertyDescriptor(exports, key);
-    if (desc && desc.get) {
-      // Don't invoke getters as they may have side effects.
+    if (desc && desc.get && !isESM) {
+      // Don't invoke getters for CJS as they may have side effects.
       continue;
     }
     var exportValue = exports[key];