@uniformdev/cli 19.214.1-alpha.10 → 19.214.1-alpha.17

package/dist/index.mjs

@@ -618,7 +618,6 @@ var AssetListModule = {
 // src/files/index.ts
 import { preferredType } from "@thi.ng/mime";
 import { FILE_READY_STATE, getFileNameFromUrl } from "@uniformdev/files";
-import { createHash } from "crypto";
 import { fileTypeFromBuffer } from "file-type";
 import fsj from "fs-jetpack";
 import sizeOf from "image-size";
@@ -742,20 +741,16 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
   let objectAsString = JSON.stringify(object);
   const uniformFileUrlMatches = getUniformFileUrlMatches(objectAsString);
   const writeDirectory = getFilesDirectory(options.directory);
-  const isPackage = isPathAPackageFile(options.directory);
-  const legacyWriteDirectory = isPackage ? dirname(options.directory) : options.directory;
   if (uniformFileUrlMatches) {
     const fileUploadQueue = new PQueue({ concurrency: 3 });
     for (const match of uniformFileUrlMatches) {
       const url = match[1];
       const hash = urlToHash(url);
-      const legacyHash = legacyUrlToHash(url);
       fileUploadQueue.add(async () => {
         try {
           const fileAlreadyExistsChecks = await Promise.all([
             options.fileClient.get({ url }).catch(() => null),
-            options.fileClient.get({ sourceId: hash }).catch(() => null),
-            options.fileClient.get({ sourceId: legacyHash }).catch(() => null)
+            options.fileClient.get({ sourceId: hash }).catch(() => null)
           ]);
           const file = fileAlreadyExistsChecks.find((check) => check !== null);
           if (file) {
@@ -763,13 +758,8 @@ var extractAndUploadUniformFilesForObject = async (object, options) => {
             return;
           }
           const localFileName = urlToFileName(url);
-          let expectedFilePath = join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
-          let fileExistsLocally = await fsj.existsAsync(expectedFilePath);
-          if (!fileExistsLocally) {
-            const localFileName2 = legacyUrlToFileName(url);
-            expectedFilePath = join2(legacyWriteDirectory, FILES_DIRECTORY_NAME, localFileName2);
-            fileExistsLocally = await fsj.existsAsync(expectedFilePath);
-          }
+          const expectedFilePath = join2(writeDirectory, FILES_DIRECTORY_NAME, localFileName);
+          const fileExistsLocally = await fsj.existsAsync(expectedFilePath);
           if (!fileExistsLocally) {
             console.warn(
               `Skipping file ${url} as we couldn't find a local copy (looked at ${expectedFilePath})`
@@ -860,13 +850,11 @@ var swapOutUniformFileUrlsForTargetProject = async (object, options) => {
     for (const match of uniformFileUrlMatches) {
       const url = match[1];
       const hash = urlToHash(url);
-      const legacyHash = legacyUrlToHash(url);
       fileUrlReplacementQueue.add(async () => {
         try {
           const fileAlreadyExistsChecks = await Promise.all([
             options.fileClient.get({ url }).catch(() => null),
-            options.fileClient.get({ sourceId: hash }).catch(() => null),
-            options.fileClient.get({ sourceId: legacyHash }).catch(() => null)
+            options.fileClient.get({ sourceId: hash }).catch(() => null)
           ]);
           const file = fileAlreadyExistsChecks.find((check) => check !== null);
           if (!file) {
@@ -938,16 +926,6 @@ var updateAssetFileIdBasedOnUrl = async (asset, options) => {
   };
   return asset;
 };
-var legacyUrlToHash = (url) => {
-  const hash = createHash("sha256");
-  hash.update(url);
-  return hash.digest("hex");
-};
-var legacyUrlToFileName = (url) => {
-  const fileName = legacyUrlToHash(url);
-  const fileExtension = urlToFileExtension(url);
-  return `${fileName}${fileExtension ? `.${fileExtension}` : ""}`;
-};
 
 // src/commands/canvas/assetEngineDataSource.ts
 import { convertAssetToPutAsset } from "@uniformdev/assets";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/cli",
-  "version": "19.214.1-alpha.10+98dac3377a",
+  "version": "19.214.1-alpha.17+15e689c12c",
   "description": "Uniform command line interface tool",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./cli.js",
@@ -27,12 +27,12 @@
   },
   "dependencies": {
     "@thi.ng/mime": "^2.2.23",
-    "@uniformdev/assets": "19.214.1-alpha.10+98dac3377a",
-    "@uniformdev/canvas": "19.214.1-alpha.10+98dac3377a",
-    "@uniformdev/context": "19.214.1-alpha.10+98dac3377a",
-    "@uniformdev/files": "19.214.1-alpha.10+98dac3377a",
-    "@uniformdev/project-map": "19.214.1-alpha.10+98dac3377a",
-    "@uniformdev/redirect": "19.214.1-alpha.10+98dac3377a",
+    "@uniformdev/assets": "19.214.1-alpha.17+15e689c12c",
+    "@uniformdev/canvas": "19.214.1-alpha.17+15e689c12c",
+    "@uniformdev/context": "19.214.1-alpha.17+15e689c12c",
+    "@uniformdev/files": "19.214.1-alpha.17+15e689c12c",
+    "@uniformdev/project-map": "19.214.1-alpha.17+15e689c12c",
+    "@uniformdev/redirect": "19.214.1-alpha.17+15e689c12c",
     "call-bind": "^1.0.2",
     "colorette": "2.0.20",
     "cosmiconfig": "9.0.0",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "98dac3377a8313b1d70d0b02632a6a7192f2409c"
+  "gitHead": "15e689c12ce848ce17d170f9be8c6f3d2c29ffe1"
 }