@granite-js/mpack 1.0.21 → 1.0.23

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @granite-js/mpack
 
+## 1.0.23
+
+### Patch Changes
+
+- 63217da: fix(mpack): support deep and filter params in require.context(), isolate require context
+  - @granite-js/plugin-core@1.0.23
+  - @granite-js/utils@1.0.23
+
+## 1.0.22
+
+### Patch Changes
+
+- @granite-js/plugin-core@1.0.22
+- @granite-js/utils@1.0.22
+
 ## 1.0.21
 
 ### Patch Changes

package/dist/bundler/plugins/requireContextPlugin/__fixtures__/preview.require.context.d.ts

@@ -0,0 +1,3 @@
+export declare const previews: any[];
+export declare function findPreview(key: string): any | undefined;
+export declare function normalizeGroup(group: string | string[] | undefined): string[];

package/dist/bundler/plugins/requireContextPlugin/__fixtures__/preview.require.context.js

@@ -0,0 +1,45 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var preview_require_context_exports = {};
+__export(preview_require_context_exports, {
+  findPreview: () => findPreview,
+  normalizeGroup: () => normalizeGroup,
+  previews: () => previews
+});
+module.exports = __toCommonJS(preview_require_context_exports);
+const previewContext = require.context("../../", true, /\.preview\.tsx$/);
+const previews = previewContext.keys().filter((key) => key.startsWith("./")).map((key) => previewContext(key).default).filter(Boolean);
+function findPreview(key) {
+  return previews.find((p) => p.key === key);
+}
+function normalizeGroup(group) {
+  if (group == null) {
+    return ["Ungrouped"];
+  }
+  if (typeof group === "string") {
+    return [group];
+  }
+  return group.length === 0 ? ["Ungrouped"] : group;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  findPreview,
+  normalizeGroup,
+  previews
+});

package/dist/bundler/plugins/requireContextPlugin/requireContextPlugin.js

@@ -36,13 +36,15 @@ var import_path = __toESM(require("path"));
 var import_scripts = require("./scripts");
 var import_constants = require("../../../constants");
 var import_esbuildUtils = require("../../../utils/esbuildUtils");
