@parcel/transformer-react-refresh-wrap 2.0.0-nightly.92 → 2.0.1

package/lib/ReactRefreshWrapTransformer.js

@@ -5,138 +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 _plugin = require("@parcel/plugin");
-
-var _utils = require("@parcel/utils");
-
-var _sourceMap = _interopRequireDefault(require("@parcel/source-map"));
-
-var _generator = _interopRequireDefault(require("@babel/generator"));
-
-var _parser = require("@babel/parser");
-
-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 = (0, _template.default)(`
-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');
 }
 
-var _default = new _plugin.Transformer({
-  canReuseAST({
-    ast
-  }) {
-    return ast.type === 'babel' && _semver.default.satisfies(ast.version, '^7.0.0');
-  },
-
-  async parse({
+var _default = new (_plugin().Transformer)({
+  async transform({
     asset,
     options
   }) {
     if (shouldExclude(asset, options)) {
-      return null;
+      return [asset];
     }
 
+    let wrapperPath = `@parcel/transformer-react-refresh-wrap/${_path().default.basename(__dirname)}/helpers/helpers.js`;
     let code = await asset.getCode();
-    return {
-      type: 'babel',
-      version: '7.0.0',
-      isDirty: false,
-      program: (0, _parser.parse)(code, {
-        filename: this.name,
-        allowReturnOutsideFunction: true,
-        strictMode: false,
-        sourceType: 'module',
-        plugins: ['exportDefaultFrom', 'exportNamespaceFrom', 'dynamicImport']
-      })
-    };
-  },
-
-  transform({
-    asset,
-    options
-  }) {
-    let ast = asset.ast;
+    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 (!ast || shouldExclude(asset, options)) {
-      return [asset];
-    }
+try {
+${code}
+  ${name}.postlude(module);
+} finally {
+  window.$RefreshReg$ = prevRefreshReg;
+  window.$RefreshSig$ = prevRefreshSig;
+}`;
+    asset.setCode(code);
 
-    let wrapperPath = _path.default.relative(_path.default.dirname(asset.filePath), WRAPPER).replace(/\\/g, '/');
+    if (map) {
+      map.offsetLines(1, 6);
+      asset.setMap(map);
+    } // The JSTransformer has already run, do it manually
 
-    if (!wrapperPath.startsWith('.')) {
-      wrapperPath = './' + wrapperPath;
-    }
-
-    ast.program.program.body = wrapper({
-      helper: t.stringLiteral(wrapperPath),
-      module: ast.program.program.body
-    });
-    ast.isDirty = true; // The JSTransformer has already run, do it manually
 
     asset.addDependency({
-      moduleSpecifier: wrapperPath
+      specifier: wrapperPath,
+      specifierType: 'esm',
+      resolveFrom: __filename
     });
     return [asset];
-  },
-
-  async generate({
-    asset,
-    options
-  }) {
-    let code = await asset.getCode();
-    let res = {
-      code
-    };
-    let ast = asset.ast;
-
-    if (ast && ast.isDirty !== false) {
-      let sourceFileName = (0, _utils.relativeUrl)(options.projectRoot, asset.filePath);
-      let generated = (0, _generator.default)(ast.program, {
-        sourceMaps: options.sourceMaps,
-        sourceFileName: sourceFileName
-      }, code);
-      res.code = generated.code; // $FlowFixMe...
-
-      res.map = new _sourceMap.default(generated.rawMappings, {
-        [sourceFileName]: null
-      });
-    }
-
-    if (asset.meta.globals && asset.meta.globals.size > 0) {
-      res.code = Array.from(asset.meta.globals.values()).map(g => g ? g.code : '').join('\n') + '\n' + res.code;
-    }
-
-    delete asset.meta.globals;
-    return res;
   }
 
 });

package/lib/helpers/helpers.js

