Merge branch 'jb.pinalie/git-support' into alpha

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: '12.x'
-      - run: yarn install
+      - run: yarn install --immutable
       - run: yarn build
       - run: yarn prettier-check
       - run: yarn lint

src/commands/sourcemaps/__tests__/mjs/common.mjs.map

@@ -0,0 +1,3 @@
+{
+    "sources": ["webpack:///./src/commands/sourcemaps/__tests__/git.test.ts"]
+}

src/commands/sourcemaps/__tests__/upload.test.ts

@@ -2,6 +2,7 @@
 import os from 'os'
 
 import {Cli} from 'clipanion/lib/advanced'
+import {Payload} from '../interfaces'
 import {UploadCommand} from '../upload'
 
 describe('upload', () => {
@@ -81,6 +82,46 @@ describe('upload', () => {
       expect(write.mock.calls[0][0]).toContain('DATADOG_API_KEY')
     })
   })
+
+  describe('addRepositoryDataToPayloads', () => {
+    test('repository url and commit still defined without payload', async () => {
+      const command = new UploadCommand()
+      const write = jest.fn()
+      command.context = {stdout: {write}} as any
+      const payloads = new Array<Payload>({
+        cliVersion: '0.0.1',
+        minifiedFilePath: 'src/commands/sourcemaps/__tests__/fixtures-empty/empty.min.js',
+        minifiedUrl: 'http://example/empty.min.js',
+        projectPath: '',
+        service: 'svc',
+        sourcemapPath: 'src/commands/sourcemaps/__tests__/fixtures-empty/empty.min.js.map',
+        version: '1.2.3',
+      })
+      await command['addRepositoryDataToPayloads'](payloads)
+      expect(payloads[0].gitRepositoryURL).toBeDefined()
+      expect(payloads[0].gitCommitSha).toHaveLength(40)
+      expect(payloads[0].gitRepositoryPayload).toBeUndefined()
+    })
+
+    test('should include payload', async () => {
+      const command = new UploadCommand()
+      const write = jest.fn()
+      command.context = {stdout: {write}} as any
+      const payloads = new Array<Payload>({
+        cliVersion: '0.0.1',
+        minifiedFilePath: 'src/commands/sourcemaps/__tests__/fixtures/common.min.js',
+        minifiedUrl: 'http://example/common.min.js',
+        projectPath: '',
+        service: 'svc',
+        sourcemapPath: 'src/commands/sourcemaps/__tests__/fixtures/common.min.js.map',
+        version: '1.2.3',
+      })
+      await command['addRepositoryDataToPayloads'](payloads)
+      expect(payloads[0].gitRepositoryURL).toBeDefined()
+      expect(payloads[0].gitCommitSha).toHaveLength(40)
+      expect(payloads[0].gitRepositoryPayload).toBeDefined()
+    })
+  })
 })
 
 describe('execute', () => {
@@ -154,6 +195,22 @@ describe('execute', () => {
       version: '1234',
     })
   })
+
+  test('using the mjs extension', async () => {
+    const {context, code} = await runCLI('./src/commands/sourcemaps/__tests__/mjs')
+    const output = context.stdout.toString().split(os.EOL)
+    expect(code).toBe(0)
+    checkConsoleOutput(output, {
+      basePath: 'src/commands/sourcemaps/__tests__/mjs',
+      concurrency: 20,
+      jsFilesURLs: ['https://static.com/js/common.mjs'],
+      minifiedPathPrefix: 'https://static.com/js',
+      projectPath: '',
+      service: 'test-service',
+      sourcemapsPaths: ['src/commands/sourcemaps/__tests__/mjs/common.mjs.map'],
+      version: '1234',
+    })
+  })
 })
 
 const makeCli = () => {

src/commands/sourcemaps/api.ts

@@ -26,8 +26,14 @@ export const uploadSourcemap = (request: (args: AxiosRequestConfig) => AxiosProm
   form.append('minified_url', sourcemap.minifiedUrl)
   form.append('project_path', sourcemap.projectPath)
   form.append('type', 'js_sourcemap')
-  if (sourcemap.repository) {
-    form.append('repository', sourcemap.repository, {filename: 'repository', contentType: 'application/json'})
+  if (sourcemap.gitRepositoryPayload) {
+    form.append('repository', sourcemap.gitRepositoryPayload, {filename: 'repository', contentType: 'application/json'})
+  }
+  if (sourcemap.gitRepositoryURL) {
+    form.append('git_repository_url', sourcemap.gitRepositoryURL)
+  }
+  if (sourcemap.gitCommitSha) {
+    form.append('git_commit_sha', sourcemap.gitCommitSha)
   }
 
   return request({

src/commands/sourcemaps/interfaces.ts

@@ -3,11 +3,13 @@ import {Writable} from 'stream'
 
 export interface Payload {
   cliVersion: string
+  gitCommitSha?: string
+  gitRepositoryPayload?: string
+  gitRepositoryURL?: string
   minifiedFilePath: string
   minifiedUrl: string
   overwrite?: boolean
   projectPath: string
-  repository?: string
   service: string
   sourcemapPath: string
   version: string

src/commands/sourcemaps/upload.ts

@@ -117,7 +117,9 @@ export class UploadCommand extends Command {
     }
     await Promise.all(
       payloads.map(async (payload) => {
-        payload.repository = this.getRepositoryPayload(repositoryData, payload.sourcemapPath)
+        payload.gitRepositoryPayload = this.getRepositoryPayload(repositoryData, payload.sourcemapPath)
+        payload.gitRepositoryURL = repositoryData.remote
+        payload.gitCommitSha = repositoryData.hash
       })
     )
   }
@@ -134,7 +136,7 @@ export class UploadCommand extends Command {
   // Looks for the sourcemaps and minified files on disk and returns
   // the associated payloads.
   private getMatchingSourcemapFiles = async (cliVersion: string): Promise<Payload[]> => {
-    const sourcemapFiles = glob.sync(buildPath(this.basePath!, '**/*.js.map'))
+    const sourcemapFiles = glob.sync(buildPath(this.basePath!, '**/*js.map'))
 
     return Promise.all(
       sourcemapFiles.map(async (sourcemapPath) => {

yarn.lock

@@ -4909,7 +4909,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
   integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
 
-simple-git@^2.31.0:
+[email protected]:
   version "2.31.0"
   resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.31.0.tgz#3e5954c1e36c76fb382c08eaa2749a206db9f613"
   integrity sha512-/+rmE7dYZMbRAfEmn8EUIOwlM2G7UdzpkC60KF86YAfXGnmGtsPrKsym0hKvLBdFLLW019C+aZld1+6iIVy5xA==