@shopify/oxygen-cli 1.8.2 → 1.9.0

package/dist/deploy/get-upload-files.js

@@ -21,7 +21,8 @@ async function getUploadFiles(config) {
       ...createManifestEntries({
         files: assetFiles,
         basePath: assetPath,
-        type: FileType.Asset
+        type: FileType.Asset,
+        filter: assetFileFilter
       })
     ];
   }
@@ -36,7 +37,7 @@ function createManifestEntries(params) {
   const manifest = [];
   files.forEach((file) => {
     const filePath = relativePath(basePath, file);
-    if (filter && !filter(filePath, type)) {
+    if (filter && !filter(filePath)) {
       return;
     }
     manifest.push({
@@ -49,17 +50,20 @@ function createManifestEntries(params) {
   });
   return manifest;
 }
-function workerFileFilter(fileName, type) {
-  if (type === FileType.Asset) {
-    return true;
-  }
+function workerFileFilter(fileName) {
   const allowedExtensions = [".js.map", ".mjs.map", ".map", ".js", ".mjs"];
   const allowedFilenames = ["index"];
   const regexString = `^(${allowedFilenames.join(
     "|"
   )})(${allowedExtensions.join("|")})$`;
   const regex = new RegExp(regexString);
-  return regex.test(fileName);
+  return regex.test(fileName.toLowerCase());
+}
+function assetFileFilter(fileName) {
+  const disallowedExtensions = [".map"];
+  const regexString = `(${disallowedExtensions.join("|")})$`;
+  const regex = new RegExp(regexString);
+  return !regex.test(fileName.toLowerCase());
 }
 
 export { getUploadFiles };

package/dist/deploy/get-upload-files.test.js

@@ -38,7 +38,7 @@ describe("GetUploadFiles", () => {
     ];
     expect(manifest).toEqual(expectedManifest);
   });
-  test("GetUploadFiles manifest does not included non-worker files", async () => {
+  test("GetUploadFiles manifest does not include non-worker files", async () => {
     await touchFile(`${rootFolder}/worker/image.jpg`);
     await touchFile(`${rootFolder}/worker/worker.ts`);
     await touchFile(`${rootFolder}/worker/index.js.map`);
@@ -53,4 +53,15 @@ describe("GetUploadFiles", () => {
     expect(workerFileExist("index.js.map")).toBe(true);
     expect(workerFileExist("index.js")).toBe(true);
   });
+  test("GetUploadFiles manifest does not include source map files in assets", async () => {
+    const testFilename = "index.js.MaP";
+    await touchFile(`${rootFolder}/assets/${testFilename}`);
+    const manifest = await getUploadFiles(testConfig);
+    const assetSourcemapFileExist = (fileName) => {
+      return manifest.some(
+        (file) => file.filePath === fileName && file.fileType === FileType.Asset
+      );
+    };
+    expect(assetSourcemapFileExist(testFilename)).toBe(false);
+  });
 });

package/dist/deploy/metadata.js

@@ -45,20 +45,31 @@ function createLabels(metadata) {
     const label = `${labelKey}=${JSON.stringify(labelValue)}`;
     labels.push(label);
   };
-  if (metadata.name !== "unknown" && metadata.run) {
-    labels.push(`${metadata.name}-runId=${JSON.stringify(metadata.run)}`);
+  if (metadata.name !== "unknown") {
+    const keyMapping2 = {
+      attempt: "attempt",
+      run: "runId"
+    };
+    for (const [key, value] of Object.entries(keyMapping2)) {
+      const metadataKey = key;
+      if (metadata[metadataKey]) {
+        labels.push(
+          `${metadata.name}-${value}=${JSON.stringify(metadata[metadataKey])}`
+        );
+      }
+    }
   }
-  const keys = ["url", "actor", "commitSha"];
   const keyMapping = {
     actor: "user",
-    commitSha: "version"
+    commitSha: "version",
+    url: "url"
   };
-  keys.forEach((key) => {
-    if (metadata[key]) {
-      const labelKey = keyMapping[key] || key;
-      checkLabel(labelKey, metadata[key]);
+  for (const [key, value] of Object.entries(keyMapping)) {
+    const metadataKey = key;
+    if (metadata[metadataKey]) {
+      checkLabel(value, metadata[metadataKey]);
     }
-  });
+  }
   return labels;
 }
 

package/dist/deploy/metadata.test.js

@@ -105,18 +105,19 @@ describe("createLabels", () => {
     };
     const labels = [
       'circle-runId="circle_1234"',
-      'url="http://circleci.com/workflow/123"',
       'user="circle_actor"',
-      'version="circle_sha"'
+      'version="circle_sha"',
+      'url="http://circleci.com/workflow/123"'
     ];
     expect(createLabels(metadata)).toEqual(labels);
   });
   test("should return labels from metadata only for populated fields", () => {
     const metadata = {
       name: "circle",
-      run: "circle_run"
+      run: "circle_run",
+      attempt: "1"
     };
-    const labels = ['circle-runId="circle_run"'];
+    const labels = ['circle-attempt="1"', 'circle-runId="circle_run"'];
     expect(createLabels(metadata)).toEqual(labels);
   });
   test("should throw when user metadata exceeds maximum length", () => {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.8.2",
+  "version": "1.9.0",
   "commands": {
     "oxygen:deploy": {
       "id": "oxygen:deploy",

package/package.json

@@ -5,7 +5,7 @@
     "@shopify:registry": "https://registry.npmjs.org"
   },
   "license": "MIT",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "type": "module",
   "scripts": {
     "build": "tsup --clean --config ./tsup.config.ts && oclif manifest",
@@ -34,24 +34,24 @@
     "/oclif.manifest.json"
   ],
   "dependencies": {
-    "@oclif/core": "2.11.5",
-    "@shopify/cli-kit": "^3.48.0",
+    "@oclif/core": "2.11.8",
+    "@shopify/cli-kit": "nightly",
     "async": "^3.2.4"
   },
   "devDependencies": {
     "@changesets/cli": "^2.26.1",
-    "@shopify/eslint-plugin": "^42.1.0",
+    "@shopify/eslint-plugin": "^43.0.0",
     "@shopify/prettier-config": "^1.1.2",
     "@types/async": "^3.2.18",
-    "@types/node": "^20.4.5",
-    "@types/prettier": "^3.0.0",
-    "eslint": "^8.46.0",
+    "@types/node": "^20.5.0",
+    "eslint": "^8.47.0",
+    "eslint-plugin-prettier": "^5.0.0",
     "node-fetch": "^3.3.2",
     "oclif": "^3",
-    "tsup": "^7.1.0",
+    "tsup": "^7.2.0",
     "typescript": "^5.1.3",
-    "vite": "^4.4.8",
-    "vitest": "^0.33.0"
+    "vite": "^4.4.9",
+    "vitest": "^0.34.1"
   },
   "prettier": "@shopify/prettier-config",
   "oclif": {