@@ -36,43 +36,46 @@ module.exports.prelude = function (module) {
 module.exports.postlude = function (module) {
   if (isReactRefreshBoundary(module.exports)) {
     registerExportsForReactRefresh(module);
-    module.hot.dispose(function (data) {
-      data.prevExports = module.exports;
-    });
-    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
-      // that the new exports make it ineligible for being a boundary.
-
-      var isNoLongerABoundary = !isReactRefreshBoundary(nextExports); // It can also become ineligible if its exports are incompatible
-      // with the previous exports.
-      // For example, if you add/remove/change exports, we'll want
-      // to re-execute the importing modules, and force those components
-      // to re-render. Similarly, if you convert a class component
-      // to a function, we want to invalidate the boundary.
-
-      var didInvalidate = shouldInvalidateReactRefreshBoundary(prevExports, nextExports);
-
-      if (isNoLongerABoundary || didInvalidate) {
-        // We'll be conservative. The only case in which we won't do a full
-        // reload is if all parent modules are also refresh boundaries.
-        // In that case we'll add them to the current queue.
-        var parents = getParents();
-
-        if (parents.length === 0) {
-          // Looks like we bubbled to the root. Can't recover from that.
+
+    if (module.hot) {
+      module.hot.dispose(function (data) {
+        if (Refresh.hasUnrecoverableErrors()) {
           window.location.reload();
-          return;
         }
 
-        return parents;
-      }
-
-      enqueueUpdate();
-    });
+        data.prevExports = module.exports;
+      });
+      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
+        // that the new exports make it ineligible for being a boundary.
+
+        var isNoLongerABoundary = !isReactRefreshBoundary(nextExports); // It can also become ineligible if its exports are incompatible
+        // with the previous exports.
+        // For example, if you add/remove/change exports, we'll want
+        // to re-execute the importing modules, and force those components
+        // to re-render. Similarly, if you convert a class component
+        // to a function, we want to invalidate the boundary.
+
+        var didInvalidate = shouldInvalidateReactRefreshBoundary(prevExports, nextExports);
+
+        if (isNoLongerABoundary || didInvalidate) {
+          // We'll be conservative. The only case in which we won't do a full
+          // reload is if all parent modules are also refresh boundaries.
+          // In that case we'll add them to the current queue.
+          var parents = getParents();
+
+          if (parents.length === 0) {
+            // Looks like we bubbled to the root. Can't recover from that.
+            window.location.reload();
+            return;
+          }
+
+          return parents;
+        }
 
-    if (Refresh.hasUnrecoverableErrors()) {
-      window.location.reload();
+        enqueueUpdate();
+      });
     }
   }
 };
@@ -89,6 +92,7 @@ function isReactRefreshBoundary(exports) {
 
   var hasExports = false;
   var areAllExportsComponents = true;
+  let isESM = ('__esModule' in exports);
 
   for (var key in exports) {
     hasExports = true;
@@ -99,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;
     }
 
@@ -142,6 +146,8 @@ function getRefreshBoundarySignature(exports) {
     return signature;
   }
 
+  let isESM = ('__esModule' in exports);
+
   for (var key in exports) {
     if (key === '__esModule') {
       continue;
@@ -149,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;
     }
 
@@ -172,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-nightly.92+c0655c56",
+  "version": "2.0.1",
   "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,19 +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.1"
   },
   "dependencies": {
-    "@babel/generator": "^7.0.0",
-    "@babel/parser": "^7.0.0",
-    "@babel/template": "^7.0.0",
-    "@babel/types": "^7.0.0",
-    "@parcel/plugin": "2.0.0-nightly.92+c0655c56",
-    "@parcel/source-map": "2.0.0-nightly.92+c0655c56",
-    "@parcel/utils": "2.0.0-nightly.92+c0655c56",
-    "react-refresh": "^0.6.0",
-    "semver": "^5.4.1"
+    "@parcel/plugin": "^2.0.1",
+    "@parcel/utils": "^2.0.1",
+    "react-refresh": "^0.9.0"
   },
-  "gitHead": "c0655c56f7973492fdb28671029ddd923f17a244"
+  "gitHead": "28b47e6bdca7de2a06b7cc39a4a0b1df89f3fe15"
 }

package/src/ReactRefreshWrapTransformer.js

@@ -1,133 +1,62 @@
 // @flow
 
-import semver from 'semver';
 import path from 'path';
 import {Transformer} from '@parcel/plugin';