-async function getFilePaths(rootDir) {
+async function getFilePaths(rootDir, deep = true) {
   const filenames = [];
   const rootFilenames = await import_fs.default.readdirSync(rootDir);
   for await (const filename of rootFilenames) {
     const filePath = import_path.default.join(rootDir, filename);
     if (import_fs.default.lstatSync(filePath).isDirectory()) {
-      filenames.push(...await getFilePaths(filePath));
+      if (deep) {
+        filenames.push(...await getFilePaths(filePath, deep));
+      }
     } else {
       filenames.push(filePath);
     }
@@ -61,11 +63,21 @@ function requireContextPlugin() {
         };
       });
       build.onResolve({ filter: new RegExp(`^${import_constants.REQUIRE_CONTEXT_PROTOCOL}.*`) }, (args) => {
+        const rawPath = args.path.slice(import_constants.REQUIRE_CONTEXT_PROTOCOL.length);
+        const qIdx = rawPath.indexOf("?");
+        const contextPath = qIdx === -1 ? rawPath : rawPath.slice(0, qIdx);
+        const params = new URLSearchParams(qIdx === -1 ? "" : rawPath.slice(qIdx + 1));
+        const deep = params.get("deep") !== "false";
+        const filterSrc = params.get("filterSrc");
+        const filterFlags = params.get("filterFlags") ?? "";
+        const filter = filterSrc != null ? new RegExp(filterSrc, filterFlags) : void 0;
         return {
           namespace: "require-context",
-          path: args.path.slice(import_constants.REQUIRE_CONTEXT_PROTOCOL.length),
+          path: contextPath,
           pluginData: {
-            importer: args.resolveDir
+            importer: args.resolveDir,
+            deep,
+            filter
           }
         };
       });
@@ -74,9 +86,11 @@ function requireContextPlugin() {
         if (importer == null) {
           throw new Error(`importer\uAC00 \uC8FC\uC5B4\uC838\uC57C \uD569\uB2C8\uB2E4.`);
         }
+        const { deep, filter } = args.pluginData;
         const targetDir = import_path.default.resolve(importer, args.path);
         const basePath = import_path.default.join(importer, args.path);
-        const filePaths = await getFilePaths(targetDir);
+        const allPaths = await getFilePaths(targetDir, deep);
+        const filePaths = filter ? allPaths.filter((fp) => filter.test(import_path.default.basename(fp))) : allPaths;
         const requireContextModules = filePaths.map((filePath, index) => {
           const pagePath = import_path.default.relative(basePath, filePath);
           const normalizedPagePath = (0, import_esbuildUtils.normalizePath)(pagePath);

package/dist/bundler/plugins/requireContextPlugin/scripts.d.ts

@@ -7,50 +7,23 @@ interface RequireContextModule {
  * require context export 스크립트 반환
  *
  * ```js
- * export const context = require.context('../path'); // A
- * export default require.context('../path'); // B
+ * export const context1 = require.context('../path1'); // A
+ * export const context2 = require.context('../path2'); // B
+ * export default require.context('../path3');          // C
  * ```
  *
- * 형태의 코드를 아래와 같이 변경
+ * 형태의 코드를 아래와 같이 변경 (각 호출마다 고유한 변수로 격리)
  *
  * ```js
- * // Sample
- * import __context__ from 'require-context:../path';
+ * import __context_0__ from 'require-context:../path1';
+ * import __context_1__ from 'require-context:../path2';
+ * import __context_2__ from 'require-context:../path3';
  *
- * export var context = __context__; // A
- * export default __context__; // B
+ * export var context1 = __context_0__; // A
+ * export var context2 = __context_1__; // B
+ * export default __context_2__;        // C
  * ```
  */
 export declare function toRequireContextExportScript(content: string): string;
-/**
- * require context 스크립트
- *
- * ```js
- * // Sample
- * import * as module0 from "/path/to/module-0";
- * import * as module1 from "/path/to/module-1";
- * import * as module2 from "/path/to/module-2";
- *
- * var requireContext = function(key) {
- *   var _modules = {};
- *
- *   _modules["./relative/path/of/module-0"] = module0;
- *   _modules["./relative/path/of/module-1"] = module1;
- *   _modules["./relative/path/of/module-2"] = module2;
- *
- *   return _modules[key];
- * };
- *
- * requireContext.keys = function() {
- *   return [
- *     "./relative/path/of/module-0",
- *     "./relative/path/of/module-1",
- *     "./relative/path/of/module-2",
- *   ];
- * };
- *
- * export default requireContext;
- * ```
- */
 export declare function getRequireContextScript(modules: RequireContextModule[]): string;
 export {};

package/dist/bundler/plugins/requireContextPlugin/scripts.js

@@ -24,19 +24,64 @@ __export(scripts_exports, {
 module.exports = __toCommonJS(scripts_exports);
 var import_constants = require("../../../constants");
 function toRequireContextExportScript(content) {
-  const [_, source] = content.match(/require\.context\((.*?)\)/) ?? [];
-  const parsedSource = source?.replace(/['"]/g, "");
-  if (!parsedSource) {
+  const sources = [];
+  let idx = 0;
+  const MODULE_BODY = content.replace(
+    /require\.context\((['"])(.*?)\1(?:\s*,\s*(true|false))?(?:\s*,\s*(\/.*?\/\w*))?\)/g,
+    (_, _quote, sourcePath, deep, filterLiteral) => {
+      const filterRegex = filterLiteral ? parseRegExpLiteral(filterLiteral) : void 0;
+      sources.push({
+        path: sourcePath,
+        deep: deep !== "false",
+        filterSrc: filterRegex?.source,
+        filterFlags: filterRegex?.flags
+      });
+      return `__context_${idx++}__`;
+    }
+  ).replace(/\b(const|let)\b/g, "var");
+  if (sources.length === 0) {
     throw new Error("\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 require context \uAD6C\uBB38\uC785\uB2C8\uB2E4");
   }
-  const IMPORT_STATEMENT = `import __context__ from '${import_constants.REQUIRE_CONTEXT_PROTOCOL}${parsedSource}';`;
-  const MODULE_BODY = content.replace(/require\.context\('(.*?)'\)/, "__context__").replace("const", "var");
+  for (const source of sources) {
+    if (!source.path) {
+      throw new Error("\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 require context \uAD6C\uBB38\uC785\uB2C8\uB2E4");
+    }
+  }
+  const IMPORT_STATEMENTS = sources.map((source, i) => {
+    const query = buildQueryString(source);
+    const protocolPath = `${import_constants.REQUIRE_CONTEXT_PROTOCOL}${source.path}${query}`;
+    return `import __context_${i}__ from '${protocolPath}';`;
+  }).join("\n");
   return `
-${IMPORT_STATEMENT}
+${IMPORT_STATEMENTS}
 
 ${MODULE_BODY}
 `.trim();
 }
+function parseRegExpLiteral(literal) {
+  const match = literal.match(/^\/(.*)\/(\w*)$/);
+  if (!match || match[1] == null) {
+    throw new Error(`\uC720\uD6A8\uD558\uC9C0 \uC54A\uC740 \uC815\uADDC\uC2DD \uB9AC\uD130\uB7F4: ${literal}`);
+  }
+  return new RegExp(match[1], match[2] ?? "");
+}
+function buildQueryString(source) {
+  const params = new URLSearchParams();
+  if (!source.deep) {
+    params.set("deep", "false");
+  }
+  ;
+  if (source.filterSrc != null) {
+    params.set("filterSrc", source.filterSrc);
+  }
+  ;
+  if (source.filterFlags != null) {
+    params.set("filterFlags", source.filterFlags);
+  }
+  ;
+  const qs = params.toString();
+  return qs.length > 0 ? `?${qs}` : "";
+}
 function getRequireContextScript(modules) {
   const IMPORT_STATEMENTS = modules.map((module2) => `import * as module${module2.moduleIndex} from ${JSON.stringify(module2.absolutePath)};`).join("\n");
   const ASSIGN_STATEMENTS = modules.map((module2) => `_modules[${JSON.stringify(module2.relativePath)}] = module${module2.moduleIndex};`).join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/mpack",
-  "version": "1.0.21",
+  "version": "1.0.23",
   "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.21",
-    "@granite-js/utils": "1.0.21",
+    "@granite-js/plugin-core": "1.0.23",
+    "@granite-js/utils": "1.0.23",
     "@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",