@drupal-canvas/cli 0.7.0 → 0.7.1

package/README.md

@@ -57,6 +57,10 @@ properties:
 If `canvas.config.json` is not present, the CLI will use the default values
 shown above.
 
+If you still have `CANVAS_COMPONENT_DIR` set in your shell, `.env`, or
+`.canvasrc`, the CLI will warn you and offer to create or update
+`canvas.config.json` with `componentDir`.
+
 #### .env
 
 This file contains environmental configuration that varies between environments

package/dist/index.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import chalk3 from 'chalk';
 import { Command } from 'commander';
-import * as fs4 from 'fs';
-import fs4__default, { realpathSync, promises, readlinkSync, readdirSync, readdir as readdir$1, lstatSync, existsSync, statSync } from 'fs';
+import * as fs5 from 'fs';
+import fs5__default, { realpathSync, promises, readlinkSync, readdirSync, readdir as readdir$1, lstatSync, existsSync, statSync } from 'fs';
 import * as p10 from '@clack/prompts';
 import { createHash } from 'crypto';
 import path7, { win32, posix, isAbsolute, resolve } from 'path';
@@ -9248,10 +9248,10 @@ var require_typescript = __commonJS({
             Debug2.loggingHost.log(level, s);
           }
         }
-        function log9(s) {
+        function log10(s) {
           logMessage(3, s);
         }
-        Debug2.log = log9;
+        Debug2.log = log10;
         ((_log) => {
           function error2(s) {
             logMessage(1, s);
@@ -9269,7 +9269,7 @@ var require_typescript = __commonJS({
             logMessage(4, s);
           }
           _log.trace = trace2;
-        })(log9 = Debug2.log || (Debug2.log = {}));
+        })(log10 = Debug2.log || (Debug2.log = {}));
         const assertionCache = {};
         function getAssertionLevel() {
           return currentAssertionLevel;
@@ -140467,8 +140467,8 @@ ${lanes.join("\n")}
         WatchLogLevel2[WatchLogLevel2["Verbose"] = 2] = "Verbose";
         return WatchLogLevel2;
       })(WatchLogLevel || {});
-      function getWatchFactory(host, watchLogLevel, log9, getDetailWatchInfo2) {
-        setSysLog(watchLogLevel === 2 ? log9 : noop);
+      function getWatchFactory(host, watchLogLevel, log10, getDetailWatchInfo2) {
+        setSysLog(watchLogLevel === 2 ? log10 : noop);
         const plainInvokeFactory = {
           watchFile: (file, callback, pollingInterval, options) => host.watchFile(file, callback, pollingInterval, options),
           watchDirectory: (directory, callback, flags, options) => host.watchDirectory(directory, callback, (flags & 1) !== 0, options)
@@ -140505,36 +140505,36 @@ ${lanes.join("\n")}
           return typeof host.useCaseSensitiveFileNames === "boolean" ? host.useCaseSensitiveFileNames : host.useCaseSensitiveFileNames();
         }
         function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
-          log9(`ExcludeWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
+          log10(`ExcludeWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
           return {
-            close: () => log9(`ExcludeWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`)
+            close: () => log10(`ExcludeWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`)
           };
         }
         function createFileWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-          log9(`FileWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
+          log10(`FileWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
           const watcher = triggerInvokingFactory.watchFile(file, cb, flags, options, detailInfo1, detailInfo2);
           return {
             close: () => {
-              log9(`FileWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
+              log10(`FileWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
               watcher.close();
             }
           };
         }
         function createDirectoryWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
           const watchInfo = `DirectoryWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`;
-          log9(watchInfo);
+          log10(watchInfo);
           const start = timestamp();
           const watcher = triggerInvokingFactory.watchDirectory(file, cb, flags, options, detailInfo1, detailInfo2);
           const elapsed = timestamp() - start;
-          log9(`Elapsed:: ${elapsed}ms ${watchInfo}`);
+          log10(`Elapsed:: ${elapsed}ms ${watchInfo}`);
           return {
             close: () => {
               const watchInfo2 = `DirectoryWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`;
-              log9(watchInfo2);
+              log10(watchInfo2);
               const start2 = timestamp();
               watcher.close();
               const elapsed2 = timestamp() - start2;
-              log9(`Elapsed:: ${elapsed2}ms ${watchInfo2}`);
+              log10(`Elapsed:: ${elapsed2}ms ${watchInfo2}`);
             }
           };
         }
@@ -140545,7 +140545,7 @@ ${lanes.join("\n")}
             file,
             (...args) => {
               const triggerredInfo = `${key2 === "watchFile" ? "FileWatcher" : "DirectoryWatcher"}:: Triggered with ${args[0]} ${args[1] !== void 0 ? args[1] : ""}:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`;
-              log9(triggerredInfo);
+              log10(triggerredInfo);
               const start = timestamp();
               cb.call(
                 /*thisArg*/
@@ -140553,7 +140553,7 @@ ${lanes.join("\n")}
                 ...args
               );
               const elapsed = timestamp() - start;
-              log9(`Elapsed:: ${elapsed}ms ${triggerredInfo}`);
+              log10(`Elapsed:: ${elapsed}ms ${triggerredInfo}`);
             },
             flags,
             options,
@@ -153613,7 +153613,7 @@ ${lanes.join("\n")}
         }
         return void 0;
       }
