@granite-js/mpack 1.0.42 → 2.0.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @granite-js/mpack
 
+## 2.0.1
+
+### Patch Changes
+
+- @granite-js/plugin-core@2.0.1
+- @granite-js/utils@2.0.1
+
+## 2.0.0
+
+### Patch Changes
+
+- 864fa2a: Remove runtime module edges left behind by inline Flow type-only imports.
+  - @granite-js/plugin-core@2.0.0
+  - @granite-js/utils@2.0.0
+
 ## 1.0.42
 
 ### Patch Changes

package/dist/bundler/plugins/transformPlugin/steps/createFlowStripStep.js

@@ -35,6 +35,79 @@ var import_generator = require("@babel/generator");
 var import_flow_remove_types = __toESM(require("flow-remove-types"));
 var HermesParser = __toESM(require("hermes-parser"));
 var import_defineStepName = require("../../../../utils/defineStepName");
+const HERMES_PARSE_OPTIONS = { flow: "all", babel: true };
+function isRecord(value) {
+  return typeof value === "object" && value !== null;
+}
+function isMutableProgram(value) {
+  return isRecord(value) && Array.isArray(value.body);
+}
+function isGeneratorNode(value) {
+  return isRecord(value) && typeof value.type === "string";
+}
+function getProgram(ast) {
+  if (!isRecord(ast) || !isMutableProgram(ast.program)) {
+    return null;
+  }
+  return ast.program;
+}
+function getImportDeclaration(node) {
+  if (!isRecord(node) || node.type !== "ImportDeclaration" || !Array.isArray(node.specifiers)) {
+    return null;
+  }
+  return {
+    importKind: node.importKind,
+    specifiers: node.specifiers,
+    start: node.start,
+    type: "ImportDeclaration"
+  };
+}
+function isTypeSpecifier(specifier) {
+  if (!isRecord(specifier)) {
+    return false;
+  }
+  return specifier.importKind === "type" || specifier.importKind === "typeof";
+}
+function collectTypeOnlyImportOffsets(code) {
+  const ast = HermesParser.parse(code, HERMES_PARSE_OPTIONS);
+  const program = getProgram(ast);
+  const offsets = /* @__PURE__ */ new Set();
+  if (program == null) {
+    return offsets;
+  }
+  for (const node of program.body) {
+    const declaration = getImportDeclaration(node);
+    if (declaration == null || typeof declaration.start !== "number" || declaration.specifiers.length === 0) {
+      continue;
+    }
+    const isTypeOnly = declaration.importKind === "type" || declaration.importKind === "typeof" || declaration.specifiers.every(isTypeSpecifier);
+    if (isTypeOnly) {
+      offsets.add(declaration.start);
+    }
+  }
+  return offsets;
+}
+function removeTypeOnlyImports(ast, originalCode) {
+  const program = getProgram(ast);
+  if (program == null || !originalCode.includes("type")) {
+    return;
+  }
+  const hasEmptyImport = program.body.some((node) => {
+    const declaration = getImportDeclaration(node);
+    return declaration != null && declaration.specifiers.length === 0;
+  });
+  if (!hasEmptyImport) {
+    return;
+  }
+  const typeOnlyOffsets = collectTypeOnlyImportOffsets(originalCode);
+  if (typeOnlyOffsets.size === 0) {
+    return;
+  }
+  program.body = program.body.filter((node) => {
+    const declaration = getImportDeclaration(node);
+    return !(declaration != null && declaration.specifiers.length === 0 && typeof declaration.start === "number" && typeOnlyOffsets.has(declaration.start));
+  });
+}
 function createFlowStripStep() {
   const flowStripStep = async function flowStrip(code, args) {
     const shouldTransform = args.path.endsWith(".js") || args.path.endsWith(".jsx");
@@ -43,10 +116,11 @@ function createFlowStripStep() {
     }
     try {
       const transformedCode = (0, import_flow_remove_types.default)(code, {});
-      const parsedAst = HermesParser.parse(transformedCode.toString(), {
-        flow: "all",
-        babel: true
-      });
+      const parsedAst = HermesParser.parse(transformedCode.toString(), HERMES_PARSE_OPTIONS);
+      removeTypeOnlyImports(parsedAst, code);
+      if (!isGeneratorNode(parsedAst)) {
+        return { code };
+      }
       const transformedResult = (0, import_generator.generate)(parsedAst);
       return { code: transformedResult?.code ?? code };
     } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/mpack",
-  "version": "1.0.42",
+  "version": "2.0.1",
   "description": "A bundler for Granite apps",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -92,8 +92,8 @@
     "@babel/traverse": "7.28.5",
     "@babel/types": "7.28.5",
     "@fastify/middie": "8.3.0",
-    "@granite-js/plugin-core": "1.0.42",
-    "@granite-js/utils": "1.0.42",
+    "@granite-js/plugin-core": "2.0.1",
+    "@granite-js/utils": "2.0.1",
     "@react-native-community/cli-plugin-metro": "11.3.7",
     "@react-native-community/cli-server-api": "11.3.7",
     "@react-native-community/cli-tools": "11.3.7",