@uniformdev/cli 19.79.0 → 19.79.1-alpha.11

package/dist/index.mjs

@@ -691,8 +691,10 @@ var urlToFileName = (url) => {
   return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
 };
 var deleteDownloadedFileByUrl = async (url, options) => {
+  const isPackage = isPathAPackageFile(options.directory);
+  const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
   const fileName = urlToFileName(url);
-  const fileToDelete = join2(options.directory, FILES_DIRECTORY_NAME, fileName);
+  const fileToDelete = join2(writeDirectory, FILES_DIRECTORY_NAME, fileName);
   try {
     await fsj.removeAsync(fileToDelete);
   } catch {
@@ -704,6 +706,8 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
   const uniformFileUrlMatches = objectAsString.matchAll(
     /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
   );
+  const isPackage = isPathAPackageFile(options.directory);
+  const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
   if (uniformFileUrlMatches) {
     const fileDownloadQueue = new PQueue({ concurrency: 10 });
     for (const match of uniformFileUrlMatches) {
@@ -713,7 +717,7 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
           const fetchUrl = `${url.origin}${url.pathname}?format=original`;
           const fileName = urlToFileName(url.toString());
           const fileAlreadyExists = await fsj.existsAsync(
-            join2(options.directory, FILES_DIRECTORY_NAME, fileName)
+            join2(writeDirectory, FILES_DIRECTORY_NAME, fileName)
           );
           if (fileAlreadyExists) {
             return;
@@ -723,8 +727,6 @@ var extractAndDownloadUniformFilesForObject = async (object, options) => {
             return;
           }
           const fileBuffer = await response.arrayBuffer();
-          const isPackage = isPathAPackageFile(options.directory);
-          const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
           await fsj.writeAsync(join2(writeDirectory, FILES_DIRECTORY_NAME, fileName), Buffer.from(fileBuffer));
         } catch {
           console.warn(`Failed to download file ${url}`);
@@ -740,6 +742,8 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
   const uniformFileUrlMatches = objectAsString.matchAll(
     /"(https:\/\/(.*)?img\.uniform\.(rocks|global)\/(.*?))"/g
   );
+  const isPackage = isPathAPackageFile(options.directory);
+  const writeDirectory = isPackage ? dirname2(options.directory) : options.directory;
   if (uniformFileUrlMatches) {
     const fileUploadQueue = new PQueue({ concurrency: 3 });
     for (const match of uniformFileUrlMatches) {
@@ -756,14 +760,14 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
           }
           const localFileName = urlToFileName(url);
           const fileExistsLocally = await fsj.existsAsync(
-            join2(options.directory, FILES_DIRECTORY_NAME, localFileName)
+            join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName)
           );
           if (!fileExistsLocally) {
             console.warn(`Skipping file ${url} as we couldn't find a local copy`);
             return;
           }
           const fileBuffer = await fsj.readAsync(
-            join2(options.directory, FILES_DIRECTORY_NAME, localFileName),
+            join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName),
             "buffer"
           );
           if (!fileBuffer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.79.0",
+  "version": "19.79.1-alpha.11+4547ef846",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -17,12 +17,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.79.0",
-    "@uniformdev/canvas": "19.79.0",
-    "@uniformdev/context": "19.79.0",
-    "@uniformdev/files": "19.79.0",
-    "@uniformdev/project-map": "19.79.0",
-    "@uniformdev/redirect": "19.79.0",
+    "@uniformdev/assets": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/canvas": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/context": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/files": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/project-map": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/redirect": "19.79.1-alpha.11+4547ef846",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "8.3.6",
@@ -69,5 +69,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "78f5ededbaa1a67d58d808eac23ab64769e14e10"
+  "gitHead": "4547ef8469f21f7f2341bcd87203372c4646bc08"
 }