-      function discoverTypings(host, log9, fileNames, projectRootPath, safeList, packageNameToTypingLocation, typeAcquisition, unresolvedImports, typesRegistry, compilerOptions) {
+      function discoverTypings(host, log10, fileNames, projectRootPath, safeList, packageNameToTypingLocation, typeAcquisition, unresolvedImports, typesRegistry, compilerOptions) {
         if (!typeAcquisition || !typeAcquisition.enable) {
           return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
         }
@@ -153648,7 +153648,7 @@ ${lanes.join("\n")}
         }
         for (const excludeTypingName of exclude) {
           const didDelete = inferredTypings.delete(excludeTypingName);
-          if (didDelete && log9) log9(`Typing for ${excludeTypingName} is in exclude list, will be ignored.`);
+          if (didDelete && log10) log10(`Typing for ${excludeTypingName} is in exclude list, will be ignored.`);
         }
         packageNameToTypingLocation.forEach((typing, name) => {
           const registryEntry = typesRegistry.get(name);
@@ -153666,7 +153666,7 @@ ${lanes.join("\n")}
           }
         });
         const result = { cachedTypingPaths, newTypingNames, filesToWatch };
-        if (log9) log9(`Finished typings discovery:${stringifyIndented(result)}`);
+        if (log10) log10(`Finished typings discovery:${stringifyIndented(result)}`);
         return result;
         function addInferredTyping(typingName) {
           if (!inferredTypings.has(typingName)) {
@@ -153674,7 +153674,7 @@ ${lanes.join("\n")}
           }
         }
         function addInferredTypings(typingNames, message) {
-          if (log9) log9(`${message}: ${JSON.stringify(typingNames)}`);
+          if (log10) log10(`${message}: ${JSON.stringify(typingNames)}`);
           forEach(typingNames, addInferredTyping);
         }
         function getTypingNames(projectRootPath2, manifestName, modulesDirName, filesToWatch2) {
@@ -153714,7 +153714,7 @@ ${lanes.join("\n")}
             return isScoped && toFileNameLowerCase(pathComponents2[pathComponents2.length - 4]) === modulesDirName || // `node_modules/@foo/bar`
             !isScoped && toFileNameLowerCase(pathComponents2[pathComponents2.length - 3]) === modulesDirName;
           });
-          if (log9) log9(`Searching for typing names in ${packagesFolderPath}; all files: ${JSON.stringify(dependencyManifestNames)}`);
+          if (log10) log10(`Searching for typing names in ${packagesFolderPath}; all files: ${JSON.stringify(dependencyManifestNames)}`);
           for (const manifestPath2 of dependencyManifestNames) {
             const normalizedFileName = normalizePath4(manifestPath2);
             const result2 = readConfigFile(normalizedFileName, (path21) => host.readFile(path21));
@@ -153726,10 +153726,10 @@ ${lanes.join("\n")}
             if (ownTypes) {
               const absolutePath = getNormalizedAbsolutePath(ownTypes, getDirectoryPath(normalizedFileName));
               if (host.fileExists(absolutePath)) {
-                if (log9) log9(`    Package '${manifest2.name}' provides its own types.`);
+                if (log10) log10(`    Package '${manifest2.name}' provides its own types.`);
                 inferredTypings.set(manifest2.name, absolutePath);
               } else {
-                if (log9) log9(`    Package '${manifest2.name}' provides its own types but they are missing.`);
+                if (log10) log10(`    Package '${manifest2.name}' provides its own types but they are missing.`);
               }
             } else {
               packageNames.push(manifest2.name);
@@ -153753,7 +153753,7 @@ ${lanes.join("\n")}
             /* Jsx */
           ));
           if (hasJsxFile) {
-            if (log9) log9(`Inferred 'react' typings due to presence of '.jsx' extension`);
+            if (log10) log10(`Inferred 'react' typings due to presence of '.jsx' extension`);
             addInferredTyping("react");
           }
         }
