@atlaspack/optimizer-inline-requires 2.12.1-dev.3566 → 2.13.0

package/CHANGELOG.md

@@ -0,0 +1,15 @@
+# @atlaspack/optimizer-inline-requires
+
+## 2.13.0
+
+### Minor Changes
+
+- [#335](https://github.com/atlassian-labs/atlaspack/pull/335) [`b4dbd4d`](https://github.com/atlassian-labs/atlaspack/commit/b4dbd4d5b23d1b7aa3fcdf59cc7bc8bedd3a59cf) Thanks [@yamadapc](https://github.com/yamadapc)! - Initial changeset release
+
+### Patch Changes
+
+- Updated dependencies [[`b4dbd4d`](https://github.com/atlassian-labs/atlaspack/commit/b4dbd4d5b23d1b7aa3fcdf59cc7bc8bedd3a59cf)]:
+  - @atlaspack/feature-flags@2.13.0
+  - @atlaspack/plugin@2.13.0
+  - @atlaspack/rust@2.13.0
+  - @atlaspack/types@2.13.0

package/lib/InlineRequires.js

@@ -7,13 +7,6 @@ function _plugin() {
   };
   return data;
 }
-function _featureFlags() {
-  const data = require("@atlaspack/feature-flags");
-  _featureFlags = function () {
-    return data;
-  };
-  return data;
-}
 function _rust() {
   const data = require("@atlaspack/rust");
   _rust = function () {
@@ -21,14 +14,6 @@ function _rust() {
   };
   return data;
 }
-function _core() {
-  const data = require("@swc/core");
-  _core = function () {
-    return data;
-  };
-  return data;
-}
-var _RequireInliningVisitor = require("./RequireInliningVisitor");
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
   _nullthrows = function () {
@@ -76,11 +61,10 @@ module.exports = new (_plugin().Optimizer)({
       assetPublicIdsWithSideEffects
     };
   },
-  async optimize({
+  optimize({
     bundle,
     contents,
     map: originalMap,
-    tracer,
     logger,
     bundleConfig,
     options
@@ -92,58 +76,24 @@ module.exports = new (_plugin().Optimizer)({
       };
     }
     try {
-      if ((0, _featureFlags().getFeatureFlag)('fastOptimizeInlineRequires')) {
-        let sourceMap = null;
-        const result = (0, _rust().runInlineRequiresOptimizer)({
-          code: contents.toString(),
-          sourceMaps: !!bundle.env.sourceMap,
-          ignoreModuleIds: Array.from(bundleConfig.assetPublicIdsWithSideEffects)
-        });
-        const sourceMapResult = result.sourceMap;
-        if (sourceMapResult != null) {
-          sourceMap = new (_sourceMap().default)(options.projectRoot);
-          sourceMap.addVLQMap(JSON.parse(sourceMapResult));
-          if (originalMap) {
-            sourceMap.extends(originalMap);
-          }
-        }
-        return {
-          contents: result.code,
-          map: originalMap
-        };
-      }
-      let measurement = tracer.createMeasurement('@atlaspack/optimizer-inline-requires', 'parse', bundle.name);
-      const ast = await (0, _core().parse)(contents.toString());
-      measurement && measurement.end();
-      const visitor = new _RequireInliningVisitor.RequireInliningVisitor({
-        bundle,
-        logger,
-        assetPublicIdsWithSideEffects: bundleConfig.assetPublicIdsWithSideEffects
+      let sourceMap = null;
+      const result = (0, _rust().runInlineRequiresOptimizer)({
+        code: contents.toString(),
+        sourceMaps: !!bundle.env.sourceMap,
+        ignoreModuleIds: Array.from(bundleConfig.assetPublicIdsWithSideEffects)
       });
-      measurement = tracer.createMeasurement('@atlaspack/optimizer-inline-requires', 'visit', bundle.name);
-      visitor.visitProgram(ast);
-      measurement && measurement.end();
-      if (visitor.dirty) {
-        const measurement = tracer.createMeasurement('@atlaspack/optimizer-inline-requires', 'print', bundle.name);
-        const result = await (0, _core().print)(ast, {
-          sourceMaps: !!bundle.env.sourceMap
-        });
-        measurement && measurement.end();
-        let sourceMap = null;
-        let resultMap = result.map;
-        let contents = (0, _nullthrows().default)(result.code);
-        if (resultMap != null) {
-          sourceMap = new (_sourceMap().default)(options.projectRoot);
-          sourceMap.addVLQMap(JSON.parse(resultMap));
-          if (originalMap) {
-            sourceMap.extends(originalMap);
-          }
+      const sourceMapResult = result.sourceMap;
+      if (sourceMapResult != null) {
+        sourceMap = new (_sourceMap().default)(options.projectRoot);
+        sourceMap.addVLQMap(JSON.parse(sourceMapResult));
+        if (originalMap) {
+          sourceMap.extends(originalMap);
         }
-        return {
-          contents,
-          map: sourceMap
-        };
       }
+      return {
+        contents: result.code,
+        map: sourceMap
+      };
     } catch (err) {
       logger.warn({
         origin: 'atlaspack-optimizer-experimental-inline-requires',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/optimizer-inline-requires",
-  "version": "2.12.1-dev.3566+facdfb05f",
+  "version": "2.13.0",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -12,17 +12,16 @@
   "main": "lib/InlineRequires.js",
   "source": "src/InlineRequires.js",
   "engines": {
-    "atlaspack": "^2.12.1-dev.3566+facdfb05f",
+    "atlaspack": "^2.12.0",
     "node": ">= 14.0.0"
   },
   "dependencies": {
-    "@atlaspack/feature-flags": "2.12.1-dev.3566+facdfb05f",
-    "@atlaspack/plugin": "2.12.1-dev.3566+facdfb05f",
-    "@atlaspack/rust": "2.12.1-dev.3566+facdfb05f",
-    "@atlaspack/types": "2.12.1-dev.3566+facdfb05f",
+    "@atlaspack/feature-flags": "2.13.0",
+    "@atlaspack/plugin": "2.13.0",
+    "@atlaspack/rust": "^2.13.0",
     "@parcel/source-map": "^2.1.1",
-    "@swc/core": "^1.7.26",
+    "@atlaspack/types": "2.13.0",
+    "@swc/core": "^1.10.0",
     "nullthrows": "^1.1.1"
-  },
-  "gitHead": "facdfb05f693e50037a82a4afa101adf093fd8c9"
+  }
 }

package/src/InlineRequires.js

@@ -1,9 +1,6 @@
 // @flow strict-local
 import {Optimizer} from '@atlaspack/plugin';
-import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {runInlineRequiresOptimizer} from '@atlaspack/rust';
-import {parse, print} from '@swc/core';
-import {RequireInliningVisitor} from './RequireInliningVisitor';
 import nullthrows from 'nullthrows';
 import SourceMap from '@parcel/source-map';
 
@@ -45,11 +42,10 @@ module.exports = new Optimizer<empty, BundleConfig>({
     return {assetPublicIdsWithSideEffects};
   },
 
-  async optimize({
+  optimize({
     bundle,
     contents,
     map: originalMap,
-    tracer,
     logger,
     bundleConfig,
     options,
@@ -59,72 +55,21 @@ module.exports = new Optimizer<empty, BundleConfig>({
     }
 
     try {
-      if (getFeatureFlag('fastOptimizeInlineRequires')) {
-        let sourceMap = null;
-        const result = runInlineRequiresOptimizer({
-          code: contents.toString(),
-          sourceMaps: !!bundle.env.sourceMap,
-          ignoreModuleIds: Array.from(
-            bundleConfig.assetPublicIdsWithSideEffects,
-          ),
-        });
-        const sourceMapResult = result.sourceMap;
-        if (sourceMapResult != null) {
-          sourceMap = new SourceMap(options.projectRoot);
-          sourceMap.addVLQMap(JSON.parse(sourceMapResult));
-          if (originalMap) {
-            sourceMap.extends(originalMap);
-          }
-        }
-        return {contents: result.code, map: originalMap};
-      }
-
-      let measurement = tracer.createMeasurement(
-        '@atlaspack/optimizer-inline-requires',
-        'parse',
-        bundle.name,
-      );
-      const ast = await parse(contents.toString());
-      measurement && measurement.end();
-
-      const visitor = new RequireInliningVisitor({
-        bundle,
-        logger,
-        assetPublicIdsWithSideEffects:
-          bundleConfig.assetPublicIdsWithSideEffects,
+      let sourceMap = null;
+      const result = runInlineRequiresOptimizer({
+        code: contents.toString(),
+        sourceMaps: !!bundle.env.sourceMap,
+        ignoreModuleIds: Array.from(bundleConfig.assetPublicIdsWithSideEffects),
       });
-
-      measurement = tracer.createMeasurement(
-        '@atlaspack/optimizer-inline-requires',
-        'visit',
-        bundle.name,
-      );
-      visitor.visitProgram(ast);
-      measurement && measurement.end();
-
-      if (visitor.dirty) {
-        const measurement = tracer.createMeasurement(
-          '@atlaspack/optimizer-inline-requires',
-          'print',
-          bundle.name,
-        );
-        const result = await print(ast, {sourceMaps: !!bundle.env.sourceMap});
-        measurement && measurement.end();
-
-        let sourceMap = null;
-        let resultMap = result.map;
-        let contents: string = nullthrows(result.code);
-
-        if (resultMap != null) {
-          sourceMap = new SourceMap(options.projectRoot);
-          sourceMap.addVLQMap(JSON.parse(resultMap));
-          if (originalMap) {
-            sourceMap.extends(originalMap);
-          }
+      const sourceMapResult = result.sourceMap;
+      if (sourceMapResult != null) {
+        sourceMap = new SourceMap(options.projectRoot);
+        sourceMap.addVLQMap(JSON.parse(sourceMapResult));
+        if (originalMap) {
+          sourceMap.extends(originalMap);
         }
-
-        return {contents, map: sourceMap};
       }
+      return {contents: result.code, map: sourceMap};
     } catch (err) {
       logger.warn({
         origin: 'atlaspack-optimizer-experimental-inline-requires',

package/LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright (c) 2024 Atlassian US., Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

package/lib/RequireInliningVisitor.js

@@ -1,194 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.RequireInliningVisitor = void 0;
-function _Visitor() {
-  const data = require("@swc/core/Visitor");
-  _Visitor = function () {
-    return data;
-  };
-  return data;
-}
-function _nullthrows() {
-  const data = _interopRequireDefault(require("nullthrows"));
-  _nullthrows = function () {
-    return data;
-  };
-  return data;
-}
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-class RequireInliningVisitor extends _Visitor().Visitor {
-  constructor({
-    bundle,
-    logger,
-    assetPublicIdsWithSideEffects
-  }) {
-    super();
-    this.currentModuleNode = null;
-    this.moduleVariables = new Set();
-    this.moduleVariableMap = new Map();
-    this.dirty = false;
-    this.logger = logger;
-    this.bundle = bundle;
-    this.assetPublicIdsWithSideEffects = assetPublicIdsWithSideEffects;
-  }
-  visitFunctionExpression(n) {
-    // This visitor tries to find module definition functions, these are of the form:
-    //
-    // parcelRequire.register("moduleId", function (require, module, exports) { ... });
-    //
-    // We do this to set the vistior variable `inModuleDefinition` for subsequent visits,
-    // and also reset the module variable tracking data structures.
-    //
-    // (TODO: Support arrow functions if we modify the runtime to output arrow functions)
-    if (n.params.length === 3 && n.params[0].pat.type === 'Identifier' && n.params[0].pat.value === 'require' && n.params[1].pat.type === 'Identifier' && n.params[1].pat.value === 'module' && n.params[2].pat.type === 'Identifier' && n.params[2].pat.value === 'exports') {
-      // `inModuleDefinition` is either null, or the module definition node
-      this.currentModuleNode = n;
-      this.moduleVariables = new Set();
-      this.moduleVariableMap = new Map();
-    }
-
-    // Make sure we visit the function itself
-    let result = super.visitFunctionExpression(n);
-
-    // only "exit" module definition if we're exiting the module definition node
-    if (n === this.currentModuleNode) {
-      this.currentModuleNode = null;
-    }
-    return result;
-  }
-  visitVariableDeclaration(n) {
-    // We're looking for variable declarations that look like this:
-    //
-    // `var $acw62 = require("acw62");`
-    let needsReplacement = false;
-    for (let i = 0; i < n.declarations.length; i++) {
-      let decl = n.declarations[i];
-      const init = decl.init;
-      if (!init || init.type !== 'CallExpression') {
-        continue;
-      }
-      if ((init.callee.type === 'Identifier' && init.callee.value === 'require' || init.callee.value === 'parcelRequire') && decl.id.value !== 'parcelHelpers' &&
-      // ignore var parcelHelpers = require("@atlaspack/transformer-js/src/esmodule-helpers.js");
-      init.arguments[0].expression.type === 'StringLiteral' && typeof decl.id.value === 'string' && decl.id.value.startsWith('$')) {
-        const variable = decl.id.value;
-        const assetPublicId = variable.substring(1);
-
-        // We need to determine whether the asset we're require'ing has sideEffects - if it does, we
-        // shouldn't optimise it to an inline require as the side effects need to run immediately
-        //
-        // We need to use the public id of the asset (which is the variable name used for requiring it) in
-        // order to find the asset in the bundle graph, and check whether `asset.sideEffects` is true - in
-        // which case we skip optimising this asset.
-        //
-        // This won't work in dev mode, because the id used to require the asset isn't the public id
-        if (this.assetPublicIdsWithSideEffects && this.assetPublicIdsWithSideEffects.has(assetPublicId)) {
-          continue;
-        }
-
-        // The moduleVariableMap contains a mapping from (e.g. $acw62 -> the AST node `require("acw62")`)
-        this.moduleVariableMap.set(variable, init);
-        // The moduleVariables set is just the used set of modules (e.g. `$acw62`)
-        this.moduleVariables.add(variable);
-
-        // Replace this with a null declarator, we'll use the `init` where it's declared.
-        //
-        // This mutates `var $acw62 = require("acw62")` -> `var $acw62 = null`
-        //
-        // The variable will be unused and removed by optimisation
-        decl.init = undefined;
-        needsReplacement = true;
-      } else if (decl.id.type === 'Identifier' && typeof decl.id.value === 'string' && decl.id.value.endsWith('Default') && decl.id.value.startsWith('$')) {
-        // Handle modules with default values, these look like this in the source:
-        // ```
-        // var _app = require("./App");
-        // var _appDefault = parcelHelpers.interopDefault(_app);
-        // ```
-        //
-        // In this case we want to also put `_appDefault` into the `moduleVariableMap` with the initializer node,
-        // but we want to replace `_app` in there with `require("./App")`.. to summarise, this code will end up looking like:
-        //
-        // ```
-        // var _app = null;
-        // var _appDefault = null;
-        // ```
-        //
-        // .. and where `_appDefault` is used we replace that with `parcelHelpers.interopDefault(require('./App'))`
-        const variable = decl.id.value;
-        const baseId = variable.substring(0, decl.id.value.length - 'Default'.length);
-        if (!this.moduleVariables.has(baseId)) {
-          continue;
-        }
-        init.arguments[0] = {
-          spread: undefined,
-          expression: (0, _nullthrows().default)(this.moduleVariableMap.get(baseId))
-        };
-        this.moduleVariableMap.set(variable, init);
-        this.moduleVariables.add(variable);
-        decl.init = undefined;
-        needsReplacement = true;
-      }
-    }
-    if (!needsReplacement) {
-      return super.visitVariableDeclaration(n);
-    } else {
-      this.dirty = true;
-      return n;
-    }
-  }
-  visitIdentifier(n) {
-    // This does the actual replacement - for any identifier within this factory function
-    // that is in the `moduleVariables` list, replace the identifier with the original expression
-    // that was going to be used to initialise the identifier.
-    //
-    // The replacement expression uses the `(0, require(...))` pattern to allow for safe replacement
-    // in any use cases (since we're replacing a variable access with a function call) - the minifier
-    // will take care of optimising this away where possible.
-    //
-    // e.g.
-    // var $abc = require("abc");
-    // console.log($abc.foo());
-    //
-    // becomes
-    //
-    // var $abc;
-    // console.log((0, require("abc")).foo);
-    //
-    if (this.moduleVariables.has(n.value)) {
-      // $FlowFixMe the types don't allow for swapping out the node type here, might need a different approach
-      return this.getReplacementExpression(n.value);
-    }
-    return super.visitIdentifier(n);
-  }
-
-  // Helper function to wrap an existing node in a sequence expression, that is, it
-  // will take a node `n` and return the AST for `(0, n)`
-  //
-  // This ensures that the require call can be correctly used in any context - where
-  // the sequence is redundant, the minifier will optimise it away.
-  getReplacementExpression(id) {
-    return {
-      type: 'ParenthesisExpression',
-      span: RequireInliningVisitor.getEmptySpan(),
-      expression: {
-        type: 'SequenceExpression',
-        span: RequireInliningVisitor.getEmptySpan(),
-        expressions: [{
-          type: 'NumericLiteral',
-          span: RequireInliningVisitor.getEmptySpan(),
-          value: 0
-        }, (0, _nullthrows().default)(this.moduleVariableMap.get(id))]
-      }
-    };
-  }
-  static getEmptySpan() {
-    return {
-      start: 0,
-      end: 0,
-      ctxt: 0
-    };
-  }
-}
-exports.RequireInliningVisitor = RequireInliningVisitor;

package/src/RequireInliningVisitor.js

@@ -1,226 +0,0 @@
-// @flow strict-local
-import type {NamedBundle, PluginLogger} from '@atlaspack/types';
-
-import type {
-  CallExpression,
-  VariableDeclaration,
-  FunctionExpression,
-  ParenthesisExpression,
-  Span,
-  Identifier,
-} from '@swc/core';
-import {Visitor} from '@swc/core/Visitor';
-import nullthrows from 'nullthrows';
-
-type VisitorOpts = {|
-  bundle: NamedBundle,
-  logger: PluginLogger,
-  assetPublicIdsWithSideEffects: Set<string>,
-|};
-
-export class RequireInliningVisitor extends Visitor {
-  currentModuleNode: null | FunctionExpression;
-  moduleVariables: Set<string>;
-  moduleVariableMap: Map<string, CallExpression>;
-  dirty: boolean;
-  logger: PluginLogger;
-  bundle: NamedBundle;
-  assetPublicIdsWithSideEffects: Set<string>;
-
-  constructor({bundle, logger, assetPublicIdsWithSideEffects}: VisitorOpts) {
-    super();
-    this.currentModuleNode = null;
-    this.moduleVariables = new Set();
-    this.moduleVariableMap = new Map();
-    this.dirty = false;
-    this.logger = logger;
-    this.bundle = bundle;
-    this.assetPublicIdsWithSideEffects = assetPublicIdsWithSideEffects;
-  }
-
-  visitFunctionExpression(n: FunctionExpression): FunctionExpression {
-    // This visitor tries to find module definition functions, these are of the form:
-    //
-    // parcelRequire.register("moduleId", function (require, module, exports) { ... });
-    //
-    // We do this to set the vistior variable `inModuleDefinition` for subsequent visits,
-    // and also reset the module variable tracking data structures.
-    //
-    // (TODO: Support arrow functions if we modify the runtime to output arrow functions)
-    if (
-      n.params.length === 3 &&
-      n.params[0].pat.type === 'Identifier' &&
-      n.params[0].pat.value === 'require' &&
-      n.params[1].pat.type === 'Identifier' &&
-      n.params[1].pat.value === 'module' &&
-      n.params[2].pat.type === 'Identifier' &&
-      n.params[2].pat.value === 'exports'
-    ) {
-      // `inModuleDefinition` is either null, or the module definition node
-      this.currentModuleNode = n;
-      this.moduleVariables = new Set();
-      this.moduleVariableMap = new Map();
-    }
-
-    // Make sure we visit the function itself
-    let result = super.visitFunctionExpression(n);
-
-    // only "exit" module definition if we're exiting the module definition node
-    if (n === this.currentModuleNode) {
-      this.currentModuleNode = null;
-    }
-    return result;
-  }
-
-  visitVariableDeclaration(n: VariableDeclaration): VariableDeclaration {
-    // We're looking for variable declarations that look like this:
-    //
-    // `var $acw62 = require("acw62");`
-    let needsReplacement = false;
-    for (let i = 0; i < n.declarations.length; i++) {
-      let decl = n.declarations[i];
-      const init = decl.init;
-      if (!init || init.type !== 'CallExpression') {
-        continue;
-      }
-
-      if (
-        ((init.callee.type === 'Identifier' &&
-          init.callee.value === 'require') ||
-          init.callee.value === 'parcelRequire') &&
-        decl.id.value !== 'parcelHelpers' && // ignore var parcelHelpers = require("@atlaspack/transformer-js/src/esmodule-helpers.js");
-        init.arguments[0].expression.type === 'StringLiteral' &&
-        typeof decl.id.value === 'string' &&
-        decl.id.value.startsWith('$')
-      ) {
-        const variable = decl.id.value;
-        const assetPublicId = variable.substring(1);
-
-        // We need to determine whether the asset we're require'ing has sideEffects - if it does, we
-        // shouldn't optimise it to an inline require as the side effects need to run immediately
-        //
-        // We need to use the public id of the asset (which is the variable name used for requiring it) in
-        // order to find the asset in the bundle graph, and check whether `asset.sideEffects` is true - in
-        // which case we skip optimising this asset.
-        //
-        // This won't work in dev mode, because the id used to require the asset isn't the public id
-        if (
-          this.assetPublicIdsWithSideEffects &&
-          this.assetPublicIdsWithSideEffects.has(assetPublicId)
-        ) {
-          continue;
-        }
-
-        // The moduleVariableMap contains a mapping from (e.g. $acw62 -> the AST node `require("acw62")`)
-        this.moduleVariableMap.set(variable, init);
-        // The moduleVariables set is just the used set of modules (e.g. `$acw62`)
-        this.moduleVariables.add(variable);
-
-        // Replace this with a null declarator, we'll use the `init` where it's declared.
-        //
-        // This mutates `var $acw62 = require("acw62")` -> `var $acw62 = null`
-        //
-        // The variable will be unused and removed by optimisation
-        decl.init = undefined;
-        needsReplacement = true;
-      } else if (
-        decl.id.type === 'Identifier' &&
-        typeof decl.id.value === 'string' &&
-        decl.id.value.endsWith('Default') &&
-        decl.id.value.startsWith('$')
-      ) {
-        // Handle modules with default values, these look like this in the source:
-        // ```
-        // var _app = require("./App");
-        // var _appDefault = parcelHelpers.interopDefault(_app);
-        // ```
-        //
-        // In this case we want to also put `_appDefault` into the `moduleVariableMap` with the initializer node,
-        // but we want to replace `_app` in there with `require("./App")`.. to summarise, this code will end up looking like:
-        //
-        // ```
-        // var _app = null;
-        // var _appDefault = null;
-        // ```
-        //
-        // .. and where `_appDefault` is used we replace that with `parcelHelpers.interopDefault(require('./App'))`
-        const variable = decl.id.value;
-        const baseId = variable.substring(
-          0,
-          decl.id.value.length - 'Default'.length,
-        );
-        if (!this.moduleVariables.has(baseId)) {
-          continue;
-        }
-        init.arguments[0] = {
-          spread: undefined,
-          expression: nullthrows(this.moduleVariableMap.get(baseId)),
-        };
-        this.moduleVariableMap.set(variable, init);
-        this.moduleVariables.add(variable);
-
-        decl.init = undefined;
-        needsReplacement = true;
-      }
-    }
-    if (!needsReplacement) {
-      return super.visitVariableDeclaration(n);
-    } else {
-      this.dirty = true;
-      return n;
-    }
-  }
-
-  visitIdentifier(n: Identifier): Identifier {
-    // This does the actual replacement - for any identifier within this factory function
-    // that is in the `moduleVariables` list, replace the identifier with the original expression
-    // that was going to be used to initialise the identifier.
-    //
-    // The replacement expression uses the `(0, require(...))` pattern to allow for safe replacement
-    // in any use cases (since we're replacing a variable access with a function call) - the minifier
-    // will take care of optimising this away where possible.
-    //
-    // e.g.
-    // var $abc = require("abc");
-    // console.log($abc.foo());
-    //
-    // becomes
-    //
-    // var $abc;
-    // console.log((0, require("abc")).foo);
-    //
-    if (this.moduleVariables.has(n.value)) {
-      // $FlowFixMe the types don't allow for swapping out the node type here, might need a different approach
-      return this.getReplacementExpression(n.value);
-    }
-    return super.visitIdentifier(n);
-  }
-
-  // Helper function to wrap an existing node in a sequence expression, that is, it
-  // will take a node `n` and return the AST for `(0, n)`
-  //
-  // This ensures that the require call can be correctly used in any context - where
-  // the sequence is redundant, the minifier will optimise it away.
-  getReplacementExpression(id: string): ParenthesisExpression {
-    return {
-      type: 'ParenthesisExpression',
-      span: RequireInliningVisitor.getEmptySpan(),
-      expression: {
-        type: 'SequenceExpression',
-        span: RequireInliningVisitor.getEmptySpan(),
-        expressions: [
-          {
-            type: 'NumericLiteral',
-            span: RequireInliningVisitor.getEmptySpan(),
-            value: 0,
-          },
-          nullthrows(this.moduleVariableMap.get(id)),
-        ],
-      },
-    };
-  }
-
-  static getEmptySpan(): Span {
-    return {start: 0, end: 0, ctxt: 0};
-  }
-}

package/test/RequireInliningVisitor.test.js

@@ -1,81 +0,0 @@
-import {parse, print} from '@swc/core';
-import {RequireInliningVisitor} from '../src/RequireInliningVisitor';
-import assert from 'assert';
-import logger from '@atlaspack/logger';
-
-async function testRequireInliningVisitor(src, sideEffects) {
-  const ast = await parse(src, {});
-  const assetPublicIdsWithSideEffects = new Set(sideEffects);
-
-  const visitor = new RequireInliningVisitor({
-    bundle: {
-      name: 'test-bundle',
-    },
-    assetPublicIdsWithSideEffects,
-    logger,
-  });
-  visitor.visitProgram(ast);
-  return (await print(ast)).code;
-}
-
-function getModule(body) {
-  return `
-    n.register('def456', function(require, module, exports) {
-        ${body}
-    });
-    `;
-}
-
-function normaliseCode(code) {
-  return code
-    .split('\n')
-    .map((line) => line.trim())
-    .join('\n')
-    .trim();
-}
-
-function assertEqualCode(left, right) {
-  assert.equal(normaliseCode(left), normaliseCode(right));
-}
-
-describe('InliningVisitor', () => {
-  it('performs basic inlining', async () => {
-    const src = getModule(`
-        var $abc123 = require('abc123');
-        console.log($abc123);`);
-    const result = await testRequireInliningVisitor(src, []);
-    assertEqualCode(
-      result,
-      getModule(`var $abc123;
-      console.log((0, require('abc123')));`),
-    );
-  });
-
-  it('performs module default inlining', async () => {
-    const src = getModule(
-      `var $abc123 = require('abc123');
-        var $abc123Default =  parcelHelpers.interopDefault($abc123);
-        console.log($abc123Default.foo());`,
-    );
-    const expected = getModule(
-      `var $abc123;
-        var $abc123Default;
-        console.log((0, parcelHelpers.interopDefault(require('abc123'))).foo());`,
-    );
-    const result = await testRequireInliningVisitor(src, []);
-    assertEqualCode(result, expected);
-  });
-
-  it('ignores assets with sideEffects', async () => {
-    const src = getModule(`var $abc123 = require('abc123');
-        var $abc456 = require('abc456');
-        console.log($abc123);
-        console.log($abc456);`);
-    const expected = getModule(`var $abc123 = require('abc123');
-        var $abc456;
-        console.log($abc123);
-        console.log((0, require('abc456')));`);
-    const result = await testRequireInliningVisitor(src, ['abc123']);
-    assertEqualCode(result, expected);
-  });
-});