@argos-ci/core 0.9.0 → 0.11.0

package/dist/index.cjs

@@ -1,5 +1,5 @@
 exports.upload = async (params)=>{
     // @ts-ignore
-    const { upload  } = await import('./index.mjs');
+    const { upload } = await import('./index.mjs');
     return upload(params);
 };

package/dist/index.d.ts

@@ -41,4 +41,4 @@ declare const upload: (params: UploadParameters) => Promise<{
     }[];
 }>;
 
-export { UploadParameters, upload };
+export { type UploadParameters, upload };

package/dist/index.mjs

@@ -144,10 +144,10 @@ const createConfig = ()=>{
     }
 };
 
-const service$4 = {
+const service$5 = {
     name: "Buildkite",
-    detect: ({ env  })=>Boolean(env.BUILDKITE),
-    config: ({ env  })=>{
+    detect: ({ env })=>Boolean(env.BUILDKITE),
+    config: ({ env })=>{
         return {
             // Buildkite doesn't work well so we fallback to git to ensure we have commit and branch
             commit: env.BUILDKITE_COMMIT || head() || null,
@@ -162,10 +162,10 @@ const service$4 = {
     }
 };
 
-const service$3 = {
+const service$4 = {
     name: "Heroku",
-    detect: ({ env  })=>Boolean(env.HEROKU_TEST_RUN_ID),
-    config: ({ env  })=>({
+    detect: ({ env })=>Boolean(env.HEROKU_TEST_RUN_ID),
+    config: ({ env })=>({
             commit: env.HEROKU_TEST_RUN_COMMIT_VERSION || null,
             branch: env.HEROKU_TEST_RUN_BRANCH || null,
             owner: null,
@@ -177,7 +177,7 @@ const service$3 = {
         })
 };
 
-const getBranch = ({ env  })=>{
+const getBranch = ({ env })=>{
     if (env.GITHUB_HEAD_REF) {
         return env.GITHUB_HEAD_REF;
     }
@@ -188,19 +188,19 @@ const getBranch = ({ env  })=>{
     }
     return null;
 };
-const getRepository$1 = ({ env  })=>{
+const getRepository$1 = ({ env })=>{
     if (!env.GITHUB_REPOSITORY) return null;
     return env.GITHUB_REPOSITORY.split("/")[1];
 };
-const readEventPayload = ({ env  })=>{
+const readEventPayload = ({ env })=>{
     if (!env.GITHUB_EVENT_PATH) return null;
     if (!existsSync(env.GITHUB_EVENT_PATH)) return null;
     return JSON.parse(readFileSync(env.GITHUB_EVENT_PATH, "utf-8"));
 };
-const service$2 = {
+const service$3 = {
     name: "GitHub Actions",
-    detect: ({ env  })=>Boolean(env.GITHUB_ACTIONS),
-    config: ({ env  })=>{
+    detect: ({ env })=>Boolean(env.GITHUB_ACTIONS),
+    config: ({ env })=>{
         const payload = readEventPayload({
             env
         });
@@ -221,7 +221,7 @@ const service$2 = {
     }
 };
 
-const getPrNumber$1 = ({ env  })=>{
+const getPrNumber$1 = ({ env })=>{
     const branchRegex = /pull\/(\d+)/;
     const matches = branchRegex.exec(env.CIRCLE_PULL_REQUEST || "");
     if (matches) {
@@ -229,10 +229,10 @@ const getPrNumber$1 = ({ env  })=>{
     }
     return null;
 };
-const service$1 = {
+const service$2 = {
     name: "CircleCI",
-    detect: ({ env  })=>Boolean(env.CIRCLECI),
-    config: ({ env  })=>{
+    detect: ({ env })=>Boolean(env.CIRCLECI),
+    config: ({ env })=>{
         return {
             commit: env.CIRCLE_SHA1 || null,
             branch: env.CIRCLE_BRANCH || null,
@@ -248,23 +248,23 @@ const service$1 = {
     }
 };
 
-const getOwner = ({ env  })=>{
+const getOwner = ({ env })=>{
     if (!env.TRAVIS_REPO_SLUG) return null;
     return env.TRAVIS_REPO_SLUG.split("/")[0] || null;
 };
-const getRepository = ({ env  })=>{
+const getRepository = ({ env })=>{
     if (!env.TRAVIS_REPO_SLUG) return null;
     return env.TRAVIS_REPO_SLUG.split("/")[1] || null;
 };
-const getPrNumber = ({ env  })=>{
+const getPrNumber = ({ env })=>{
     if (env.TRAVIS_PULL_REQUEST) return Number(env.TRAVIS_PULL_REQUEST);
     return null;
 };
-const service = {
+const service$1 = {
     name: "Travis CI",
-    detect: ({ env  })=>Boolean(env.TRAVIS),
+    detect: ({ env })=>Boolean(env.TRAVIS),
     config: (ctx)=>{
-        const { env  } = ctx;
+        const { env } = ctx;
         return {
             commit: env.TRAVIS_COMMIT || null,
             branch: env.TRAVIS_BRANCH || null,
@@ -278,6 +278,23 @@ const service = {
     }
 };
 
+const service = {
+    name: "GitLab",
+    detect: ({ env })=>env.GITLAB_CI === "true",
+    config: ({ env })=>{
+        return {
+            commit: env.CI_COMMIT_SHA || null,
+            branch: env.CI_COMMIT_REF_NAME || null,
+            owner: null,
+            repository: null,
+            jobId: null,
+            runId: null,
+            prNumber: null,
+            prHeadCommit: null
+        };
+    }
+};
+
 const KEY = "@argos-ci/core";
 const debug = createDebug(KEY);
 const debugTime = (arg)=>{
@@ -319,13 +336,14 @@ const getCiEnvironmentFromEnvCi = (ctx)=>{
 };
 
 const services = [
+    service$4,
     service$3,
     service$2,
     service$1,
-    service,
-    service$4
+    service$5,
+    service
 ];
-const getCiEnvironment = ({ env =process.env  } = {})=>{
+const getCiEnvironment = ({ env = process.env } = {})=>{
     const ctx = {
         env
     };
@@ -346,12 +364,12 @@ const getCiEnvironment = ({ env =process.env  } = {})=>{
     }
     // We fallback on "env-ci" library, not very good but it's better than nothing
     debug("Falling back on env-ci");
-    const ciEnvironment1 = getCiEnvironmentFromEnvCi(ctx);
-    debug("CI environment", ciEnvironment1);
-    return ciEnvironment1;
+    const ciEnvironment = getCiEnvironmentFromEnvCi(ctx);
+    debug("CI environment", ciEnvironment);
+    return ciEnvironment;
 };
 
-const discoverScreenshots = async (patterns, { root =process.cwd() , ignore  } = {})=>{
+const discoverScreenshots = async (patterns, { root = process.cwd(), ignore } = {})=>{
     const matches = await glob(patterns, {
         onlyFiles: true,
         ignore,
@@ -388,7 +406,7 @@ const hashFile = async (filepath)=>{
 };
 
 const base64Encode = (obj)=>Buffer.from(JSON.stringify(obj), "utf8").toString("base64");
-const getBearerToken = ({ token , ciService , owner , repository , jobId , runId , prNumber  })=>{
+const getBearerToken = ({ token, ciService, owner, repository, jobId, runId, prNumber })=>{
     if (token) return `Bearer ${token}`;
     switch(ciService){
         case "GitHub Actions":
@@ -449,7 +467,7 @@ const createArgosApiClient = (options)=>{
             return call("POST", "/builds", input);
         },
         updateBuild: async (input)=>{
-            const { buildId , ...body } = input;
+            const { buildId, ...body } = input;
             return call("PUT", `/builds/${buildId}`, body);
         }
     };
@@ -487,12 +505,12 @@ const getConfigFromOptions = (options)=>{
     const config = createConfig();
     const ciEnv = getCiEnvironment();
     config.load({
-        apiBaseUrl: config.get("apiBaseUrl") ?? options.apiBaseUrl,
-        commit: config.get("commit") ?? options.commit ?? ciEnv?.commit ?? null,
-        branch: config.get("branch") ?? options.branch ?? ciEnv?.branch ?? null,
-        token: config.get("token") ?? options.token ?? null,
-        buildName: config.get("buildName") ?? options.buildName ?? null,
-        prNumber: config.get("prNumber") ?? options.prNumber ?? ciEnv?.prNumber ?? null,
+        apiBaseUrl: options.apiBaseUrl ?? config.get("apiBaseUrl"),
+        commit: options.commit ?? config.get("commit") ?? ciEnv?.commit ?? null,
+        branch: options.branch ?? config.get("branch") ?? ciEnv?.branch ?? null,
+        token: options.token ?? config.get("token") ?? null,
+        buildName: options.buildName ?? config.get("buildName") ?? null,
+        prNumber: options.prNumber ?? config.get("prNumber") ?? ciEnv?.prNumber ?? null,
         prHeadCommit: config.get("prHeadCommit") ?? ciEnv?.prHeadCommit ?? null,
         ciService: ciEnv?.name ?? null,
         owner: ciEnv?.owner ?? null,
@@ -560,7 +578,7 @@ const getConfigFromOptions = (options)=>{
         debug(`Uploading chunk ${i + 1}/${chunks.length}`);
         const timeLabel = `Chunk ${i + 1}/${chunks.length}`;
         debugTime(timeLabel);
-        await Promise.all(chunks[i].map(async ({ key , putUrl  })=>{
+        await Promise.all(chunks[i].map(async ({ key, putUrl })=>{
             const screenshot = screenshots.find((s)=>s.hash === key);
             if (!screenshot) {
                 throw new Error(`Invariant: screenshot with hash ${key} not found`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Visual testing solution to avoid visual regression. The core component of Argos SDK that handles build creation.",
-  "version": "0.9.0",
+  "version": "0.11.0",
   "scripts": {
     "prebuild": "rm -rf dist",
     "build": "rollup -c",
@@ -29,7 +29,7 @@
     "url": "https://github.com/argos-ci/argos-javascript/issues"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
   "license": "MIT",
   "keywords": [
@@ -45,20 +45,21 @@
     "access": "public"
   },
   "dependencies": {
-    "axios": "1.1.2",
-    "convict": "^6.2.3",
+    "axios": "^1.5.0",
+    "convict": "^6.2.4",
     "debug": "^4.3.4",
-    "env-ci": "^7.3.0",
-    "fast-glob": "^3.2.12",
-    "sharp": "^0.31.1",
+    "env-ci": "^9.1.1",
+    "fast-glob": "^3.3.1",
+    "sharp": "^0.32.5",
     "tmp": "^0.2.1"
   },
   "devDependencies": {
-    "@types/convict": "^6.1.1",
-    "msw": "^0.47.4",
-    "rollup": "^2.79.1",
-    "rollup-plugin-dts": "^4.2.3",
-    "rollup-plugin-swc3": "^0.6.0"
+    "@types/convict": "^6.1.4",
+    "@types/tmp": "^0.2.3",
+    "msw": "^1.3.0",
+    "rollup": "^3.29.0",
+    "rollup-plugin-dts": "^6.0.1",
+    "rollup-plugin-swc3": "^0.10.1"
   },
-  "gitHead": "b54cc5676562cb39a06177899c23f33036b7236b"
+  "gitHead": "75d2c0c4dc539dd294d33fb67512ee332186ebeb"
 }