@@ -168130,7 +168130,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         const cancellationToken = host.getCancellationToken ? new CancellationTokenObject(host.getCancellationToken()) : NoopCancellationToken;
         const currentDirectory = host.getCurrentDirectory();
         maybeSetLocalizedDiagnosticMessages((_a2 = host.getLocalizedDiagnosticMessages) == null ? void 0 : _a2.bind(host));
-        function log9(message) {
+        function log10(message) {
           if (host.log) {
             host.log(message);
           }
@@ -168145,7 +168145,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           readFile: maybeBind(host, host.readFile),
           getDocumentPositionMapper: maybeBind(host, host.getDocumentPositionMapper),
           getSourceFileLike: maybeBind(host, host.getSourceFileLike),
-          log: log9
+          log: log10
         });
         function getValidSourceFile(fileName) {
           const sourceFile = program2.getSourceFile(fileName);
@@ -168180,7 +168180,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           }
           const typeRootsVersion = host.getTypeRootsVersion ? host.getTypeRootsVersion() : 0;
           if (lastTypesRootVersion !== typeRootsVersion) {
-            log9("TypeRoots version has changed; provide new program");
+            log10("TypeRoots version has changed; provide new program");
             program2 = void 0;
             lastTypesRootVersion = typeRootsVersion;
           }
@@ -168550,7 +168550,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           return ts_Completions_exports.getCompletionsAtPosition(
             host,
             program2,
-            log9,
+            log10,
             getValidSourceFile(fileName),
             position,
             fullPreferences,
@@ -168565,7 +168565,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           synchronizeHostData();
           return ts_Completions_exports.getCompletionEntryDetails(
             program2,
-            log9,
+            log10,
             getValidSourceFile(fileName),
             position,
             { name, source: source2, data },
@@ -168578,7 +168578,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         }
         function getCompletionEntrySymbol2(fileName, position, name, source2, preferences = emptyOptions) {
           synchronizeHostData();
-          return ts_Completions_exports.getCompletionEntrySymbol(program2, log9, getValidSourceFile(fileName), position, { name, source: source2 }, host, preferences);
+          return ts_Completions_exports.getCompletionEntrySymbol(program2, log10, getValidSourceFile(fileName), position, { name, source: source2 }, host, preferences);
         }
         function getQuickInfoAtPosition(fileName, position, maximumLength, verbosityLevel) {
           synchronizeHostData();
@@ -168883,10 +168883,10 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           let start = timestamp();
           const settings = toEditorSettings(editorOptions);
           const sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-          log9("getIndentationAtPosition: getCurrentSourceFile: " + (timestamp() - start));
+          log10("getIndentationAtPosition: getCurrentSourceFile: " + (timestamp() - start));
           start = timestamp();
           const result = ts_formatting_exports.SmartIndenter.getIndentation(position, sourceFile, settings);
-          log9("getIndentationAtPosition: computeIndentation  : " + (timestamp() - start));
+          log10("getIndentationAtPosition: computeIndentation  : " + (timestamp() - start));
           return result;
         }
         function getFormattingEditsForRange(fileName, start, end, options) {
@@ -182621,7 +182621,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         }
         return allCommitCharacters;
       }