-import {relativeUrl} from '@parcel/utils';
-import SourceMap from '@parcel/source-map';
-import generate from '@babel/generator';
-import {parse} from '@babel/parser';
-import template from '@babel/template';
-import * as t from '@babel/types';
-
-const WRAPPER = path.join(__dirname, 'helpers', 'helpers.js');
-
-const wrapper = template(`
-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')
   );
 }
 
-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];
     }
 
+    let wrapperPath = `@parcel/transformer-react-refresh-wrap/${path.basename(
+      __dirname,
+    )}/helpers/helpers.js`;
+
     let code = await asset.getCode();
-    return {
-      type: 'babel',
-      version: '7.0.0',
-      isDirty: false,
-      program: parse(code, {
-        filename: this.name,
-        allowReturnOutsideFunction: true,
-        strictMode: false,
-        sourceType: 'module',
-        plugins: ['exportDefaultFrom', 'exportNamespaceFrom', 'dynamicImport'],
-      }),
-    };
-  },
+    let map = await asset.getMap();
+    let name = `$parcel$ReactRefreshHelpers$${asset.id.slice(-4)}`;
 
-  transform({asset, options}) {
-    let ast = asset.ast;
-    if (!ast || shouldExclude(asset, options)) {
-      return [asset];
-    }
+    code = `var ${name} = require(${JSON.stringify(wrapperPath)});
+var prevRefreshReg = window.$RefreshReg$;
+var prevRefreshSig = window.$RefreshSig$;
+${name}.prelude(module);
 
-    let wrapperPath = path
-      .relative(path.dirname(asset.filePath), WRAPPER)
-      .replace(/\\/g, '/');
-    if (!wrapperPath.startsWith('.')) {
-      wrapperPath = './' + wrapperPath;
-    }
+try {
+${code}
+  ${name}.postlude(module);
+} finally {
+  window.$RefreshReg$ = prevRefreshReg;
+  window.$RefreshSig$ = prevRefreshSig;
+}`;
 
-    ast.program.program.body = wrapper({
-      helper: t.stringLiteral(wrapperPath),
-      module: ast.program.program.body,
-    });
-    ast.isDirty = true;
+    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];
   },
-
-  async generate({asset, options}) {
-    let code = await asset.getCode();
-    let res = {
-      code,
-    };
-
-    let ast = asset.ast;
-    if (ast && ast.isDirty !== false) {
-      let sourceFileName: string = relativeUrl(
-        options.projectRoot,
-        asset.filePath,
-      );
-
-      let generated = generate(
-        ast.program,
-        {
-          sourceMaps: options.sourceMaps,
-          sourceFileName: sourceFileName,
-        },
-        code,
-      );
-
-      res.code = generated.code;
-      // $FlowFixMe...
-      res.map = new SourceMap(generated.rawMappings, {
-        [sourceFileName]: null,
-      });
-    }
-
-    if (asset.meta.globals && asset.meta.globals.size > 0) {
-      res.code =
-        Array.from(asset.meta.globals.values())
-          .map(g => (g ? g.code : ''))
-          .join('\n') +
-        '\n' +
-        res.code;
-    }
-    delete asset.meta.globals;
-
-    return res;
-  },
-});
+}): 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,53 +24,56 @@ 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);
 
-    module.hot.dispose(function(data) {
-      data.prevExports = module.exports;
-    });
-
-    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
-      // that the new exports make it ineligible for being a boundary.
-      var isNoLongerABoundary = !isReactRefreshBoundary(nextExports);
-      // It can also become ineligible if its exports are incompatible
-      // with the previous exports.
-      // For example, if you add/remove/change exports, we'll want
-      // to re-execute the importing modules, and force those components
-      // to re-render. Similarly, if you convert a class component
-      // to a function, we want to invalidate the boundary.
-      var didInvalidate = shouldInvalidateReactRefreshBoundary(
-        prevExports,
-        nextExports,
-      );
-      if (isNoLongerABoundary || didInvalidate) {
-        // We'll be conservative. The only case in which we won't do a full
-        // reload is if all parent modules are also refresh boundaries.
-        // In that case we'll add them to the current queue.
-        var parents = getParents();
-        if (parents.length === 0) {
-          // Looks like we bubbled to the root. Can't recover from that.
+    if (module.hot) {
+      module.hot.dispose(function (data) {
+        if (Refresh.hasUnrecoverableErrors()) {
           window.location.reload();
-          return;
         }
-        return parents;
-      }
-      enqueueUpdate();
-    });
-    if (Refresh.hasUnrecoverableErrors()) {
-      window.location.reload();
+
+        data.prevExports = module.exports;
+      });
+
+      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
+        // that the new exports make it ineligible for being a boundary.
+        var isNoLongerABoundary = !isReactRefreshBoundary(nextExports);
+        // It can also become ineligible if its exports are incompatible
+        // with the previous exports.
+        // For example, if you add/remove/change exports, we'll want
+        // to re-execute the importing modules, and force those components
+        // to re-render. Similarly, if you convert a class component
+        // to a function, we want to invalidate the boundary.
+        var didInvalidate = shouldInvalidateReactRefreshBoundary(
+          prevExports,
+          nextExports,
+        );
+        if (isNoLongerABoundary || didInvalidate) {
+          // We'll be conservative. The only case in which we won't do a full
+          // reload is if all parent modules are also refresh boundaries.
+          // In that case we'll add them to the current queue.
+          var parents = getParents();
+          if (parents.length === 0) {
+            // Looks like we bubbled to the root. Can't recover from that.
+            window.location.reload();
+            return;
+          }
+          return parents;
+        }
+        enqueueUpdate();
+      });
     }
   }
 };
@@ -85,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];
@@ -126,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];
@@ -150,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];