@quilted/rollup 0.2.25 → 0.2.27

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @quilted/rollup
 
+## 0.2.27
+
+### Patch Changes
+
+- [`4fac90a`](https://github.com/lemonmade/quilt/commit/4fac90a52b8efff96572b5f2ae93b40eac2fcf34) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix async module import resolution
+
+- [`fb45f13`](https://github.com/lemonmade/quilt/commit/fb45f13ef3d4be82f7edde567ed3247931957701) Thanks [@lemonmade](https://github.com/lemonmade)! - Fix usage of magic "env" module
+
+## 0.2.26
+
+### Patch Changes
+
+- [`473928a`](https://github.com/lemonmade/quilt/commit/473928a44115f8c27521d66cfe68cc5e213c5a54) Thanks [@lemonmade](https://github.com/lemonmade)! - Update development dependencies
+
 ## 0.2.25
 
 ### Patch Changes

package/build/esm/app.mjs

@@ -732,8 +732,7 @@ function createManualChunksSorter() {
     let relativeId;
     if (id.includes("/node_modules/")) {
       const moduleInfo = getModuleInfo(id);
-      if (moduleInfo == null)
-        return;
+      if (moduleInfo == null) return;
       if (moduleInfo.importers.length > 0 && moduleInfo.importers.every(
         (importer) => importer.includes("/node_modules/")
       )) {

package/build/esm/features/assets.mjs

@@ -22,8 +22,7 @@ async function writeManifestForBundle(bundle, { file, baseURL, cacheKey, priorit
   const entryChunk = entries[0];
   const dependencyMap = /* @__PURE__ */ new Map();
   for (const output of outputs) {
-    if (output.type !== "chunk")
-      continue;
+    if (output.type !== "chunk") continue;
     dependencyMap.set(output.fileName, output.imports);
   }
   const assets = [];
@@ -51,14 +50,11 @@ async function writeManifestForBundle(bundle, { file, baseURL, cacheKey, priorit
     modules: {}
   };
   for (const output of outputs) {
-    if (output.type !== "chunk")
-      continue;
+    if (output.type !== "chunk") continue;
     const originalModuleId = output.facadeModuleId ?? output.moduleIds[output.moduleIds.length - 1];
-    if (originalModuleId == null)
-      continue;
+    if (originalModuleId == null) continue;
     const moduleId = this.getModuleInfo(originalModuleId)?.meta.quilt?.moduleID;
-    if (moduleId == null)
-      continue;
+    if (moduleId == null) continue;
     manifest.modules[moduleId] = createAssetsEntry(
       [...output.imports, output.fileName],
       { dependencyMap, getAssetId }
@@ -75,8 +71,7 @@ function createAssetsEntry(files, {
   const scripts = [];
   const allFiles = /* @__PURE__ */ new Set();
   const addFile = (file) => {
-    if (allFiles.has(file))
-      return;
+    if (allFiles.has(file)) return;
     allFiles.add(file);
     for (const dependency of dependencyMap.get(file) ?? []) {
       addFile(dependency);

package/build/esm/features/async.mjs

@@ -25,16 +25,9 @@ function asyncModules({
       const resolved = await this.resolve(imported, importer, {
         skipSelf: true
       });
-      if (resolved == null)
-        return null;
+      if (resolved == null) return null;
       return `\0${prefix}${resolved.id}`;
     },
-    resolveDynamicImport(specifier) {
-      if (typeof specifier === "string" && specifier.startsWith(IMPORT_PREFIX)) {
-        return `\0${specifier}`;
-      }
-      return null;
-    },
     async load(id) {
       if (id.startsWith(`\0${MODULE_PREFIX}`)) {
         const imported = id.replace(`\0${MODULE_PREFIX}`, "");
@@ -92,25 +85,21 @@ function defaultModuleID({ imported }) {
 async function preloadAsyncAssetsInESMBundle(bundle) {
   const { parse: parseImports } = await import('es-module-lexer');
   for (const chunk of Object.values(bundle)) {
-    if (chunk.type !== "chunk")
-      continue;
-    if (chunk.dynamicImports.length === 0)
-      continue;
+    if (chunk.type !== "chunk") continue;
+    if (chunk.dynamicImports.length === 0) continue;
     const { code } = chunk;
     const newCode = new MagicString(code);
     const imports = (await parseImports(code))[0];
     for (const imported of imports) {
       const { s: start, e: end, ss: importStart, d: dynamicStart } = imported;
-      if (dynamicStart < 0)
-        continue;
+      if (dynamicStart < 0) continue;
       const importSource = code.slice(start + 1, end - 1);
       const dependencies = getDependenciesForImport(
         importSource,
         chunk,
         bundle
       );
-      if (dependencies.size === 1)
-        continue;
+      if (dependencies.size === 1) continue;
       const originalImport = code.slice(importStart, end + 1);
       newCode.overwrite(
         importStart,
@@ -123,10 +112,8 @@ async function preloadAsyncAssetsInESMBundle(bundle) {
 }
 async function preloadAsyncAssetsInSystemJSBundle(bundle) {
   for (const chunk of Object.values(bundle)) {
-    if (chunk.type !== "chunk")
-      continue;
-    if (chunk.dynamicImports.length === 0)
-      continue;
+    if (chunk.type !== "chunk") continue;
+    if (chunk.dynamicImports.length === 0) continue;
     const { code } = chunk;
     const newCode = new MagicString(code);
     const systemDynamicImportRegex = /\bmodule\.import\(([^)]*)\)/g;
@@ -139,8 +126,7 @@ async function preloadAsyncAssetsInSystemJSBundle(bundle) {
         chunk,
         bundle
       );
-      if (dependencies.size === 1)
-        continue;
+      if (dependencies.size === 1) continue;
       newCode.overwrite(
         match.index,
         match.index + originalImport.length,
@@ -161,17 +147,13 @@ function getDependenciesForImport(imported, chunk, bundle) {
   const analyzed = /* @__PURE__ */ new Set();
   const normalizedFile = posix.join(posix.dirname(originalFilename), imported);
   const addDependencies = (filename) => {
-    if (filename === originalFilename)
-      return;
-    if (analyzed.has(filename))
-      return;
+    if (filename === originalFilename) return;
+    if (analyzed.has(filename)) return;
     analyzed.add(filename);
     const chunk2 = bundle[filename];
-    if (chunk2 == null)
-      return;
+    if (chunk2 == null) return;
     dependencies.add(chunk2.fileName);
-    if (chunk2.type !== "chunk")
-      return;
+    if (chunk2.type !== "chunk") return;
     for (const imported2 of chunk2.imports) {
       addDependencies(imported2);
     }

package/build/esm/features/css.mjs

@@ -5,8 +5,7 @@ function css({ minify = true, emit = true, targets }) {
   return {
     name: "@quilted/css",
     async transform(code, id) {
-      if (!CSS_REGEX.test(id))
-        return;
+      if (!CSS_REGEX.test(id)) return;
       const { transform, browserslistToTargets } = await import('lightningcss');
       const transformed = transform({
         filename: id,
@@ -31,16 +30,14 @@ function css({ minify = true, emit = true, targets }) {
       };
     },
     async renderChunk(_, chunk) {
-      if (!emit)
-        return null;
+      if (!emit) return null;
       let chunkCss = "";
       for (const id of Object.keys(chunk.modules)) {
         if (CSS_REGEX.test(id) && styles.has(id)) {
           chunkCss += styles.get(id);
         }
       }
-      if (chunkCss.length === 0)
-        return null;
+      if (chunkCss.length === 0) return null;
       const code = chunkCss;
       const fileHandle = this.emitFile({
         type: "asset",

package/build/esm/features/env.mjs

@@ -33,7 +33,7 @@ function magicModuleEnv({
 } = {}) {
   return createMagicModulePlugin({
     name: "@quilted/magic-module/env",
-    module: MAGIC_MODULE_ENV,
+    module: [MAGIC_MODULE_ENV, "@quilted/quilt/env"],
     async source() {
       const inlineEnv = {};
       if (mode) {
@@ -41,11 +41,9 @@ function magicModuleEnv({
       }
       const loadedEnv = await loadEnv.call(this, { mode, dotenv });
       for (const inlineVariable of inline.sort()) {
-        if (inlineVariable in inlineEnv)
-          continue;
+        if (inlineVariable in inlineEnv) continue;
         const value = process.env[inlineVariable] ?? loadedEnv[inlineVariable];
-        if (value == null)
-          continue;
+        if (value == null) continue;
         inlineEnv[inlineVariable] = typeof value === "string" && value[0] === '"' && value[value.length - 1] === '"' ? JSON.parse(value) : value;
       }
       return multiline`
@@ -107,8 +105,7 @@ async function loadEnv({ root, mode, dotenv }) {
       })
     );
     for (const envFileResult of envFileResults) {
-      if (envFileResult == null)
-        continue;
+      if (envFileResult == null) continue;
       Object.assign(env, envFileResult);
     }
   }
@@ -121,8 +118,7 @@ function findWorkspaceRoot(start = process.cwd()) {
       return current;
     }
     const next = path.dirname(current);
-    if (next === current)
-      return void 0;
+    if (next === current) return void 0;
     current = next;
   }
 }

package/build/esm/features/graphql.mjs

@@ -9,16 +9,14 @@ function graphql({ manifest } = {}) {
   return {
     name: "@quilted/graphql",
     async transform(code, id) {
-      if (!id.endsWith(".graphql") && !id.endsWith(".gql"))
-        return null;
+      if (!id.endsWith(".graphql") && !id.endsWith(".gql")) return null;
       const topLevelDefinitions = /* @__PURE__ */ new Set();
       const loadedDocument = await loadDocument(
         code,
         id,
         this,
         (document2, level) => {
-          if (level !== 0)
-            return;
+          if (level !== 0) return;
           for (const definition of document2.definitions) {
             if ("name" in definition && definition.name != null) {
               topLevelDefinitions.add(definition.name.value);
@@ -41,8 +39,7 @@ function graphql({ manifest } = {}) {
       };
     },
     async generateBundle() {
-      if (!shouldWriteManifest)
-        return;
+      if (!shouldWriteManifest) return;
       const operations = {};
       for (const moduleId of this.getModuleIds()) {
         const operation = this.getModuleInfo(moduleId)?.meta?.quilt?.graphql;
@@ -50,8 +47,7 @@ function graphql({ manifest } = {}) {
           operations[operation.id] = operation.source;
         }
       }
-      if (Object.keys(operations).length === 0)
-        return;
+      if (Object.keys(operations).length === 0) return;
       await mkdir(dirname(manifestPath), { recursive: true });
       await writeFile(manifestPath, JSON.stringify(operations, null, 2));
     }
@@ -66,8 +62,7 @@ async function loadDocument(code, file, plugin, add, level = 0, seen = /* @__PUR
   }
   const resolvedImports = await Promise.all(
     imports.map(async (imported) => {
-      if (seen.has(imported))
-        return;
+      if (seen.has(imported)) return;
       seen.add(imported);
       const resolvedId = await plugin.resolve(imported, file);
       if (resolvedId == null) {
@@ -92,8 +87,7 @@ async function loadDocument(code, file, plugin, add, level = 0, seen = /* @__PUR
     })
   );
   for (const importedDocument of resolvedImports) {
-    if (importedDocument == null)
-      continue;
+    if (importedDocument == null) continue;
     document.definitions.push(...importedDocument.definitions);
   }
   return document;

package/build/esm/features/node.mjs

@@ -10,8 +10,7 @@ async function monorepoPackageAliases({
   function processProject(project2) {
     const { dependencies, devDependencies } = project2.packageJSON.raw;
     for (const pkg of Object.keys({ ...dependencies, ...devDependencies })) {
-      if (seenDependencies.has(pkg))
-        continue;
+      if (seenDependencies.has(pkg)) continue;
       seenDependencies.add(pkg);
       let packageRoot;
       try {
@@ -22,8 +21,7 @@ async function monorepoPackageAliases({
         continue;
       }
       const packageProject = Project.load(packageRoot);
-      if (seenProjects.has(packageProject))
-        continue;
+      if (seenProjects.has(packageProject)) continue;
       seenProjects.add(packageProject);
       processProject(packageProject);
     }

package/build/esm/features/system-js.mjs

@@ -7,8 +7,7 @@ function systemJS({ minify = false } = {}) {
   return {
     name: "@quilted/system-js",
     async renderChunk(code, chunk, options) {
-      if (options.format !== "system" || !chunk.isEntry)
-        return null;
+      if (options.format !== "system" || !chunk.isEntry) return null;
       const require = createRequire(import.meta.url);
       const systemjs = minify ? require.resolve("systemjs/dist/s.min.js") : require.resolve("systemjs/dist/s.js");
       const fileHandle = this.emitFile({

package/build/esm/features/typescript.mjs

@@ -9,8 +9,7 @@ async function tsconfigAliases({
     getTSConfig(root)
   ]);
   const tsconfigPaths = tsconfig?.compilerOptions?.paths;
-  if (tsconfigPaths == null)
-    return void 0;
+  if (tsconfigPaths == null) return void 0;
   return alias({
     entries: Object.entries(tsconfigPaths).map(([name, aliases]) => {
       return {

package/build/esm/features/workers.mjs

@@ -23,19 +23,16 @@ function workers({
     },
     async resolveId(source, importer) {
       const context = parseWorkerImport(source);
-      if (context == null)
-        return null;
+      if (context == null) return null;
       const resolvedModule = await this.resolve(context.module, importer, {
         skipSelf: true
       });
-      if (resolvedModule == null)
-        return null;
+      if (resolvedModule == null) return null;
       return serializeWorkerImport({ ...context, module: resolvedModule.id });
     },
     async load(id) {
       const context = parseWorkerImport(id);
-      if (context == null)
-        return null;
+      if (context == null) return null;
       const { module } = context;
       const workerPlugins = [
         workerMagicModules(),
@@ -98,11 +95,9 @@ function workers({
       })};`;
     },
     generateBundle(_, bundle) {
-      if (write)
-        return;
+      if (write) return;
       for (const chunk of workerMap.values()) {
-        if (chunk.fileName in bundle)
-          continue;
+        if (chunk.fileName in bundle) continue;
         bundle[chunk.fileName] = chunk;
       }
     }
@@ -119,15 +114,13 @@ function workerMagicModules() {
     },
     async load(id) {
       const context = parseWorkerImport(id, ENTRY_PREFIX);
-      if (context == null)
-        return null;
+      if (context == null) return null;
       return contentForWorker(context);
     }
   };
 }
 function parseWorkerImport(id, prefix = PREFIX) {
-  if (!id.startsWith(prefix))
-    return void 0;
+  if (!id.startsWith(prefix)) return void 0;
   const [module, searchString] = id.slice(prefix.length).split("?");
   const searchParams = new URLSearchParams(searchString);
   const wrapperModule = searchParams.get("module");

package/build/esm/package.mjs

@@ -284,8 +284,7 @@ function sourceForEntries(entries, { root }) {
   let sourceRoot = root;
   const sourceEntryFiles = Object.values(entries);
   for (const entry of sourceEntryFiles) {
-    if (!entry.startsWith(root))
-      continue;
+    if (!entry.startsWith(root)) continue;
     sourceRoot = path.resolve(
       root,
       path.relative(root, entry).split(path.sep)[0] ?? "."

package/build/esm/shared/browserslist.mjs

@@ -16,8 +16,7 @@ async function getBrowserGroups({
 } = {}) {
   const { default: browserslist } = await import('browserslist');
   const config = browserslist.findConfig(root);
-  if (config == null)
-    return { default: browserslist(["defaults"]) };
+  if (config == null) return { default: browserslist(["defaults"]) };
   const { defaults, ...rest } = config;
   const browserGroups = {};
   const groupsWithFullList = Object.entries(rest).map(([name, browsers]) => ({
@@ -41,8 +40,7 @@ async function getBrowserGroupRegularExpressions(groups) {
     name,
     browsers: browserslist(browsers)
   })).sort((first, second) => first.browsers.length - second.browsers.length);
-  if (groupsWithFullList.length === 0)
-    return {};
+  if (groupsWithFullList.length === 0) return {};
   const lastGroup = groupsWithFullList.pop();
   const regexes = {};
   for (const { name, browsers } of groupsWithFullList) {
@@ -135,21 +133,17 @@ function* mdnBrowserVersions(browsers, semver) {
   for (const browser of browsers) {
     const [name, version] = browser.split(" ");
     const mdnBrowser = BROWSESLIST_BROWSER_TO_MDN_BROWSER.get(name);
-    if (mdnBrowser == null)
-      continue;
+    if (mdnBrowser == null) continue;
     const semverVersion = semver.coerce(version);
-    if (semverVersion == null)
-      continue;
+    if (semverVersion == null) continue;
     yield { name: mdnBrowser, version: semverVersion };
   }
 }
 function isSupported(supportList, browser, version, semver) {
   const supportedVersionDetails = supportList[browser];
-  if (supportedVersionDetails == null)
-    return false;
+  if (supportedVersionDetails == null) return false;
   const supportedVersion = semver.coerce(supportedVersionDetails.version_added);
-  if (supportedVersion == null)
-    return false;
+  if (supportedVersion == null) return false;
   return semver.gte(version, supportedVersion);
 }
 

package/build/esm/shared/magic-module.mjs

@@ -11,8 +11,10 @@ function createMagicModulePlugin({
   return {
     name,
     async resolveId(id) {
-      if (id !== module)
+      const matches = Array.isArray(module) ? module.some((moduleID) => moduleID === id) : id === module;
+      if (!matches) {
         return null;
+      }
       const resolved = (typeof alias === "function" ? await alias() : alias) ?? virtualModuleAlias;
       return {
         id: resolved,
@@ -20,8 +22,7 @@ function createMagicModulePlugin({
       };
     },
     load: getSource ? async function load(source) {
-      if (source !== virtualModuleAlias)
-        return null;
+      if (source !== virtualModuleAlias) return null;
       const code = await getSource.call(this);
       return {
         code,

package/build/esm/shared/project.mjs

@@ -73,8 +73,7 @@ async function sourceEntriesForProject(project) {
     exports
   )) {
     let targetFile = null;
-    if (exportCondition == null)
-      continue;
+    if (exportCondition == null) continue;
     if (typeof exportCondition === "string") {
       targetFile = exportCondition;
     } else {
@@ -82,8 +81,7 @@ async function sourceEntriesForProject(project) {
         (condition) => typeof condition === "string" && condition.startsWith("./build/")
       );
     }
-    if (targetFile == null)
-      continue;
+    if (targetFile == null) continue;
     const sourceFile = await resolveTargetFileAsSource(targetFile, project);
     entries[exportPath] = sourceFile;
   }