-      function getCompletionsAtPosition(host, program2, log9, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext, includeSymbol = false) {
+      function getCompletionsAtPosition(host, program2, log10, sourceFile, position, preferences, triggerCharacter, completionKind, cancellationToken, formatContext, includeSymbol = false) {
         var _a2;
         const { previousToken } = getRelevantTokens(position, sourceFile);
         if (triggerCharacter && !isInString(sourceFile, position, previousToken) && !isValidTrigger(sourceFile, triggerCharacter, previousToken, position)) {
@@ -182654,7 +182654,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         } else {
           incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.clear();
         }
-        const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program2, log9, preferences, includeSymbol);
+        const stringCompletions = ts_Completions_StringCompletions_exports.getStringLiteralCompletions(sourceFile, position, previousToken, compilerOptions, host, program2, log10, preferences, includeSymbol);
         if (stringCompletions) {
           return stringCompletions;
         }
@@ -182663,7 +182663,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         }
         const completionData = getCompletionData(
           program2,
-          log9,
+          log10,
           sourceFile,
           compilerOptions,
           position,
@@ -182679,7 +182679,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         }
         switch (completionData.kind) {
           case 0:
-            const response = completionInfoFromData(sourceFile, host, program2, compilerOptions, log9, completionData, preferences, formatContext, position, includeSymbol);
+            const response = completionInfoFromData(sourceFile, host, program2, compilerOptions, log10, completionData, preferences, formatContext, position, includeSymbol);
             if (response == null ? void 0 : response.isIncomplete) {
               incompleteCompletionsCache == null ? void 0 : incompleteCompletionsCache.set(response);
             }
@@ -183101,7 +183101,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
       function getOptionalReplacementSpan(location) {
         return (location == null ? void 0 : location.kind) === 80 ? createTextSpanFromNode(location) : void 0;
       }
-      function completionInfoFromData(sourceFile, host, program2, compilerOptions, log9, completionData, preferences, formatContext, position, includeSymbol) {
+      function completionInfoFromData(sourceFile, host, program2, compilerOptions, log10, completionData, preferences, formatContext, position, includeSymbol) {
         const {
           symbols,
           contextToken,
@@ -183165,7 +183165,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           host,
           program2,
           getEmitScriptTarget(compilerOptions),
-          log9,
+          log10,
           completionKind,
           preferences,
           compilerOptions,
@@ -184177,7 +184177,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           return "TypeOnlyAlias/";
         }
       }
-      function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program2, target, log9, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
+      function getCompletionEntriesFromSymbols(symbols, entries, replacementToken, contextToken, location, position, sourceFile, host, program2, target, log10, kind, preferences, compilerOptions, formatContext, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importStatementCompletion, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap, isJsxIdentifierExpected, isRightOfOpenTag, includeSymbol = false) {
         const start = timestamp();
         const closestSymbolDeclaration = getClosestSymbolDeclaration(contextToken, location);
         const useSemicolons = probablyUsesSemicolons(sourceFile);
@@ -184237,7 +184237,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
             true
           );
         }
-        log9("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (timestamp() - start));
+        log10("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (timestamp() - start));
         return {
           has: (name) => uniques.has(name),
           add: (name) => uniques.set(name, true)
@@ -184333,7 +184333,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         }
         return entries;
       }
-      function getSymbolCompletionFromEntryId(program2, log9, sourceFile, position, entryId, host, preferences) {
+      function getSymbolCompletionFromEntryId(program2, log10, sourceFile, position, entryId, host, preferences) {
         if (entryId.source === "SwitchCases/") {
           return { type: "cases" };
         }
@@ -184356,7 +184356,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         const compilerOptions = program2.getCompilerOptions();
         const completionData = getCompletionData(
           program2,
-          log9,
+          log10,
           sourceFile,
           compilerOptions,
           position,
@@ -184381,7 +184381,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           return info && info.name === entryId.name && (entryId.source === "ClassMemberSnippet/" && symbol.flags & 106500 || entryId.source === "ObjectLiteralMethodSnippet/" && symbol.flags & (4 | 8192) || getSourceFromOrigin(origin) === entryId.source || entryId.source === "ObjectLiteralMemberWithComma/") ? { type: "symbol", symbol, location, origin, contextToken, previousToken, isJsxInitializer, isTypeOnlyLocation } : void 0;
         }) || { type: "none" };
       }
-      function getCompletionEntryDetails(program2, log9, sourceFile, position, entryId, host, formatContext, preferences, cancellationToken) {
+      function getCompletionEntryDetails(program2, log10, sourceFile, position, entryId, host, formatContext, preferences, cancellationToken) {
         const typeChecker = program2.getTypeChecker();
         const compilerOptions = program2.getCompilerOptions();
         const { name, source: source2, data } = entryId;
@@ -184389,7 +184389,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         if (isInString(sourceFile, position, previousToken)) {
           return ts_Completions_StringCompletions_exports.getStringLiteralCompletionDetails(name, sourceFile, position, previousToken, program2, host, cancellationToken, preferences);
         }
-        const symbolCompletion = getSymbolCompletionFromEntryId(program2, log9, sourceFile, position, entryId, host, preferences);
+        const symbolCompletion = getSymbolCompletionFromEntryId(program2, log10, sourceFile, position, entryId, host, preferences);
         switch (symbolCompletion.type) {
           case "request": {
             const { request } = symbolCompletion;
@@ -184583,8 +184583,8 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         Debug.assert(!(data == null ? void 0 : data.moduleSpecifier) || moduleSpecifier === data.moduleSpecifier);
         return { sourceDisplay: [textPart(moduleSpecifier)], codeActions: [codeAction] };
       }
-      function getCompletionEntrySymbol(program2, log9, sourceFile, position, entryId, host, preferences) {
-        const completion = getSymbolCompletionFromEntryId(program2, log9, sourceFile, position, entryId, host, preferences);
+      function getCompletionEntrySymbol(program2, log10, sourceFile, position, entryId, host, preferences) {
+        const completion = getSymbolCompletionFromEntryId(program2, log10, sourceFile, position, entryId, host, preferences);
         return completion.type === "symbol" ? completion.symbol : void 0;
       }
       var CompletionKind = /* @__PURE__ */ ((CompletionKind2) => {
@@ -184657,15 +184657,15 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           /* SourceFile */
         ));
       }
-      function getCompletionData(program2, log9, sourceFile, compilerOptions, position, preferences, detailsEntryId, host, formatContext, cancellationToken) {
+      function getCompletionData(program2, log10, sourceFile, compilerOptions, position, preferences, detailsEntryId, host, formatContext, cancellationToken) {
         const typeChecker = program2.getTypeChecker();
         const inCheckedFile = isCheckedFile(sourceFile, compilerOptions);
         let start = timestamp();
         let currentToken = getTokenAtPosition(sourceFile, position);
-        log9("getCompletionData: Get current token: " + (timestamp() - start));
+        log10("getCompletionData: Get current token: " + (timestamp() - start));
         start = timestamp();
         const insideComment = isInComment(sourceFile, position, currentToken);
-        log9("getCompletionData: Is inside comment: " + (timestamp() - start));
+        log10("getCompletionData: Is inside comment: " + (timestamp() - start));
         let insideJsDocTagTypeExpression = false;
         let insideJsDocImportTag = false;
         let isInSnippetScope = false;
@@ -184710,7 +184710,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
             }
           }
           if (!insideJsDocTagTypeExpression && !insideJsDocImportTag) {
-            log9("Returning an empty list because completion was inside a regular comment or plain text part of a JsDoc comment.");
+            log10("Returning an empty list because completion was inside a regular comment or plain text part of a JsDoc comment.");
             return void 0;
           }
         }
@@ -184719,7 +184719,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         const tokens = getRelevantTokens(position, sourceFile);
         const previousToken = tokens.previousToken;
         let contextToken = tokens.contextToken;
-        log9("getCompletionData: Get previous token: " + (timestamp() - start));
+        log10("getCompletionData: Get previous token: " + (timestamp() - start));
         let node = currentToken;
         let propertyAccessToConvert;
         let isRightOfDot = false;
@@ -184752,7 +184752,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
             isNewIdentifierLocation = importStatementCompletionInfo.isNewIdentifierLocation;
           }
           if (!importStatementCompletionInfo.replacementSpan && isCompletionListBlocker(contextToken)) {
-            log9("Returning an empty list because completion was requested in an invalid position.");
+            log10("Returning an empty list because completion was requested in an invalid position.");
             return keywordFilters ? keywordCompletionData(keywordFilters, isJsOnlyLocation, computeCommitCharactersAndIsNewIdentifier().isNewIdentifierLocation) : void 0;
           }
           let parent2 = contextToken.parent;
@@ -184885,7 +184885,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
             return keywordFilters ? keywordCompletionData(keywordFilters, isJsOnlyLocation, isNewIdentifierLocation) : void 0;
           }
         }
-        log9("getCompletionData: Semantic work: " + (timestamp() - semanticStart));
+        log10("getCompletionData: Semantic work: " + (timestamp() - semanticStart));
         const contextualType = previousToken && getContextualType(previousToken, position, sourceFile, typeChecker);
         const isLiteralExpected = !tryCast(previousToken, isStringLiteralLike) && !isJsxIdentifierExpected;
         const literals = !isLiteralExpected ? [] : mapDefined(
@@ -185432,7 +185432,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         function isCompletionListBlocker(contextToken2) {
           const start2 = timestamp();
           const result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken2) || isSolelyIdentifierDefinitionLocation(contextToken2) || isDotOfNumericLiteral(contextToken2) || isInJsxText(contextToken2) || isBigIntLiteral(contextToken2);
-          log9("getCompletionsAtPosition: isCompletionListBlocker: " + (timestamp() - start2));
+          log10("getCompletionsAtPosition: isCompletionListBlocker: " + (timestamp() - start2));
           return result;
         }
         function isInJsxText(contextToken2) {
@@ -186755,7 +186755,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
           values: map2.values.bind(map2)
         };
       }
-      function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program2, log9, preferences, includeSymbol) {
+      function getStringLiteralCompletions(sourceFile, position, contextToken, options, host, program2, log10, preferences, includeSymbol) {
         if (isInReferenceComment(sourceFile, position)) {
           const entries = getTripleSlashReferenceCompletion(sourceFile, position, program2, host, createModuleSpecifierResolutionHost(program2, host));
           return entries && convertPathCompletions(entries);
@@ -186763,10 +186763,10 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
         if (isInString(sourceFile, position, contextToken)) {
           if (!contextToken || !isStringLiteralLike(contextToken)) return void 0;
           const entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, program2, host, preferences);
-          return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program2, log9, options, preferences, position, includeSymbol);
+          return convertStringLiteralCompletions(entries, contextToken, sourceFile, host, program2, log10, options, preferences, position, includeSymbol);
         }
       }
-      function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program2, log9, options, preferences, position, includeSymbol) {
+      function convertStringLiteralCompletions(completion, contextToken, sourceFile, host, program2, log10, options, preferences, position, includeSymbol) {
         if (completion === void 0) {
           return void 0;
         }
@@ -186787,7 +186787,7 @@ ${newComment.split("\n").map((c2) => ` * ${c2}`).join("\n")}
               host,
               program2,
               99,
-              log9,
+              log10,
               4,
               preferences,
               options,
@@ -203287,7 +203287,7 @@ ${options.prefix}` : "\n" : options.prefix
         isEnabled: () => false,
         writeLine: noop
       };
-      function typingToFileName(cachePath, packageName, installTypingHost, log9) {
+      function typingToFileName(cachePath, packageName, installTypingHost, log10) {
         try {
           const result = resolveModuleName(packageName, combinePaths(cachePath, "index.d.ts"), {
             moduleResolution: 2
@@ -203295,8 +203295,8 @@ ${options.prefix}` : "\n" : options.prefix
           }, installTypingHost);
           return result.resolvedModule && result.resolvedModule.resolvedFileName;
         } catch (e) {
-          if (log9.isEnabled()) {
-            log9.writeLine(`Failed to resolve ${packageName} in folder '${cachePath}': ${e.message}`);
+          if (log10.isEnabled()) {
+            log10.writeLine(`Failed to resolve ${packageName} in folder '${cachePath}': ${e.message}`);
           }
           return void 0;
         }
@@ -203323,13 +203323,13 @@ ${options.prefix}` : "\n" : options.prefix
         return { command, remaining: remaining - toSlice };
       }
       var TypingsInstaller = class {
-        constructor(installTypingHost, globalCachePath, safeListPath, typesMapLocation, throttleLimit, log9 = nullLog) {
+        constructor(installTypingHost, globalCachePath, safeListPath, typesMapLocation, throttleLimit, log10 = nullLog) {
           this.installTypingHost = installTypingHost;
           this.globalCachePath = globalCachePath;
           this.safeListPath = safeListPath;
           this.typesMapLocation = typesMapLocation;
           this.throttleLimit = throttleLimit;
-          this.log = log9;
+          this.log = log10;
           this.packageNameToTypingLocation = /* @__PURE__ */ new Map();
           this.missingTypingsSet = /* @__PURE__ */ new Set();
           this.knownCachesSet = /* @__PURE__ */ new Set();
@@ -203827,13 +203827,13 @@ ${options.prefix}` : "\n" : options.prefix
         }
         static run(self2) {
           self2.timerId = void 0;
-          const log9 = self2.logger.hasLevel(
+          const log10 = self2.logger.hasLevel(
             2
             /* requestTime */
           );
-          const before = log9 && self2.host.getMemoryUsage();
+          const before = log10 && self2.host.getMemoryUsage();
           self2.host.gc();
-          if (log9) {
+          if (log10) {
             const after = self2.host.getMemoryUsage();
             self2.logger.perftrc(`GC::before ${before}, after ${after}`);
           }
@@ -204759,17 +204759,17 @@ ${options.prefix}` : "\n" : options.prefix
           updateProjectIfDirty(this);
           return hasOneOrMoreJsAndNoTsFiles(this);
         }
-        static resolveModule(moduleName, initialDir, host, log9) {
-          return _Project.importServicePluginSync({ name: moduleName }, [initialDir], host, log9).resolvedModule;
+        static resolveModule(moduleName, initialDir, host, log10) {
+          return _Project.importServicePluginSync({ name: moduleName }, [initialDir], host, log10).resolvedModule;
         }
         /** @internal */
-        static importServicePluginSync(pluginConfigEntry, searchPaths, host, log9) {
+        static importServicePluginSync(pluginConfigEntry, searchPaths, host, log10) {
           Debug.assertIsDefined(host.require);
           let errorLogs;
           let resolvedModule;
           for (const initialDir of searchPaths) {
             const resolvedPath = normalizeSlashes(host.resolvePath(combinePaths(initialDir, "node_modules")));
-            log9(`Loading ${pluginConfigEntry.name} from ${initialDir} (resolved to ${resolvedPath})`);
+            log10(`Loading ${pluginConfigEntry.name} from ${initialDir} (resolved to ${resolvedPath})`);
             const result = host.require(resolvedPath, pluginConfigEntry.name);
             if (!result.error) {
               resolvedModule = result.module;
@@ -204781,13 +204781,13 @@ ${options.prefix}` : "\n" : options.prefix
           return { pluginConfigEntry, resolvedModule, errorLogs };
         }
         /** @internal */
-        static async importServicePluginAsync(pluginConfigEntry, searchPaths, host, log9) {
+        static async importServicePluginAsync(pluginConfigEntry, searchPaths, host, log10) {
           Debug.assertIsDefined(host.importPlugin);
           let errorLogs;
           let resolvedModule;
           for (const initialDir of searchPaths) {
             const resolvedPath = combinePaths(initialDir, "node_modules");
-            log9(`Dynamically importing ${pluginConfigEntry.name} from ${initialDir} (resolved to ${resolvedPath})`);
+            log10(`Dynamically importing ${pluginConfigEntry.name} from ${initialDir} (resolved to ${resolvedPath})`);
             let result;
             try {
               result = await host.importPlugin(resolvedPath, pluginConfigEntry.name);
@@ -207594,7 +207594,7 @@ ${options.prefix}` : "\n" : options.prefix
             3
             /* verbose */
           ) ? 2 : this.logger.loggingEnabled() ? 1 : 0;
-          const log9 = watchLogLevel !== 0 ? (s) => this.logger.info(s) : noop;
+          const log10 = watchLogLevel !== 0 ? (s) => this.logger.info(s) : noop;
           this.packageJsonCache = createPackageJsonCache(this);
           this.watchFactory = this.serverMode !== 0 ? {
             watchFile: returnNoopFileWatcher,
@@ -207602,7 +207602,7 @@ ${options.prefix}` : "\n" : options.prefix
           } : getWatchFactory(
             createWatchFactoryHostUsingWatchEvents(this, opts.canUseWatchEvents) || this.host,
             watchLogLevel,
-            log9,
+            log10,
             getDetailWatchInfo
           );
           this.canUseWatchEvents = getCanUseWatchEvents(this, opts.canUseWatchEvents);
@@ -235178,7 +235178,7 @@ var require_node = __commonJS({
     var tty = __require("tty");
     var util2 = __require("util");
     exports$1.init = init;
-    exports$1.log = log9;
+    exports$1.log = log10;
     exports$1.formatArgs = formatArgs;
     exports$1.save = save;
     exports$1.load = load3;
@@ -235313,7 +235313,7 @@ var require_node = __commonJS({
       }
       return (/* @__PURE__ */ new Date()).toISOString() + " ";
     }
-    function log9(...args) {
+    function log10(...args) {
       return process.stderr.write(util2.formatWithOptions(exports$1.inspectOpts, ...args) + "\n");
     }
     function save(namespaces) {
@@ -274614,7 +274614,7 @@ var V = class extends EventEmitter {
 };
 var vi = realpathSync.native;
 var wt = { lstatSync: lstatSync, readdir: readdir$1, readdirSync: readdirSync, readlinkSync: readlinkSync, realpathSync: vi, promises: { lstat: lstat, readdir: readdir, readlink: readlink, realpath: realpath } };
-var Ue = (n9) => !n9 || n9 === wt || n9 === fs4 ? wt : { ...wt, ...n9, promises: { ...wt.promises, ...n9.promises || {} } };
+var Ue = (n9) => !n9 || n9 === wt || n9 === fs5 ? wt : { ...wt, ...n9, promises: { ...wt.promises, ...n9.promises || {} } };
 var $e = /^\\\\\?\\([a-z]:)\\?$/i;
 var Ri = (n9) => n9.replace(/\//g, "\\").replace($e, "$1\\");
 var Oi = /[\\\/]/;
@@ -276241,11 +276241,11 @@ var DEFAULT_CANVAS_CONFIG = {
 };
 function loadCanvasConfig() {
   const configPath = path7.resolve(process.cwd(), "canvas.config.json");
-  if (!fs4__default.existsSync(configPath)) {
+  if (!fs5__default.existsSync(configPath)) {
     return { ...DEFAULT_CANVAS_CONFIG };
   }
   try {
-    const raw = fs4__default.readFileSync(configPath, "utf-8");
+    const raw = fs5__default.readFileSync(configPath, "utf-8");
     const parsed = JSON.parse(raw);
     return {
       aliasBaseDir: parsed.aliasBaseDir ?? DEFAULT_CANVAS_CONFIG.aliasBaseDir,
@@ -276266,12 +276266,12 @@ function loadEnvFiles() {
   const homeDir = process.env.HOME || process.env.USERPROFILE || "";
   if (homeDir) {
     const homeEnvPath = path7.resolve(homeDir, ".canvasrc");
-    if (fs4__default.existsSync(homeEnvPath)) {
+    if (fs5__default.existsSync(homeEnvPath)) {
       dotenv.config({ path: homeEnvPath });
     }
   }
   const localEnvPath = path7.resolve(process.cwd(), ".env");
-  if (fs4__default.existsSync(localEnvPath)) {
+  if (fs5__default.existsSync(localEnvPath)) {
     dotenv.config({ path: localEnvPath });
   }
 }
@@ -276296,6 +276296,75 @@ function getConfig() {
 function setConfig(newConfig) {
   config = { ...config, ...newConfig };
 }
+var legacyComponentDirMigrationHandled = false;
+async function handleLegacyComponentDirMigration(options = {}) {
+  if (legacyComponentDirMigrationHandled) {
+    return;
+  }
+  legacyComponentDirMigrationHandled = true;
+  const legacyComponentDir = process.env.CANVAS_COMPONENT_DIR?.trim();
+  if (!legacyComponentDir) {
+    return;
+  }
+  const configPath = path7.resolve(process.cwd(), "canvas.config.json");
+  const hasConfigFile = fs5__default.existsSync(configPath);
+  let parsedConfig = null;
+  let configParseError = false;
+  if (hasConfigFile) {
+    try {
+      const raw = fs5__default.readFileSync(configPath, "utf-8");
+      const parsed = JSON.parse(raw);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        parsedConfig = parsed;
+      } else {
+        configParseError = true;
+      }
+    } catch {
+      configParseError = true;
+    }
+  }
+  const hasComponentDirConfig = typeof parsedConfig?.componentDir === "string" && parsedConfig.componentDir.trim().length > 0;
+  if (hasComponentDirConfig) {
+    return;
+  }
+  p10.log.warn(
+    "CANVAS_COMPONENT_DIR is deprecated for component directory configuration. Use componentDir in canvas.config.json instead."
+  );
+  setConfig({
+    componentDir: legacyComponentDir,
+    deprecatedComponentDir: legacyComponentDir
+  });
+  if (configParseError) {
+    p10.log.warn(
+      "canvas.config.json exists but is invalid. Update it manually by adding a componentDir key."
+    );
+    return;
+  }
+  if (options.skipPrompt) {
+    p10.log.info(
+      `Add "componentDir": "${legacyComponentDir}" to canvas.config.json to persist this setting.`
+    );
+    return;
+  }
+  const shouldWriteConfig = await p10.confirm({
+    message: hasConfigFile ? `Add "componentDir": "${legacyComponentDir}" to canvas.config.json?` : `Create canvas.config.json with "componentDir": "${legacyComponentDir}"?`,
+    initialValue: true
+  });
+  if (p10.isCancel(shouldWriteConfig) || !shouldWriteConfig) {
+    p10.log.info(
+      `Skipped config update. You can set "componentDir": "${legacyComponentDir}" in canvas.config.json later.`
+    );
+    return;
+  }
+  const nextConfig = hasConfigFile ? { ...parsedConfig ?? {}, componentDir: legacyComponentDir } : { componentDir: legacyComponentDir };
+  fs5__default.writeFileSync(
+    configPath,
+    `${JSON.stringify(nextConfig, null, 2)}
+`,
+    "utf-8"
+  );
+  p10.log.info("Updated canvas.config.json with componentDir.");
+}
 async function ensureConfig(requiredKeys) {
   const config2 = getConfig();
   const missingKeys = requiredKeys.filter((key2) => !config2[key2]);
@@ -276484,7 +276553,7 @@ function vitePluginSvgr({ svgrOptions, esbuildOptions, include = "**/*.svg?react
         const { transform } = await Promise.resolve().then(() => __toESM(require_dist2(), 1));
         const { default: jsx } = await Promise.resolve().then(() => __toESM(require_dist14(), 1));
         const filePath = id.replace(postfixRE, "");
-        const svgCode = await fs4__default.promises.readFile(filePath, "utf8");
+        const svgCode = await fs5__default.promises.readFile(filePath, "utf8");
         const componentCode = await transform(svgCode, svgrOptions, {
           filePath,
           caller: {
@@ -289978,6 +290047,12 @@ uploadCommand(program);
 buildDeprecatedCommand(program);
 validateCommand(program);
 buildCommand(program);
+program.hook("preAction", async (command) => {
+  const commandOptions = command.opts?.();
+  await handleLegacyComponentDirMigration({
+    skipPrompt: Boolean(commandOptions?.yes)
+  });
+});
 program.showHelpAfterError();
 program.showSuggestionAfterError(true);
 try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@drupal-canvas/cli",
   "description": "CLI tool for managing Drupal Canvas code components",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "GPL-2.0-or-later",
   "repository": {
     "type": "git",