diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f627237e97c..0f87a4145a3 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -43,7 +43,7 @@ README.md @sqs /web/src/enterprise/dotcom/welcome/ @sqs # Browser extensions -/client/browser/ @felixfbecker @lguychard +/browser/ @felixfbecker @lguychard # Sourcegraph extension API /packages/sourcegraph-extension-api/ @lguychard diff --git a/.prettierignore b/.prettierignore index e1c33d17bb3..3f5c630329c 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,7 +1,7 @@ .bin/ *.bundle.* client/phabricator/scripts/loader.js -client/browser/build +browser/build **/package.json **/coverage cmd/frontend/db/schema.md diff --git a/.vscode/settings.json b/.vscode/settings.json index dfcb3d4cba0..24f7f1ed5b8 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -5,7 +5,7 @@ "**/bower_components": true, "dist": true, "ui/assets": true, - "client/browser/build": true, + "browser/build": true, "**/coverage": true }, "files.associations": { diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 37c05d01931..a7e87973d3d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -38,7 +38,7 @@ "isBackground": true, "option": "watch", "problemMatcher": "$tsc-watch", - "tsconfig": "client/browser/tsconfig.json", + "tsconfig": "browser/tsconfig.json", "presentation": { "reveal": "never" }, diff --git a/CHANGELOG.md b/CHANGELOG.md index 99dcc76bc49..b71265759ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -345,7 +345,7 @@ See the changelog entries for 3.0.0 beta releases and our [3.0](doc/admin/migrat ### Fixed - Fixed an issue that would cause the frontend health check endpoint `/healthz` to not respond. This only impacts Kubernetes deployments. -- Fixed a CORS policy issue that caused requests to be rejected when they come from origins not in our [manifest.json](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/client/browser/src/extension/manifest.spec.json#L72) (i.e. requested via optional permissions by the user). +- Fixed a CORS policy issue that caused requests to be rejected when they come from origins not in our [manifest.json](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/blob/browser/src/extension/manifest.spec.json#L72) (i.e. requested via optional permissions by the user). - Fixed an issue that prevented `repositoryQuery` from working correctly on GitHub enterprise instances. ## 2.13.2 diff --git a/client/browser/.arcconfig b/browser/.arcconfig similarity index 100% rename from client/browser/.arcconfig rename to browser/.arcconfig diff --git a/client/browser/.editorconfig b/browser/.editorconfig similarity index 100% rename from client/browser/.editorconfig rename to browser/.editorconfig diff --git a/client/browser/.github/PULL_REQUEST_TEMPLATE.md b/browser/.github/PULL_REQUEST_TEMPLATE.md similarity index 100% rename from client/browser/.github/PULL_REQUEST_TEMPLATE.md rename to browser/.github/PULL_REQUEST_TEMPLATE.md diff --git a/client/browser/.gitignore b/browser/.gitignore similarity index 100% rename from client/browser/.gitignore rename to browser/.gitignore diff --git a/client/browser/.stylelintrc.json b/browser/.stylelintrc.json similarity index 100% rename from client/browser/.stylelintrc.json rename to browser/.stylelintrc.json diff --git a/client/browser/.vscode/settings.json b/browser/.vscode/settings.json similarity index 100% rename from client/browser/.vscode/settings.json rename to browser/.vscode/settings.json diff --git a/client/browser/LICENSE b/browser/LICENSE similarity index 100% rename from client/browser/LICENSE rename to browser/LICENSE diff --git a/client/browser/README.md b/browser/README.md similarity index 100% rename from client/browser/README.md rename to browser/README.md diff --git a/client/browser/babel.config.js b/browser/babel.config.js similarity index 100% rename from client/browser/babel.config.js rename to browser/babel.config.js diff --git a/client/browser/config/shared/webpack.ts b/browser/config/shared/webpack.ts similarity index 94% rename from client/browser/config/shared/webpack.ts rename to browser/config/shared/webpack.ts index 8013c875a81..d072396e274 100644 --- a/client/browser/config/shared/webpack.ts +++ b/browser/config/shared/webpack.ts @@ -14,7 +14,7 @@ export const commonStylesheetLoaders: webpack.Loader[] = [ { loader: 'sass-loader', options: { - includePaths: [path.resolve(__dirname, '../../../..', 'node_modules')], + includePaths: [path.resolve(__dirname, '../../../node_modules')], }, }, ] diff --git a/client/browser/config/storybook/addons.ts b/browser/config/storybook/addons.ts similarity index 100% rename from client/browser/config/storybook/addons.ts rename to browser/config/storybook/addons.ts diff --git a/client/browser/config/storybook/config.ts b/browser/config/storybook/config.ts similarity index 100% rename from client/browser/config/storybook/config.ts rename to browser/config/storybook/config.ts diff --git a/client/browser/config/storybook/preview-head.html b/browser/config/storybook/preview-head.html similarity index 100% rename from client/browser/config/storybook/preview-head.html rename to browser/config/storybook/preview-head.html diff --git a/client/browser/config/storybook/tsconfig.json b/browser/config/storybook/tsconfig.json similarity index 100% rename from client/browser/config/storybook/tsconfig.json rename to browser/config/storybook/tsconfig.json diff --git a/client/browser/config/storybook/webpack.config.ts b/browser/config/storybook/webpack.config.ts similarity index 100% rename from client/browser/config/storybook/webpack.config.ts rename to browser/config/storybook/webpack.config.ts diff --git a/client/browser/config/tsconfig.webpack.json b/browser/config/tsconfig.webpack.json similarity index 100% rename from client/browser/config/tsconfig.webpack.json rename to browser/config/tsconfig.webpack.json diff --git a/client/browser/config/web-ext/config.json b/browser/config/web-ext/config.json similarity index 100% rename from client/browser/config/web-ext/config.json rename to browser/config/web-ext/config.json diff --git a/client/browser/config/webpack/base.config.ts b/browser/config/webpack/base.config.ts similarity index 98% rename from client/browser/config/webpack/base.config.ts rename to browser/config/webpack/base.config.ts index 90db0f6dc55..598f746571a 100644 --- a/client/browser/config/webpack/base.config.ts +++ b/browser/config/webpack/base.config.ts @@ -29,7 +29,7 @@ const config: webpack.Configuration = { }, plugins: [ - new MiniCssExtractPlugin({ filename: '../css/[name].bundle.css' }) as any, // @types package is incorrect + new MiniCssExtractPlugin({ filename: '../css/[name].bundle.css' }), new OptimizeCssAssetsPlugin(), // Code splitting doesn't make sense/work in the browser extension, but we still want to use dynamic import() new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }), diff --git a/client/browser/config/webpack/dev.config.ts b/browser/config/webpack/dev.config.ts similarity index 100% rename from client/browser/config/webpack/dev.config.ts rename to browser/config/webpack/dev.config.ts diff --git a/client/browser/config/webpack/prod.config.ts b/browser/config/webpack/prod.config.ts similarity index 100% rename from client/browser/config/webpack/prod.config.ts rename to browser/config/webpack/prod.config.ts diff --git a/client/browser/config/webpack/utils.ts b/browser/config/webpack/utils.ts similarity index 100% rename from client/browser/config/webpack/utils.ts rename to browser/config/webpack/utils.ts diff --git a/client/browser/cypress.json b/browser/cypress.json similarity index 100% rename from client/browser/cypress.json rename to browser/cypress.json diff --git a/client/browser/detailed_description.txt b/browser/detailed_description.txt similarity index 100% rename from client/browser/detailed_description.txt rename to browser/detailed_description.txt diff --git a/client/browser/gulpfile.ts b/browser/gulpfile.ts similarity index 96% rename from client/browser/gulpfile.ts rename to browser/gulpfile.ts index c4d3424adae..3768f6e75f0 100644 --- a/client/browser/gulpfile.ts +++ b/browser/gulpfile.ts @@ -23,7 +23,7 @@ const PHABRICATOR_ASSETS_DIRECTORY = path.join(__dirname, '../../ui/assets/exten /** * Copies the phabricator extension over to the ui/assets folder so they can be served by the webapp. The package - * is published from ./client/browser. + * is published from ./browser. */ export function phabricator(): NodeJS.ReadWriteStream { return gulp.src(PHABRICATOR_EXTENSION_FILES).pipe(gulp.dest(PHABRICATOR_ASSETS_DIRECTORY)) diff --git a/browser/jest.config.js b/browser/jest.config.js new file mode 100644 index 00000000000..ce940198be5 --- /dev/null +++ b/browser/jest.config.js @@ -0,0 +1,7 @@ +// @ts-check + +/** @type {jest.InitialOptions} */ +const config = require('../jest.config.base') + +/** @type {jest.InitialOptions} */ +module.exports = { ...config, displayName: 'browser', rootDir: __dirname } diff --git a/browser/node_modules/.bin b/browser/node_modules/.bin new file mode 120000 index 00000000000..764a62fef7e --- /dev/null +++ b/browser/node_modules/.bin @@ -0,0 +1 @@ +../../node_modules/.bin \ No newline at end of file diff --git a/client/browser/package.json b/browser/package.json similarity index 100% rename from client/browser/package.json rename to browser/package.json diff --git a/client/browser/postcss.config.js b/browser/postcss.config.js similarity index 100% rename from client/browser/postcss.config.js rename to browser/postcss.config.js diff --git a/client/browser/readme-load-extension-asset.png b/browser/readme-load-extension-asset.png similarity index 100% rename from client/browser/readme-load-extension-asset.png rename to browser/readme-load-extension-asset.png diff --git a/client/browser/scripts/auto-reloading.ts b/browser/scripts/auto-reloading.ts similarity index 100% rename from client/browser/scripts/auto-reloading.ts rename to browser/scripts/auto-reloading.ts diff --git a/client/browser/scripts/build-updates-manifest.ts b/browser/scripts/build-updates-manifest.ts similarity index 100% rename from client/browser/scripts/build-updates-manifest.ts rename to browser/scripts/build-updates-manifest.ts diff --git a/client/browser/scripts/build.ts b/browser/scripts/build.ts similarity index 100% rename from client/browser/scripts/build.ts rename to browser/scripts/build.ts diff --git a/client/browser/scripts/dev.ts b/browser/scripts/dev.ts similarity index 100% rename from client/browser/scripts/dev.ts rename to browser/scripts/dev.ts diff --git a/client/browser/scripts/release-ff.sh b/browser/scripts/release-ff.sh similarity index 100% rename from client/browser/scripts/release-ff.sh rename to browser/scripts/release-ff.sh diff --git a/client/browser/scripts/tasks.ts b/browser/scripts/tasks.ts similarity index 100% rename from client/browser/scripts/tasks.ts rename to browser/scripts/tasks.ts diff --git a/client/browser/src/app.scss b/browser/src/app.scss similarity index 100% rename from client/browser/src/app.scss rename to browser/src/app.scss diff --git a/client/browser/src/browser/ExtensionStorageSubject.ts b/browser/src/browser/ExtensionStorageSubject.ts similarity index 100% rename from client/browser/src/browser/ExtensionStorageSubject.ts rename to browser/src/browser/ExtensionStorageSubject.ts diff --git a/client/browser/src/browser/README.md b/browser/src/browser/README.md similarity index 100% rename from client/browser/src/browser/README.md rename to browser/src/browser/README.md diff --git a/client/browser/src/browser/runtime.ts b/browser/src/browser/runtime.ts similarity index 100% rename from client/browser/src/browser/runtime.ts rename to browser/src/browser/runtime.ts diff --git a/client/browser/src/browser/storage.ts b/browser/src/browser/storage.ts similarity index 100% rename from client/browser/src/browser/storage.ts rename to browser/src/browser/storage.ts diff --git a/client/browser/src/browser/types.ts b/browser/src/browser/types.ts similarity index 97% rename from client/browser/src/browser/types.ts rename to browser/src/browser/types.ts index f18166ba9de..8f2ede1c3e6 100644 --- a/client/browser/src/browser/types.ts +++ b/browser/src/browser/types.ts @@ -1,4 +1,4 @@ -import { IGraphQLResponseRoot } from '../../../../shared/src/graphql/schema' +import { IGraphQLResponseRoot } from '../../../shared/src/graphql/schema' import { GraphQLRequestArgs } from '../shared/backend/graphql' import { DEFAULT_SOURCEGRAPH_URL } from '../shared/util/context' diff --git a/client/browser/src/config/background.entry.js b/browser/src/config/background.entry.js similarity index 100% rename from client/browser/src/config/background.entry.js rename to browser/src/config/background.entry.js diff --git a/client/browser/src/config/content.entry.js b/browser/src/config/content.entry.js similarity index 100% rename from client/browser/src/config/content.entry.js rename to browser/src/config/content.entry.js diff --git a/client/browser/src/config/extension.entry.js b/browser/src/config/extension.entry.js similarity index 100% rename from client/browser/src/config/extension.entry.js rename to browser/src/config/extension.entry.js diff --git a/client/browser/src/config/options.entry.js b/browser/src/config/options.entry.js similarity index 100% rename from client/browser/src/config/options.entry.js rename to browser/src/config/options.entry.js diff --git a/client/browser/src/config/page.entry.js b/browser/src/config/page.entry.js similarity index 100% rename from client/browser/src/config/page.entry.js rename to browser/src/config/page.entry.js diff --git a/client/browser/src/config/polyfill.ts b/browser/src/config/polyfill.ts similarity index 85% rename from client/browser/src/config/polyfill.ts rename to browser/src/config/polyfill.ts index b52f19492f3..5ca46c1f6d9 100644 --- a/client/browser/src/config/polyfill.ts +++ b/browser/src/config/polyfill.ts @@ -1,5 +1,5 @@ // Same polyfills as the webapp -import '../../../../shared/src/polyfills' +import '../../../shared/src/polyfills' // Polyfill global browser API for Chrome // The API is much nicer to use because it supports Promises diff --git a/client/browser/src/context.ts b/browser/src/context.ts similarity index 100% rename from client/browser/src/context.ts rename to browser/src/context.ts diff --git a/client/browser/src/e2e/chrome.e2e.test.ts b/browser/src/e2e/chrome.e2e.test.ts similarity index 99% rename from client/browser/src/e2e/chrome.e2e.test.ts rename to browser/src/e2e/chrome.e2e.test.ts index d83dff86c08..b029ebe30c5 100644 --- a/client/browser/src/e2e/chrome.e2e.test.ts +++ b/browser/src/e2e/chrome.e2e.test.ts @@ -1,6 +1,6 @@ import * as path from 'path' import puppeteer from 'puppeteer' -import { saveScreenshotsUponFailuresAndClosePage } from '../../../../shared/src/util/screenshotReporter' +import { saveScreenshotsUponFailuresAndClosePage } from '../../../shared/src/util/screenshotReporter' const chromeExtensionPath = path.resolve(__dirname, '..', '..', 'build/chrome') diff --git a/client/browser/src/extension/assets/img/icon-128.png b/browser/src/extension/assets/img/icon-128.png similarity index 100% rename from client/browser/src/extension/assets/img/icon-128.png rename to browser/src/extension/assets/img/icon-128.png diff --git a/client/browser/src/extension/assets/img/icon-16.png b/browser/src/extension/assets/img/icon-16.png similarity index 100% rename from client/browser/src/extension/assets/img/icon-16.png rename to browser/src/extension/assets/img/icon-16.png diff --git a/client/browser/src/extension/assets/img/icon-48.png b/browser/src/extension/assets/img/icon-48.png similarity index 100% rename from client/browser/src/extension/assets/img/icon-48.png rename to browser/src/extension/assets/img/icon-48.png diff --git a/client/browser/src/extension/assets/img/sourcegraph-light-head-logo.svg b/browser/src/extension/assets/img/sourcegraph-light-head-logo.svg similarity index 100% rename from client/browser/src/extension/assets/img/sourcegraph-light-head-logo.svg rename to browser/src/extension/assets/img/sourcegraph-light-head-logo.svg diff --git a/client/browser/src/extension/assets/img/sourcegraph-logo.svg b/browser/src/extension/assets/img/sourcegraph-logo.svg similarity index 100% rename from client/browser/src/extension/assets/img/sourcegraph-logo.svg rename to browser/src/extension/assets/img/sourcegraph-logo.svg diff --git a/client/browser/src/extension/assets/img/sourcegraph-mark.svg b/browser/src/extension/assets/img/sourcegraph-mark.svg similarity index 100% rename from client/browser/src/extension/assets/img/sourcegraph-mark.svg rename to browser/src/extension/assets/img/sourcegraph-mark.svg diff --git a/client/browser/src/extension/envAssertion.ts b/browser/src/extension/envAssertion.ts similarity index 100% rename from client/browser/src/extension/envAssertion.ts rename to browser/src/extension/envAssertion.ts diff --git a/client/browser/src/extension/manifest.spec.json b/browser/src/extension/manifest.spec.json similarity index 100% rename from client/browser/src/extension/manifest.spec.json rename to browser/src/extension/manifest.spec.json diff --git a/client/browser/src/extension/schema.json b/browser/src/extension/schema.json similarity index 100% rename from client/browser/src/extension/schema.json rename to browser/src/extension/schema.json diff --git a/client/browser/src/extension/scripts/auto-reloading.ts b/browser/src/extension/scripts/auto-reloading.ts similarity index 100% rename from client/browser/src/extension/scripts/auto-reloading.ts rename to browser/src/extension/scripts/auto-reloading.ts diff --git a/client/browser/src/extension/scripts/background.tsx b/browser/src/extension/scripts/background.tsx similarity index 98% rename from client/browser/src/extension/scripts/background.tsx rename to browser/src/extension/scripts/background.tsx index dc5f107d515..f9afd189fab 100644 --- a/client/browser/src/extension/scripts/background.tsx +++ b/browser/src/extension/scripts/background.tsx @@ -6,8 +6,8 @@ import { without } from 'lodash' import { noop, Observable } from 'rxjs' import { bufferCount, filter, groupBy, map, mergeMap } from 'rxjs/operators' import * as domainPermissionToggle from 'webext-domain-permission-toggle' -import { createExtensionHostWorker } from '../../../../../shared/src/api/extension/worker' -import { IGraphQLResponseRoot } from '../../../../../shared/src/graphql/schema' +import { createExtensionHostWorker } from '../../../../shared/src/api/extension/worker' +import { IGraphQLResponseRoot } from '../../../../shared/src/graphql/schema' import { storage } from '../../browser/storage' import { BackgroundMessageHandlers, defaultStorageItems } from '../../browser/types' import { initializeOmniboxInterface } from '../../libs/cli' diff --git a/client/browser/src/extension/scripts/inject.tsx b/browser/src/extension/scripts/inject.tsx similarity index 97% rename from client/browser/src/extension/scripts/inject.tsx rename to browser/src/extension/scripts/inject.tsx index 2dbe1175de0..a1ed59ac078 100644 --- a/client/browser/src/extension/scripts/inject.tsx +++ b/browser/src/extension/scripts/inject.tsx @@ -4,7 +4,7 @@ import * as H from 'history' import React from 'react' import { Observable, Subscription } from 'rxjs' import { startWith } from 'rxjs/operators' -import { setLinkComponent } from '../../../../../shared/src/components/Link' +import { setLinkComponent } from '../../../../shared/src/components/Link' import { storage } from '../../browser/storage' import { determineCodeHost as detectCodeHost, injectCodeIntelligenceToCodeHost } from '../../libs/code_intelligence' import { initSentry } from '../../libs/sentry' diff --git a/client/browser/src/extension/scripts/options.tsx b/browser/src/extension/scripts/options.tsx similarity index 100% rename from client/browser/src/extension/scripts/options.tsx rename to browser/src/extension/scripts/options.tsx diff --git a/client/browser/src/extension/updates.manifest.json b/browser/src/extension/updates.manifest.json similarity index 100% rename from client/browser/src/extension/updates.manifest.json rename to browser/src/extension/updates.manifest.json diff --git a/client/browser/src/extension/views/background.html b/browser/src/extension/views/background.html similarity index 100% rename from client/browser/src/extension/views/background.html rename to browser/src/extension/views/background.html diff --git a/client/browser/src/extension/views/inject.html b/browser/src/extension/views/inject.html similarity index 100% rename from client/browser/src/extension/views/inject.html rename to browser/src/extension/views/inject.html diff --git a/client/browser/src/extension/views/options.html b/browser/src/extension/views/options.html similarity index 100% rename from client/browser/src/extension/views/options.html rename to browser/src/extension/views/options.html diff --git a/client/browser/src/global-styles/card.scss b/browser/src/global-styles/card.scss similarity index 100% rename from client/browser/src/global-styles/card.scss rename to browser/src/global-styles/card.scss diff --git a/client/browser/src/global-styles/colors.scss b/browser/src/global-styles/colors.scss similarity index 100% rename from client/browser/src/global-styles/colors.scss rename to browser/src/global-styles/colors.scss diff --git a/client/browser/src/global-styles/icons.scss b/browser/src/global-styles/icons.scss similarity index 100% rename from client/browser/src/global-styles/icons.scss rename to browser/src/global-styles/icons.scss diff --git a/client/browser/src/globals.d.ts b/browser/src/globals.d.ts similarity index 100% rename from client/browser/src/globals.d.ts rename to browser/src/globals.d.ts diff --git a/client/browser/src/highlight.scss b/browser/src/highlight.scss similarity index 100% rename from client/browser/src/highlight.scss rename to browser/src/highlight.scss diff --git a/client/browser/src/libs/bitbucket/__fixtures__/browse.html b/browser/src/libs/bitbucket/__fixtures__/browse.html similarity index 100% rename from client/browser/src/libs/bitbucket/__fixtures__/browse.html rename to browser/src/libs/bitbucket/__fixtures__/browse.html diff --git a/client/browser/src/libs/bitbucket/__fixtures__/code-views/pr-modified.html b/browser/src/libs/bitbucket/__fixtures__/code-views/pr-modified.html similarity index 100% rename from client/browser/src/libs/bitbucket/__fixtures__/code-views/pr-modified.html rename to browser/src/libs/bitbucket/__fixtures__/code-views/pr-modified.html diff --git a/client/browser/src/libs/bitbucket/__fixtures__/pr-modified.html b/browser/src/libs/bitbucket/__fixtures__/pr-modified.html similarity index 100% rename from client/browser/src/libs/bitbucket/__fixtures__/pr-modified.html rename to browser/src/libs/bitbucket/__fixtures__/pr-modified.html diff --git a/client/browser/src/libs/bitbucket/api.ts b/browser/src/libs/bitbucket/api.ts similarity index 93% rename from client/browser/src/libs/bitbucket/api.ts rename to browser/src/libs/bitbucket/api.ts index a4a3b57b7c3..b33dc310522 100644 --- a/client/browser/src/libs/bitbucket/api.ts +++ b/browser/src/libs/bitbucket/api.ts @@ -2,8 +2,8 @@ import { first } from 'lodash' import { Observable } from 'rxjs' import { ajax } from 'rxjs/ajax' import { filter, map } from 'rxjs/operators' -import { memoizeObservable } from '../../../../../shared/src/util/memoizeObservable' -import { isDefined } from '../../../../../shared/src/util/types' +import { memoizeObservable } from '../../../../shared/src/util/memoizeObservable' +import { isDefined } from '../../../../shared/src/util/types' import { DiffResolvedRevSpec } from '../../shared/repo' import { BitbucketRepoInfo } from './scrape' diff --git a/client/browser/src/libs/bitbucket/code_intelligence.test.ts b/browser/src/libs/bitbucket/code_intelligence.test.ts similarity index 100% rename from client/browser/src/libs/bitbucket/code_intelligence.test.ts rename to browser/src/libs/bitbucket/code_intelligence.test.ts diff --git a/client/browser/src/libs/bitbucket/code_intelligence.tsx b/browser/src/libs/bitbucket/code_intelligence.tsx similarity index 99% rename from client/browser/src/libs/bitbucket/code_intelligence.tsx rename to browser/src/libs/bitbucket/code_intelligence.tsx index 813fde49aff..d1f08cf4cb6 100644 --- a/client/browser/src/libs/bitbucket/code_intelligence.tsx +++ b/browser/src/libs/bitbucket/code_intelligence.tsx @@ -1,7 +1,7 @@ import { AdjustmentDirection, DOMFunctions, PositionAdjuster } from '@sourcegraph/codeintellify' import { of } from 'rxjs' import { Omit } from 'utility-types' -import { FileSpec, RepoSpec, ResolvedRevSpec, RevSpec } from '../../../../../shared/src/util/url' +import { FileSpec, RepoSpec, ResolvedRevSpec, RevSpec } from '../../../../shared/src/util/url' import { querySelectorOrSelf } from '../../shared/util/dom' import { CodeHost, MountGetter } from '../code_intelligence' import { CodeView } from '../code_intelligence/code_views' diff --git a/client/browser/src/libs/bitbucket/context.tsx b/browser/src/libs/bitbucket/context.tsx similarity index 96% rename from client/browser/src/libs/bitbucket/context.tsx rename to browser/src/libs/bitbucket/context.tsx index 480cd12f2f7..9c8d20b1728 100644 --- a/client/browser/src/libs/bitbucket/context.tsx +++ b/browser/src/libs/bitbucket/context.tsx @@ -1,4 +1,4 @@ -import { RepoSpec, RevSpec } from '../../../../../shared/src/util/url' +import { RepoSpec, RevSpec } from '../../../../shared/src/util/url' import { CodeHostContext } from '../code_intelligence/code_intelligence' // example pathname: /projects/TEST/repos/some-repo/browse/src/extension.ts diff --git a/client/browser/src/libs/bitbucket/dom_functions.ts b/browser/src/libs/bitbucket/dom_functions.ts similarity index 100% rename from client/browser/src/libs/bitbucket/dom_functions.ts rename to browser/src/libs/bitbucket/dom_functions.ts diff --git a/client/browser/src/libs/bitbucket/file_info.ts b/browser/src/libs/bitbucket/file_info.ts similarity index 100% rename from client/browser/src/libs/bitbucket/file_info.ts rename to browser/src/libs/bitbucket/file_info.ts diff --git a/client/browser/src/libs/bitbucket/scrape.test.ts b/browser/src/libs/bitbucket/scrape.test.ts similarity index 100% rename from client/browser/src/libs/bitbucket/scrape.test.ts rename to browser/src/libs/bitbucket/scrape.test.ts diff --git a/client/browser/src/libs/bitbucket/scrape.ts b/browser/src/libs/bitbucket/scrape.ts similarity index 99% rename from client/browser/src/libs/bitbucket/scrape.ts rename to browser/src/libs/bitbucket/scrape.ts index e8e490fea39..83db6e67129 100644 --- a/client/browser/src/libs/bitbucket/scrape.ts +++ b/browser/src/libs/bitbucket/scrape.ts @@ -1,5 +1,5 @@ import * as path from 'path' -import { createAggregateError } from '../../../../../shared/src/util/errors' +import { createAggregateError } from '../../../../shared/src/util/errors' import { DiffResolvedRevSpec } from '../../shared/repo' import { FileInfo } from '../code_intelligence' diff --git a/client/browser/src/libs/bitbucket/style.scss b/browser/src/libs/bitbucket/style.scss similarity index 100% rename from client/browser/src/libs/bitbucket/style.scss rename to browser/src/libs/bitbucket/style.scss diff --git a/client/browser/src/libs/bitbucket/test-code-views.ts b/browser/src/libs/bitbucket/test-code-views.ts similarity index 100% rename from client/browser/src/libs/bitbucket/test-code-views.ts rename to browser/src/libs/bitbucket/test-code-views.ts diff --git a/client/browser/src/libs/cli/index.ts b/browser/src/libs/cli/index.ts similarity index 100% rename from client/browser/src/libs/cli/index.ts rename to browser/src/libs/cli/index.ts diff --git a/client/browser/src/libs/cli/search.ts b/browser/src/libs/cli/search.ts similarity index 96% rename from client/browser/src/libs/cli/search.ts rename to browser/src/libs/cli/search.ts index 36325124b94..8b4143d1817 100644 --- a/client/browser/src/libs/cli/search.ts +++ b/browser/src/libs/cli/search.ts @@ -1,4 +1,4 @@ -import { buildSearchURLQuery } from '../../../../../shared/src/util/url' +import { buildSearchURLQuery } from '../../../../shared/src/util/url' import { storage } from '../../browser/storage' import { createSuggestionFetcher } from '../../shared/backend/search' import { sourcegraphUrl } from '../../shared/util/context' diff --git a/client/browser/src/libs/code_intelligence/HoverOverlay.scss b/browser/src/libs/code_intelligence/HoverOverlay.scss similarity index 63% rename from client/browser/src/libs/code_intelligence/HoverOverlay.scss rename to browser/src/libs/code_intelligence/HoverOverlay.scss index d5500936360..5629e61c2d6 100644 --- a/client/browser/src/libs/code_intelligence/HoverOverlay.scss +++ b/browser/src/libs/code_intelligence/HoverOverlay.scss @@ -1,5 +1,5 @@ @import '../../shared/global-styles/variables.scss'; -@import '../../../../../shared/src/hover/HoverOverlay.scss'; +@import '../../../../shared/src/hover/HoverOverlay.scss'; .hover-overlay { z-index: $default-z-index; diff --git a/client/browser/src/libs/code_intelligence/code_intelligence.test.tsx b/browser/src/libs/code_intelligence/code_intelligence.test.tsx similarity index 97% rename from client/browser/src/libs/code_intelligence/code_intelligence.test.tsx rename to browser/src/libs/code_intelligence/code_intelligence.test.tsx index 7fa6d4f3bac..e46d59af37d 100644 --- a/client/browser/src/libs/code_intelligence/code_intelligence.test.tsx +++ b/browser/src/libs/code_intelligence/code_intelligence.test.tsx @@ -10,11 +10,11 @@ import { uniqueId } from 'lodash' import renderer from 'react-test-renderer' import { BehaviorSubject, from, NEVER, of, Subject, Subscription } from 'rxjs' import { filter, skip, switchMap, take } from 'rxjs/operators' -import { Services } from '../../../../../shared/src/api/client/services' -import { integrationTestContext } from '../../../../../shared/src/api/integration-test/testHelpers' -import { Controller } from '../../../../../shared/src/extensions/controller' -import { PlatformContextProps } from '../../../../../shared/src/platform/context' -import { isDefined } from '../../../../../shared/src/util/types' +import { Services } from '../../../../shared/src/api/client/services' +import { integrationTestContext } from '../../../../shared/src/api/integration-test/testHelpers' +import { Controller } from '../../../../shared/src/extensions/controller' +import { PlatformContextProps } from '../../../../shared/src/platform/context' +import { isDefined } from '../../../../shared/src/util/types' import { MutationRecordLike } from '../../shared/util/dom' import { createGlobalDebugMount, createOverlayMount, FileInfo, handleCodeHost } from './code_intelligence' import { toCodeViewResolver } from './code_views' diff --git a/client/browser/src/libs/code_intelligence/code_intelligence.tsx b/browser/src/libs/code_intelligence/code_intelligence.tsx similarity index 95% rename from client/browser/src/libs/code_intelligence/code_intelligence.tsx rename to browser/src/libs/code_intelligence/code_intelligence.tsx index df4f53db7e3..0e2c24c5bef 100644 --- a/client/browser/src/libs/code_intelligence/code_intelligence.tsx +++ b/browser/src/libs/code_intelligence/code_intelligence.tsx @@ -22,21 +22,21 @@ import { switchMap, withLatestFrom, } from 'rxjs/operators' -import { ActionItemAction } from '../../../../../shared/src/actions/ActionItem' -import { CodeEditorData } from '../../../../../shared/src/api/client/services/editorService' -import { WorkspaceRootWithMetadata } from '../../../../../shared/src/api/client/services/workspaceService' -import { HoverMerged } from '../../../../../shared/src/api/client/types/hover' -import { CommandListClassProps } from '../../../../../shared/src/commandPalette/CommandList' -import { CompletionWidgetClassProps } from '../../../../../shared/src/components/completion/CompletionWidget' -import { ApplyLinkPreviewOptions } from '../../../../../shared/src/components/linkPreviews/linkPreviews' -import { Controller } from '../../../../../shared/src/extensions/controller' -import { registerHighlightContributions } from '../../../../../shared/src/highlight/contributions' -import { getHoverActions, registerHoverContributions } from '../../../../../shared/src/hover/actions' -import { HoverContext, HoverOverlay, HoverOverlayClassProps } from '../../../../../shared/src/hover/HoverOverlay' -import { getModeFromPath } from '../../../../../shared/src/languages' -import { PlatformContextProps } from '../../../../../shared/src/platform/context' -import { NOOP_TELEMETRY_SERVICE } from '../../../../../shared/src/telemetry/telemetryService' -import { isDefined, isInstanceOf, propertyIsDefined } from '../../../../../shared/src/util/types' +import { ActionItemAction } from '../../../../shared/src/actions/ActionItem' +import { CodeEditorData } from '../../../../shared/src/api/client/services/editorService' +import { WorkspaceRootWithMetadata } from '../../../../shared/src/api/client/services/workspaceService' +import { HoverMerged } from '../../../../shared/src/api/client/types/hover' +import { CommandListClassProps } from '../../../../shared/src/commandPalette/CommandList' +import { CompletionWidgetClassProps } from '../../../../shared/src/components/completion/CompletionWidget' +import { ApplyLinkPreviewOptions } from '../../../../shared/src/components/linkPreviews/linkPreviews' +import { Controller } from '../../../../shared/src/extensions/controller' +import { registerHighlightContributions } from '../../../../shared/src/highlight/contributions' +import { getHoverActions, registerHoverContributions } from '../../../../shared/src/hover/actions' +import { HoverContext, HoverOverlay, HoverOverlayClassProps } from '../../../../shared/src/hover/HoverOverlay' +import { getModeFromPath } from '../../../../shared/src/languages' +import { PlatformContextProps } from '../../../../shared/src/platform/context' +import { NOOP_TELEMETRY_SERVICE } from '../../../../shared/src/telemetry/telemetryService' +import { isDefined, isInstanceOf, propertyIsDefined } from '../../../../shared/src/util/types' import { FileSpec, PositionSpec, @@ -46,7 +46,7 @@ import { toRootURI, toURIWithPath, ViewStateSpec, -} from '../../../../../shared/src/util/url' +} from '../../../../shared/src/util/url' import { isInPage } from '../../context' import { ERPRIVATEREPOPUBLICSOURCEGRAPHCOM } from '../../shared/backend/errors' import { createLSPFromExtensions, toTextDocumentIdentifier } from '../../shared/backend/lsp' diff --git a/client/browser/src/libs/code_intelligence/code_intelligence_test_utils.ts b/browser/src/libs/code_intelligence/code_intelligence_test_utils.ts similarity index 100% rename from client/browser/src/libs/code_intelligence/code_intelligence_test_utils.ts rename to browser/src/libs/code_intelligence/code_intelligence_test_utils.ts diff --git a/client/browser/src/libs/code_intelligence/code_views.test.ts b/browser/src/libs/code_intelligence/code_views.test.ts similarity index 100% rename from client/browser/src/libs/code_intelligence/code_views.test.ts rename to browser/src/libs/code_intelligence/code_views.test.ts diff --git a/client/browser/src/libs/code_intelligence/code_views.ts b/browser/src/libs/code_intelligence/code_views.ts similarity index 99% rename from client/browser/src/libs/code_intelligence/code_views.ts rename to browser/src/libs/code_intelligence/code_views.ts index c7cbfd38c29..cf7a4efff4b 100644 --- a/client/browser/src/libs/code_intelligence/code_views.ts +++ b/browser/src/libs/code_intelligence/code_views.ts @@ -3,7 +3,7 @@ import { Selection } from '@sourcegraph/extension-api-types' import { Observable, of, zip } from 'rxjs' import { catchError, map, switchMap } from 'rxjs/operators' import { Omit } from 'utility-types' -import { FileSpec, RepoSpec, ResolvedRevSpec, RevSpec } from '../../../../../shared/src/util/url' +import { FileSpec, RepoSpec, ResolvedRevSpec, RevSpec } from '../../../../shared/src/util/url' import { ERPRIVATEREPOPUBLICSOURCEGRAPHCOM, isErrorLike } from '../../shared/backend/errors' import { ButtonProps } from '../../shared/components/CodeViewToolbar' import { fetchBlobContentLines } from '../../shared/repo/backend' diff --git a/client/browser/src/libs/code_intelligence/content_views.test.ts b/browser/src/libs/code_intelligence/content_views.test.ts similarity index 97% rename from client/browser/src/libs/code_intelligence/content_views.test.ts rename to browser/src/libs/code_intelligence/content_views.test.ts index ac04dc26d95..56b6d722661 100644 --- a/client/browser/src/libs/code_intelligence/content_views.test.ts +++ b/browser/src/libs/code_intelligence/content_views.test.ts @@ -2,8 +2,8 @@ import { MarkupKind } from '@sourcegraph/extension-api-classes' import { uniqueId } from 'lodash' import { concat, Observable, of, Subject, Subscription } from 'rxjs' import { first } from 'rxjs/operators' -import { LinkPreviewMerged } from '../../../../../shared/src/api/client/services/linkPreview' -import { createBarrier } from '../../../../../shared/src/api/integration-test/testHelpers' +import { LinkPreviewMerged } from '../../../../shared/src/api/client/services/linkPreview' +import { createBarrier } from '../../../../shared/src/api/integration-test/testHelpers' import { MutationRecordLike } from '../../shared/util/dom' import { handleContentViews } from './content_views' diff --git a/client/browser/src/libs/code_intelligence/content_views.ts b/browser/src/libs/code_intelligence/content_views.ts similarity index 95% rename from client/browser/src/libs/code_intelligence/content_views.ts rename to browser/src/libs/code_intelligence/content_views.ts index 33c32ee8b8c..5b0c2470691 100644 --- a/client/browser/src/libs/code_intelligence/content_views.ts +++ b/browser/src/libs/code_intelligence/content_views.ts @@ -1,8 +1,8 @@ import { animationFrameScheduler, merge, Observable, of, Subject, Subscription, Unsubscribable } from 'rxjs' import { distinctUntilChanged, map, mapTo, mergeMap, observeOn, tap, throttleTime } from 'rxjs/operators' -import { LinkPreviewProviderRegistry } from '../../../../../shared/src/api/client/services/linkPreview' -import { applyLinkPreview } from '../../../../../shared/src/components/linkPreviews/linkPreviews' -import { ExtensionsControllerProps } from '../../../../../shared/src/extensions/controller' +import { LinkPreviewProviderRegistry } from '../../../../shared/src/api/client/services/linkPreview' +import { applyLinkPreview } from '../../../../shared/src/components/linkPreviews/linkPreviews' +import { ExtensionsControllerProps } from '../../../../shared/src/extensions/controller' import { MutationRecordLike, observeMutations } from '../../shared/util/dom' import { CodeHost } from './code_intelligence' import { trackViews } from './views' diff --git a/client/browser/src/libs/code_intelligence/extensions.tsx b/browser/src/libs/code_intelligence/extensions.tsx similarity index 91% rename from client/browser/src/libs/code_intelligence/extensions.tsx rename to browser/src/libs/code_intelligence/extensions.tsx index 753d165c4ab..fe570477dca 100644 --- a/client/browser/src/libs/code_intelligence/extensions.tsx +++ b/browser/src/libs/code_intelligence/extensions.tsx @@ -1,25 +1,25 @@ import { TextDocumentDecoration } from '@sourcegraph/extension-api-types' import * as React from 'react' import { render } from 'react-dom' -import { ContributableMenu } from '../../../../../shared/src/api/protocol' +import { ContributableMenu } from '../../../../shared/src/api/protocol' import { CommandListPopoverButton, CommandListPopoverButtonProps, -} from '../../../../../shared/src/commandPalette/CommandList' -import { Notifications } from '../../../../../shared/src/notifications/Notifications' +} from '../../../../shared/src/commandPalette/CommandList' +import { Notifications } from '../../../../shared/src/notifications/Notifications' import { DOMFunctions } from '@sourcegraph/codeintellify' import * as H from 'history' import { decorationAttachmentStyleForTheme, decorationStyleForTheme, -} from '../../../../../shared/src/api/client/services/decoration' +} from '../../../../shared/src/api/client/services/decoration' import { createController as createExtensionsController, ExtensionsControllerProps, -} from '../../../../../shared/src/extensions/controller' -import { PlatformContextProps } from '../../../../../shared/src/platform/context' -import { NOOP_TELEMETRY_SERVICE } from '../../../../../shared/src/telemetry/telemetryService' +} from '../../../../shared/src/extensions/controller' +import { PlatformContextProps } from '../../../../shared/src/platform/context' +import { NOOP_TELEMETRY_SERVICE } from '../../../../shared/src/telemetry/telemetryService' import { createPlatformContext } from '../../platform/context' import { GlobalDebug } from '../../shared/components/GlobalDebug' import { ShortcutProvider } from '../../shared/components/ShortcutProvider' diff --git a/client/browser/src/libs/code_intelligence/external_links.scss b/browser/src/libs/code_intelligence/external_links.scss similarity index 100% rename from client/browser/src/libs/code_intelligence/external_links.scss rename to browser/src/libs/code_intelligence/external_links.scss diff --git a/client/browser/src/libs/code_intelligence/external_links.test.tsx b/browser/src/libs/code_intelligence/external_links.test.tsx similarity index 100% rename from client/browser/src/libs/code_intelligence/external_links.test.tsx rename to browser/src/libs/code_intelligence/external_links.test.tsx diff --git a/client/browser/src/libs/code_intelligence/external_links.tsx b/browser/src/libs/code_intelligence/external_links.tsx similarity index 100% rename from client/browser/src/libs/code_intelligence/external_links.tsx rename to browser/src/libs/code_intelligence/external_links.tsx diff --git a/client/browser/src/libs/code_intelligence/index.ts b/browser/src/libs/code_intelligence/index.ts similarity index 100% rename from client/browser/src/libs/code_intelligence/index.ts rename to browser/src/libs/code_intelligence/index.ts diff --git a/client/browser/src/libs/code_intelligence/text_fields.test.tsx b/browser/src/libs/code_intelligence/text_fields.test.tsx similarity index 91% rename from client/browser/src/libs/code_intelligence/text_fields.test.tsx rename to browser/src/libs/code_intelligence/text_fields.test.tsx index e5c9d4f5d08..5b7aec959cc 100644 --- a/client/browser/src/libs/code_intelligence/text_fields.test.tsx +++ b/browser/src/libs/code_intelligence/text_fields.test.tsx @@ -8,10 +8,10 @@ jest.mock('react-dom', () => ({ import { uniqueId } from 'lodash' import { from, NEVER, Subject, Subscription } from 'rxjs' import { first, skip, take } from 'rxjs/operators' -import { Services } from '../../../../../shared/src/api/client/services' -import { CodeEditor } from '../../../../../shared/src/api/client/services/editorService' -import { integrationTestContext } from '../../../../../shared/src/api/integration-test/testHelpers' -import { Controller } from '../../../../../shared/src/extensions/controller' +import { Services } from '../../../../shared/src/api/client/services' +import { CodeEditor } from '../../../../shared/src/api/client/services/editorService' +import { integrationTestContext } from '../../../../shared/src/api/integration-test/testHelpers' +import { Controller } from '../../../../shared/src/extensions/controller' import { MutationRecordLike } from '../../shared/util/dom' import { handleTextFields } from './text_fields' diff --git a/client/browser/src/libs/code_intelligence/text_fields.tsx b/browser/src/libs/code_intelligence/text_fields.tsx similarity index 92% rename from client/browser/src/libs/code_intelligence/text_fields.tsx rename to browser/src/libs/code_intelligence/text_fields.tsx index a2c8c1777be..cd3ae2aaea8 100644 --- a/client/browser/src/libs/code_intelligence/text_fields.tsx +++ b/browser/src/libs/code_intelligence/text_fields.tsx @@ -2,10 +2,10 @@ import React from 'react' import { render } from 'react-dom' import { animationFrameScheduler, fromEvent, Observable, Subscription, Unsubscribable } from 'rxjs' import { observeOn } from 'rxjs/operators' -import { COMMENT_URI_SCHEME } from '../../../../../shared/src/api/client/types/textDocument' -import { EditorCompletionWidget } from '../../../../../shared/src/components/completion/EditorCompletionWidget' -import { EditorTextFieldUtils } from '../../../../../shared/src/components/editorTextField/EditorTextField' -import { ExtensionsControllerProps } from '../../../../../shared/src/extensions/controller' +import { COMMENT_URI_SCHEME } from '../../../../shared/src/api/client/types/textDocument' +import { EditorCompletionWidget } from '../../../../shared/src/components/completion/EditorCompletionWidget' +import { EditorTextFieldUtils } from '../../../../shared/src/components/editorTextField/EditorTextField' +import { ExtensionsControllerProps } from '../../../../shared/src/extensions/controller' import { MutationRecordLike } from '../../shared/util/dom' import { CodeHost } from './code_intelligence' import { trackViews } from './views' diff --git a/client/browser/src/libs/code_intelligence/util/file_info.ts b/browser/src/libs/code_intelligence/util/file_info.ts similarity index 100% rename from client/browser/src/libs/code_intelligence/util/file_info.ts rename to browser/src/libs/code_intelligence/util/file_info.ts diff --git a/client/browser/src/libs/code_intelligence/util/selections.ts b/browser/src/libs/code_intelligence/util/selections.ts similarity index 95% rename from client/browser/src/libs/code_intelligence/util/selections.ts rename to browser/src/libs/code_intelligence/util/selections.ts index 555c69c972c..0e658bcb0ea 100644 --- a/client/browser/src/libs/code_intelligence/util/selections.ts +++ b/browser/src/libs/code_intelligence/util/selections.ts @@ -2,7 +2,7 @@ import { Selection } from '@sourcegraph/extension-api-types' import { isEqual } from 'lodash' import { fromEvent, Observable } from 'rxjs' import { distinctUntilChanged, map } from 'rxjs/operators' -import { lprToSelectionsZeroIndexed, parseHash } from '../../../../../../shared/src/util/url' +import { lprToSelectionsZeroIndexed, parseHash } from '../../../../../shared/src/util/url' export function getSelectionsFromHash(): Selection[] { return lprToSelectionsZeroIndexed(parseHash(window.location.hash)) diff --git a/client/browser/src/libs/code_intelligence/views.ts b/browser/src/libs/code_intelligence/views.ts similarity index 98% rename from client/browser/src/libs/code_intelligence/views.ts rename to browser/src/libs/code_intelligence/views.ts index 240dc1acd78..6a340a03829 100644 --- a/client/browser/src/libs/code_intelligence/views.ts +++ b/browser/src/libs/code_intelligence/views.ts @@ -1,6 +1,6 @@ import { from, merge, Observable } from 'rxjs' import { concatAll, filter, map, mergeMap } from 'rxjs/operators' -import { isDefined, isInstanceOf } from '../../../../../shared/src/util/types' +import { isDefined, isInstanceOf } from '../../../../shared/src/util/types' import { MutationRecordLike, querySelectorAllOrSelf } from '../../shared/util/dom' /** diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/refined-github/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/refined-github/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/refined-github/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/refined-github/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/refined-github/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/refined-github/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/refined-github/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/refined-github/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/vanilla/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/vanilla/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/vanilla/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/vanilla/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/vanilla/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/vanilla/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/vanilla/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/blob/vanilla/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/split/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/split/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/split/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/split/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/split/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/split/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/split/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/split/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/unified/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/unified/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/unified/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/unified/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/unified/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/unified/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/unified/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/refined-github/unified/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/split/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/split/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/split/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/split/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/split/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/split/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/split/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/split/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/unified/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/unified/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/unified/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/unified/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/unified/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/unified/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/unified/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/commit/vanilla/unified/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/refined-github/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/refined-github/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/refined-github/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/refined-github/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/refined-github/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/refined-github/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/refined-github/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/refined-github/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/vanilla/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/vanilla/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/vanilla/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/vanilla/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/vanilla/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/vanilla/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/vanilla/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request-discussion/vanilla/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/split/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/split/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/split/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/split/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/split/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/split/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/split/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/split/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/unified/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/unified/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/unified/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/unified/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/unified/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/unified/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/unified/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/refined-github/unified/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/split/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/split/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/split/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/split/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/split/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/split/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/split/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/split/page.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/unified/code-view.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/unified/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/unified/code-view.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/unified/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/unified/page.html b/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/unified/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/unified/page.html rename to browser/src/libs/github/__fixtures__/ghe-2.14.11/pull-request/vanilla/unified/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/blob/refined-github/code-view.html b/browser/src/libs/github/__fixtures__/github.com/blob/refined-github/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/blob/refined-github/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/blob/refined-github/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/blob/refined-github/page.html b/browser/src/libs/github/__fixtures__/github.com/blob/refined-github/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/blob/refined-github/page.html rename to browser/src/libs/github/__fixtures__/github.com/blob/refined-github/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/blob/vanilla/code-view.html b/browser/src/libs/github/__fixtures__/github.com/blob/vanilla/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/blob/vanilla/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/blob/vanilla/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/blob/vanilla/page.html b/browser/src/libs/github/__fixtures__/github.com/blob/vanilla/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/blob/vanilla/page.html rename to browser/src/libs/github/__fixtures__/github.com/blob/vanilla/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/split/code-view.html b/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/split/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/split/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/commit/refined-github/split/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/split/page.html b/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/split/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/split/page.html rename to browser/src/libs/github/__fixtures__/github.com/commit/refined-github/split/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/unified/code-view.html b/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/unified/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/unified/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/commit/refined-github/unified/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/unified/page.html b/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/unified/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/commit/refined-github/unified/page.html rename to browser/src/libs/github/__fixtures__/github.com/commit/refined-github/unified/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/split/code-view.html b/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/split/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/split/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/commit/vanilla/split/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/split/page.html b/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/split/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/split/page.html rename to browser/src/libs/github/__fixtures__/github.com/commit/vanilla/split/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/unified/code-view.html b/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/unified/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/unified/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/commit/vanilla/unified/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/unified/page.html b/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/unified/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/commit/vanilla/unified/page.html rename to browser/src/libs/github/__fixtures__/github.com/commit/vanilla/unified/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/refined-github/code-view.html b/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/refined-github/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/refined-github/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/refined-github/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/refined-github/page.html b/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/refined-github/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/refined-github/page.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/refined-github/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/vanilla/code-view.html b/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/vanilla/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/vanilla/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/vanilla/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/vanilla/page.html b/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/vanilla/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/vanilla/page.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request-discussion/vanilla/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/split/code-view.html b/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/split/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/split/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/split/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/split/page.html b/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/split/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/split/page.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/split/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/unified/code-view.html b/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/unified/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/unified/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/unified/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/unified/page.html b/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/unified/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/unified/page.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request/refined-github/unified/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/split/code-view.html b/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/split/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/split/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/split/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/split/page.html b/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/split/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/split/page.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/split/page.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/unified/code-view.html b/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/unified/code-view.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/unified/code-view.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/unified/code-view.html diff --git a/client/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/unified/page.html b/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/unified/page.html similarity index 100% rename from client/browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/unified/page.html rename to browser/src/libs/github/__fixtures__/github.com/pull-request/vanilla/unified/page.html diff --git a/client/browser/src/libs/github/__snapshots__/dom_functions.test.ts.snap b/browser/src/libs/github/__snapshots__/dom_functions.test.ts.snap similarity index 100% rename from client/browser/src/libs/github/__snapshots__/dom_functions.test.ts.snap rename to browser/src/libs/github/__snapshots__/dom_functions.test.ts.snap diff --git a/client/browser/src/libs/github/code_intelligence.test.ts b/browser/src/libs/github/code_intelligence.test.ts similarity index 100% rename from client/browser/src/libs/github/code_intelligence.test.ts rename to browser/src/libs/github/code_intelligence.test.ts diff --git a/client/browser/src/libs/github/code_intelligence.ts b/browser/src/libs/github/code_intelligence.ts similarity index 99% rename from client/browser/src/libs/github/code_intelligence.ts rename to browser/src/libs/github/code_intelligence.ts index 6cfeb4da378..4fd9639edac 100644 --- a/client/browser/src/libs/github/code_intelligence.ts +++ b/browser/src/libs/github/code_intelligence.ts @@ -9,7 +9,7 @@ import { ResolvedRevSpec, RevSpec, ViewStateSpec, -} from '../../../../../shared/src/util/url' +} from '../../../../shared/src/util/url' import { fetchBlobContentLines } from '../../shared/repo/backend' import { querySelectorOrSelf } from '../../shared/util/dom' import { toAbsoluteBlobURL } from '../../shared/util/url' diff --git a/client/browser/src/libs/github/content_views.ts b/browser/src/libs/github/content_views.ts similarity index 100% rename from client/browser/src/libs/github/content_views.ts rename to browser/src/libs/github/content_views.ts diff --git a/client/browser/src/libs/github/dom_functions.test.ts b/browser/src/libs/github/dom_functions.test.ts similarity index 100% rename from client/browser/src/libs/github/dom_functions.test.ts rename to browser/src/libs/github/dom_functions.test.ts diff --git a/client/browser/src/libs/github/dom_functions.ts b/browser/src/libs/github/dom_functions.ts similarity index 100% rename from client/browser/src/libs/github/dom_functions.ts rename to browser/src/libs/github/dom_functions.ts diff --git a/client/browser/src/libs/github/extensions.tsx b/browser/src/libs/github/extensions.tsx similarity index 100% rename from client/browser/src/libs/github/extensions.tsx rename to browser/src/libs/github/extensions.tsx diff --git a/client/browser/src/libs/github/file_info.ts b/browser/src/libs/github/file_info.ts similarity index 99% rename from client/browser/src/libs/github/file_info.ts rename to browser/src/libs/github/file_info.ts index 85159e11f1a..5e1d8e91ebc 100644 --- a/client/browser/src/libs/github/file_info.ts +++ b/browser/src/libs/github/file_info.ts @@ -1,9 +1,9 @@ import { isDefined, propertyIsDefined } from '@sourcegraph/codeintellify/lib/helpers' import { Observable, of, throwError, zip } from 'rxjs' import { filter, map, switchMap } from 'rxjs/operators' -import { GitHubBlobUrl } from '.' import { resolveRev, retryWhenCloneInProgressError } from '../../shared/repo/backend' import { FileInfo } from '../code_intelligence' +import { GitHubBlobUrl } from '../github' import { getCommitIDFromPermalink } from './scrape' import { getDeltaFileName, getDiffResolvedRev, getGitHubState, parseURL } from './util' diff --git a/client/browser/src/libs/github/index.tsx b/browser/src/libs/github/index.tsx similarity index 92% rename from client/browser/src/libs/github/index.tsx rename to browser/src/libs/github/index.tsx index bc395b87548..066950ce362 100644 --- a/client/browser/src/libs/github/index.tsx +++ b/browser/src/libs/github/index.tsx @@ -1,4 +1,4 @@ -import { ParsedRepoURI } from '../../../../../shared/src/util/url' +import { ParsedRepoURI } from '../../../../shared/src/util/url' export interface GitHubURL extends ParsedRepoURI { user?: string diff --git a/client/browser/src/libs/github/scrape.ts b/browser/src/libs/github/scrape.ts similarity index 100% rename from client/browser/src/libs/github/scrape.ts rename to browser/src/libs/github/scrape.ts diff --git a/client/browser/src/libs/github/style.scss b/browser/src/libs/github/style.scss similarity index 100% rename from client/browser/src/libs/github/style.scss rename to browser/src/libs/github/style.scss diff --git a/client/browser/src/libs/github/text_fields.ts b/browser/src/libs/github/text_fields.ts similarity index 100% rename from client/browser/src/libs/github/text_fields.ts rename to browser/src/libs/github/text_fields.ts diff --git a/client/browser/src/libs/github/tooltip.test.ts b/browser/src/libs/github/tooltip.test.ts similarity index 100% rename from client/browser/src/libs/github/tooltip.test.ts rename to browser/src/libs/github/tooltip.test.ts diff --git a/client/browser/src/libs/github/tooltip.ts b/browser/src/libs/github/tooltip.ts similarity index 100% rename from client/browser/src/libs/github/tooltip.ts rename to browser/src/libs/github/tooltip.ts diff --git a/client/browser/src/libs/github/util.test.ts b/browser/src/libs/github/util.test.ts similarity index 100% rename from client/browser/src/libs/github/util.test.ts rename to browser/src/libs/github/util.test.ts diff --git a/client/browser/src/libs/github/util.tsx b/browser/src/libs/github/util.tsx similarity index 99% rename from client/browser/src/libs/github/util.tsx rename to browser/src/libs/github/util.tsx index c6662a22500..70478a291ed 100644 --- a/client/browser/src/libs/github/util.tsx +++ b/browser/src/libs/github/util.tsx @@ -1,5 +1,5 @@ -import { GitHubBlobUrl, GitHubMode, GitHubPullUrl, GitHubRepositoryUrl, GitHubURL } from '.' import { DiffResolvedRevSpec } from '../../shared/repo' +import { GitHubBlobUrl, GitHubMode, GitHubPullUrl, GitHubRepositoryUrl, GitHubURL } from '../github' /** * getFileContainers returns the elements on the page which should be marked diff --git a/client/browser/src/libs/gitlab/__fixtures__/code-views/pr-unified.html b/browser/src/libs/gitlab/__fixtures__/code-views/pr-unified.html similarity index 100% rename from client/browser/src/libs/gitlab/__fixtures__/code-views/pr-unified.html rename to browser/src/libs/gitlab/__fixtures__/code-views/pr-unified.html diff --git a/client/browser/src/libs/gitlab/__fixtures__/repository.html b/browser/src/libs/gitlab/__fixtures__/repository.html similarity index 100% rename from client/browser/src/libs/gitlab/__fixtures__/repository.html rename to browser/src/libs/gitlab/__fixtures__/repository.html diff --git a/client/browser/src/libs/gitlab/api.ts b/browser/src/libs/gitlab/api.ts similarity index 96% rename from client/browser/src/libs/gitlab/api.ts rename to browser/src/libs/gitlab/api.ts index 3149871117f..eb3ae7d7af6 100644 --- a/client/browser/src/libs/gitlab/api.ts +++ b/browser/src/libs/gitlab/api.ts @@ -3,7 +3,7 @@ import { Observable } from 'rxjs' import { ajax } from 'rxjs/ajax' import { map } from 'rxjs/operators' -import { memoizeObservable } from '../../../../../shared/src/util/memoizeObservable' +import { memoizeObservable } from '../../../../shared/src/util/memoizeObservable' import { GitLabDiffInfo } from './scrape' /** diff --git a/client/browser/src/libs/gitlab/code_intelligence.test.ts b/browser/src/libs/gitlab/code_intelligence.test.ts similarity index 100% rename from client/browser/src/libs/gitlab/code_intelligence.test.ts rename to browser/src/libs/gitlab/code_intelligence.test.ts diff --git a/client/browser/src/libs/gitlab/code_intelligence.ts b/browser/src/libs/gitlab/code_intelligence.ts similarity index 100% rename from client/browser/src/libs/gitlab/code_intelligence.ts rename to browser/src/libs/gitlab/code_intelligence.ts diff --git a/client/browser/src/libs/gitlab/dom_functions.ts b/browser/src/libs/gitlab/dom_functions.ts similarity index 100% rename from client/browser/src/libs/gitlab/dom_functions.ts rename to browser/src/libs/gitlab/dom_functions.ts diff --git a/client/browser/src/libs/gitlab/extensions.ts b/browser/src/libs/gitlab/extensions.ts similarity index 100% rename from client/browser/src/libs/gitlab/extensions.ts rename to browser/src/libs/gitlab/extensions.ts diff --git a/client/browser/src/libs/gitlab/file_info.ts b/browser/src/libs/gitlab/file_info.ts similarity index 100% rename from client/browser/src/libs/gitlab/file_info.ts rename to browser/src/libs/gitlab/file_info.ts diff --git a/client/browser/src/libs/gitlab/scrape.ts b/browser/src/libs/gitlab/scrape.ts similarity index 100% rename from client/browser/src/libs/gitlab/scrape.ts rename to browser/src/libs/gitlab/scrape.ts diff --git a/client/browser/src/libs/gitlab/style.scss b/browser/src/libs/gitlab/style.scss similarity index 100% rename from client/browser/src/libs/gitlab/style.scss rename to browser/src/libs/gitlab/style.scss diff --git a/client/browser/src/libs/options/Header.scss b/browser/src/libs/options/Header.scss similarity index 100% rename from client/browser/src/libs/options/Header.scss rename to browser/src/libs/options/Header.scss diff --git a/client/browser/src/libs/options/Header.tsx b/browser/src/libs/options/Header.tsx similarity index 100% rename from client/browser/src/libs/options/Header.tsx rename to browser/src/libs/options/Header.tsx diff --git a/client/browser/src/libs/options/Menu.scss b/browser/src/libs/options/Menu.scss similarity index 100% rename from client/browser/src/libs/options/Menu.scss rename to browser/src/libs/options/Menu.scss diff --git a/client/browser/src/libs/options/Menu.test.tsx b/browser/src/libs/options/Menu.test.tsx similarity index 100% rename from client/browser/src/libs/options/Menu.test.tsx rename to browser/src/libs/options/Menu.test.tsx diff --git a/client/browser/src/libs/options/Menu.tsx b/browser/src/libs/options/Menu.tsx similarity index 100% rename from client/browser/src/libs/options/Menu.tsx rename to browser/src/libs/options/Menu.tsx diff --git a/client/browser/src/libs/options/OptionsContainer.test.tsx b/browser/src/libs/options/OptionsContainer.test.tsx similarity index 100% rename from client/browser/src/libs/options/OptionsContainer.test.tsx rename to browser/src/libs/options/OptionsContainer.test.tsx diff --git a/client/browser/src/libs/options/OptionsContainer.tsx b/browser/src/libs/options/OptionsContainer.tsx similarity index 100% rename from client/browser/src/libs/options/OptionsContainer.tsx rename to browser/src/libs/options/OptionsContainer.tsx diff --git a/client/browser/src/libs/options/ServerURLForm.scss b/browser/src/libs/options/ServerURLForm.scss similarity index 100% rename from client/browser/src/libs/options/ServerURLForm.scss rename to browser/src/libs/options/ServerURLForm.scss diff --git a/client/browser/src/libs/options/ServerURLForm.test.tsx b/browser/src/libs/options/ServerURLForm.test.tsx similarity index 100% rename from client/browser/src/libs/options/ServerURLForm.test.tsx rename to browser/src/libs/options/ServerURLForm.test.tsx diff --git a/client/browser/src/libs/options/ServerURLForm.tsx b/browser/src/libs/options/ServerURLForm.tsx similarity index 100% rename from client/browser/src/libs/options/ServerURLForm.tsx rename to browser/src/libs/options/ServerURLForm.tsx diff --git a/client/browser/src/libs/options/__snapshots__/Menu.test.tsx.snap b/browser/src/libs/options/__snapshots__/Menu.test.tsx.snap similarity index 100% rename from client/browser/src/libs/options/__snapshots__/Menu.test.tsx.snap rename to browser/src/libs/options/__snapshots__/Menu.test.tsx.snap diff --git a/client/browser/src/libs/options/styles.scss b/browser/src/libs/options/styles.scss similarity index 100% rename from client/browser/src/libs/options/styles.scss rename to browser/src/libs/options/styles.scss diff --git a/client/browser/src/libs/phabricator/__fixtures__/code-views/diff-side-by-side.html b/browser/src/libs/phabricator/__fixtures__/code-views/diff-side-by-side.html similarity index 100% rename from client/browser/src/libs/phabricator/__fixtures__/code-views/diff-side-by-side.html rename to browser/src/libs/phabricator/__fixtures__/code-views/diff-side-by-side.html diff --git a/client/browser/src/libs/phabricator/__fixtures__/diff.html b/browser/src/libs/phabricator/__fixtures__/diff.html similarity index 100% rename from client/browser/src/libs/phabricator/__fixtures__/diff.html rename to browser/src/libs/phabricator/__fixtures__/diff.html diff --git a/client/browser/src/libs/phabricator/backend.tsx b/browser/src/libs/phabricator/backend.tsx similarity index 99% rename from client/browser/src/libs/phabricator/backend.tsx rename to browser/src/libs/phabricator/backend.tsx index f8bd95c692d..1233d14a070 100644 --- a/client/browser/src/libs/phabricator/backend.tsx +++ b/browser/src/libs/phabricator/backend.tsx @@ -1,6 +1,6 @@ import { from, Observable } from 'rxjs' import { map } from 'rxjs/operators' -import { memoizeObservable } from '../../../../../shared/src/util/memoizeObservable' +import { memoizeObservable } from '../../../../shared/src/util/memoizeObservable' import { storage } from '../../browser/storage' import { isExtension } from '../../context' import { getContext } from '../../shared/backend/context' diff --git a/client/browser/src/libs/phabricator/code_intelligence.test.ts b/browser/src/libs/phabricator/code_intelligence.test.ts similarity index 100% rename from client/browser/src/libs/phabricator/code_intelligence.test.ts rename to browser/src/libs/phabricator/code_intelligence.test.ts diff --git a/client/browser/src/libs/phabricator/code_intelligence.ts b/browser/src/libs/phabricator/code_intelligence.ts similarity index 98% rename from client/browser/src/libs/phabricator/code_intelligence.ts rename to browser/src/libs/phabricator/code_intelligence.ts index daaa3b68d49..1cbfcd05b9c 100644 --- a/client/browser/src/libs/phabricator/code_intelligence.ts +++ b/browser/src/libs/phabricator/code_intelligence.ts @@ -2,12 +2,12 @@ import { AdjustmentDirection, PositionAdjuster } from '@sourcegraph/codeintellif import { Position } from '@sourcegraph/extension-api-types' import { map } from 'rxjs/operators' import { Omit } from 'utility-types' -import { convertSpacesToTabs, spacesToTabsAdjustment } from '.' -import { FileSpec, RepoSpec, ResolvedRevSpec, RevSpec } from '../../../../../shared/src/util/url' +import { FileSpec, RepoSpec, ResolvedRevSpec, RevSpec } from '../../../../shared/src/util/url' import { fetchBlobContentLines } from '../../shared/repo/backend' import { CodeHost } from '../code_intelligence' import { CodeView, toCodeViewResolver } from '../code_intelligence/code_views' import { ViewResolver } from '../code_intelligence/views' +import { convertSpacesToTabs, spacesToTabsAdjustment } from '../phabricator' import { diffDomFunctions, diffusionDOMFns } from './dom_functions' import { resolveDiffFileInfo, resolveDiffusionFileInfo, resolveRevisionFileInfo } from './file_info' diff --git a/client/browser/src/libs/phabricator/dom_functions.ts b/browser/src/libs/phabricator/dom_functions.ts similarity index 100% rename from client/browser/src/libs/phabricator/dom_functions.ts rename to browser/src/libs/phabricator/dom_functions.ts diff --git a/client/browser/src/libs/phabricator/extension.tsx b/browser/src/libs/phabricator/extension.tsx similarity index 97% rename from client/browser/src/libs/phabricator/extension.tsx rename to browser/src/libs/phabricator/extension.tsx index 705dde68a25..7fdecf31f86 100644 --- a/client/browser/src/libs/phabricator/extension.tsx +++ b/browser/src/libs/phabricator/extension.tsx @@ -4,7 +4,7 @@ import * as H from 'history' import React from 'react' import { Observable } from 'rxjs' import { startWith } from 'rxjs/operators' -import { setLinkComponent } from '../../../../../shared/src/components/Link' +import { setLinkComponent } from '../../../../shared/src/components/Link' import { setSourcegraphUrl } from '../../shared/util/context' import { MutationRecordLike, observeMutations } from '../../shared/util/dom' import { determineCodeHost, injectCodeIntelligenceToCodeHost } from '../code_intelligence' diff --git a/client/browser/src/libs/phabricator/file_info.ts b/browser/src/libs/phabricator/file_info.ts similarity index 99% rename from client/browser/src/libs/phabricator/file_info.ts rename to browser/src/libs/phabricator/file_info.ts index 4d41b227f3e..62ac1a2dec4 100644 --- a/client/browser/src/libs/phabricator/file_info.ts +++ b/browser/src/libs/phabricator/file_info.ts @@ -1,7 +1,7 @@ import { from, Observable, zip } from 'rxjs' import { catchError, filter, map, switchMap } from 'rxjs/operators' -import { DifferentialState, DiffusionState, PhabricatorMode, RevisionState } from '.' import { FileInfo } from '../code_intelligence' +import { DifferentialState, DiffusionState, PhabricatorMode, RevisionState } from '../phabricator' import { resolveDiffRev } from './backend' import { getFilepathFromFileForDiff, getFilePathFromFileForRevision } from './scrape' import { getPhabricatorState } from './util' diff --git a/client/browser/src/libs/phabricator/index.tsx b/browser/src/libs/phabricator/index.tsx similarity index 95% rename from client/browser/src/libs/phabricator/index.tsx rename to browser/src/libs/phabricator/index.tsx index 97219ca3444..8b9c1263541 100644 --- a/client/browser/src/libs/phabricator/index.tsx +++ b/browser/src/libs/phabricator/index.tsx @@ -1,4 +1,4 @@ -import { AbsoluteRepoFile } from '../../../../../shared/src/util/url' +import { AbsoluteRepoFile } from '../../../../shared/src/util/url' export enum PhabricatorMode { Diffusion = 1, diff --git a/client/browser/src/libs/phabricator/scrape.ts b/browser/src/libs/phabricator/scrape.ts similarity index 100% rename from client/browser/src/libs/phabricator/scrape.ts rename to browser/src/libs/phabricator/scrape.ts diff --git a/client/browser/src/libs/phabricator/style.scss b/browser/src/libs/phabricator/style.scss similarity index 100% rename from client/browser/src/libs/phabricator/style.scss rename to browser/src/libs/phabricator/style.scss diff --git a/client/browser/src/libs/phabricator/util.tsx b/browser/src/libs/phabricator/util.tsx similarity index 99% rename from client/browser/src/libs/phabricator/util.tsx rename to browser/src/libs/phabricator/util.tsx index b62a81e8081..7c2478c82cb 100644 --- a/client/browser/src/libs/phabricator/util.tsx +++ b/browser/src/libs/phabricator/util.tsx @@ -1,4 +1,4 @@ -import { ChangeState, DifferentialState, DiffusionState, PhabricatorMode, RevisionState } from '.' +import { ChangeState, DifferentialState, DiffusionState, PhabricatorMode, RevisionState } from '../phabricator' import { getRepoDetailsFromCallsign, getRepoDetailsFromDifferentialID } from './backend' const TAG_PATTERN = /r([0-9A-z]+)([0-9a-f]{40})/ diff --git a/client/browser/src/libs/sentry/index.ts b/browser/src/libs/sentry/index.ts similarity index 96% rename from client/browser/src/libs/sentry/index.ts rename to browser/src/libs/sentry/index.ts index 8059e4319a6..6d9eee74556 100644 --- a/client/browser/src/libs/sentry/index.ts +++ b/browser/src/libs/sentry/index.ts @@ -39,7 +39,7 @@ export function initSentry(script: 'content' | 'options' | 'background'): void { // Don't initialize if user hasn't allowed us to report errors or in Phabricator. if (!allowed || isInPage) { - const client = Sentry.getCurrentHub().getClient() as Sentry.BrowserClient | undefined + const client = Sentry.getCurrentHub().getClient() if (client) { client.getOptions().enabled = false } diff --git a/client/browser/src/libs/sourcegraph/inject.tsx b/browser/src/libs/sourcegraph/inject.tsx similarity index 100% rename from client/browser/src/libs/sourcegraph/inject.tsx rename to browser/src/libs/sourcegraph/inject.tsx diff --git a/client/browser/src/options.scss b/browser/src/options.scss similarity index 95% rename from client/browser/src/options.scss rename to browser/src/options.scss index a640c9e225b..760a587a0b3 100644 --- a/client/browser/src/options.scss +++ b/browser/src/options.scss @@ -2,6 +2,16 @@ Options page css */ +@import 'bootstrap/scss/functions'; +@import 'bootstrap/scss/variables'; +@import 'bootstrap/scss/reboot'; +@import 'bootstrap/scss/type'; +@import 'bootstrap/scss/mixins'; +@import 'bootstrap/scss/utilities'; +@import 'bootstrap/scss/grid'; +@import 'bootstrap/scss/forms'; +@import 'bootstrap/scss/custom-forms'; + $code-font-family: SFMono-Regular, Consolas, Menlo, DejaVu Sans Mono, monospace; .options { diff --git a/client/browser/src/platform/context.ts b/browser/src/platform/context.ts similarity index 91% rename from client/browser/src/platform/context.ts rename to browser/src/platform/context.ts index f2a26105785..6241e645fdb 100644 --- a/client/browser/src/platform/context.ts +++ b/browser/src/platform/context.ts @@ -1,12 +1,12 @@ import { combineLatest, merge, Observable, ReplaySubject } from 'rxjs' import { map, mergeMap, publishReplay, refCount, switchMap, take } from 'rxjs/operators' -import { GraphQLResult } from '../../../../shared/src/graphql/graphql' -import * as GQL from '../../../../shared/src/graphql/schema' -import { PlatformContext } from '../../../../shared/src/platform/context' -import { mutateSettings, updateSettings } from '../../../../shared/src/settings/edit' -import { EMPTY_SETTINGS_CASCADE, gqlToCascade } from '../../../../shared/src/settings/settings' -import { LocalStorageSubject } from '../../../../shared/src/util/LocalStorageSubject' -import { toPrettyBlobURL } from '../../../../shared/src/util/url' +import { GraphQLResult } from '../../../shared/src/graphql/graphql' +import * as GQL from '../../../shared/src/graphql/schema' +import { PlatformContext } from '../../../shared/src/platform/context' +import { mutateSettings, updateSettings } from '../../../shared/src/settings/edit' +import { EMPTY_SETTINGS_CASCADE, gqlToCascade } from '../../../shared/src/settings/settings' +import { LocalStorageSubject } from '../../../shared/src/util/LocalStorageSubject' +import { toPrettyBlobURL } from '../../../shared/src/util/url' import { ExtensionStorageSubject } from '../browser/ExtensionStorageSubject' import { background } from '../browser/runtime' import { observeStorageKey } from '../browser/storage' diff --git a/client/browser/src/platform/extensionHost.ts b/browser/src/platform/extensionHost.ts similarity index 97% rename from client/browser/src/platform/extensionHost.ts rename to browser/src/platform/extensionHost.ts index d9bbb188ada..7e022e7f90b 100644 --- a/client/browser/src/platform/extensionHost.ts +++ b/browser/src/platform/extensionHost.ts @@ -1,8 +1,8 @@ import * as MessageChannelAdapter from '@sourcegraph/comlink/messagechanneladapter' import { Observable } from 'rxjs' import uuid from 'uuid' -import { createExtensionHost as createInPageExtensionHost } from '../../../../shared/src/api/extension/worker' -import { EndpointPair } from '../../../../shared/src/platform/context' +import { createExtensionHost as createInPageExtensionHost } from '../../../shared/src/api/extension/worker' +import { EndpointPair } from '../../../shared/src/platform/context' import { isInPage } from '../context' /** diff --git a/client/browser/src/platform/settings.ts b/browser/src/platform/settings.ts similarity index 92% rename from client/browser/src/platform/settings.ts rename to browser/src/platform/settings.ts index c46b58e724d..6bb0a589e2b 100644 --- a/client/browser/src/platform/settings.ts +++ b/browser/src/platform/settings.ts @@ -2,17 +2,17 @@ import { applyEdits, parse as parseJSONC } from '@sqs/jsonc-parser' import { setProperty } from '@sqs/jsonc-parser/lib/edit' import { Observable } from 'rxjs' import { map } from 'rxjs/operators' -import { SettingsEdit } from '../../../../shared/src/api/client/services/settings' -import { gql, graphQLContent } from '../../../../shared/src/graphql/graphql' -import * as GQL from '../../../../shared/src/graphql/schema' +import { SettingsEdit } from '../../../shared/src/api/client/services/settings' +import { gql, graphQLContent } from '../../../shared/src/graphql/graphql' +import * as GQL from '../../../shared/src/graphql/schema' import { mergeSettings, SettingsCascade, SettingsCascadeOrError, SettingsSubject, -} from '../../../../shared/src/settings/settings' -import { createAggregateError, isErrorLike } from '../../../../shared/src/util/errors' -import { LocalStorageSubject } from '../../../../shared/src/util/LocalStorageSubject' +} from '../../../shared/src/settings/settings' +import { createAggregateError, isErrorLike } from '../../../shared/src/util/errors' +import { LocalStorageSubject } from '../../../shared/src/util/LocalStorageSubject' import { observeStorageKey, storage } from '../browser/storage' import { isInPage } from '../context' import { getContext } from '../shared/backend/context' diff --git a/client/browser/src/platform/worker.ts b/browser/src/platform/worker.ts similarity index 100% rename from client/browser/src/platform/worker.ts rename to browser/src/platform/worker.ts diff --git a/client/browser/src/shared.scss b/browser/src/shared.scss similarity index 79% rename from client/browser/src/shared.scss rename to browser/src/shared.scss index 5240100cfea..9cb77a96640 100644 --- a/client/browser/src/shared.scss +++ b/browser/src/shared.scss @@ -1,13 +1,13 @@ // CSS for components shared with the webapp -@import '../../../shared/src/actions/ActionItem'; -@import '../../../shared/src/commandPalette/CommandList'; -@import '../../../shared/src/components/completion/CompletionWidget.scss'; -@import '../../../shared/src/components/PopoverButton'; -@import '../../../shared/src/components/Toggle'; -@import '../../../shared/src/extensions/ExtensionStatus'; -@import '../../../shared/src/notifications/NotificationItem'; -@import '../../../shared/src/notifications/Notifications'; +@import '../../shared/src/actions/ActionItem'; +@import '../../shared/src/commandPalette/CommandList'; +@import '../../shared/src/components/completion/CompletionWidget.scss'; +@import '../../shared/src/components/PopoverButton'; +@import '../../shared/src/components/Toggle'; +@import '../../shared/src/extensions/ExtensionStatus'; +@import '../../shared/src/notifications/NotificationItem'; +@import '../../shared/src/notifications/Notifications'; $body-color-light: #2b3750; $body-color-dark: #f2f4f8; diff --git a/client/browser/src/shared/backend/context.ts b/browser/src/shared/backend/context.ts similarity index 100% rename from client/browser/src/shared/backend/context.ts rename to browser/src/shared/backend/context.ts diff --git a/client/browser/src/shared/backend/diffs.tsx b/browser/src/shared/backend/diffs.tsx similarity index 92% rename from client/browser/src/shared/backend/diffs.tsx rename to browser/src/shared/backend/diffs.tsx index 6b2b1fe2a35..f2f8bd33d88 100644 --- a/client/browser/src/shared/backend/diffs.tsx +++ b/browser/src/shared/backend/diffs.tsx @@ -1,7 +1,7 @@ import { Observable } from 'rxjs' import { map } from 'rxjs/operators' -import * as GQL from '../../../../../shared/src/graphql/schema' -import { memoizeObservable } from '../../../../../shared/src/util/memoizeObservable' +import * as GQL from '../../../../shared/src/graphql/schema' +import { memoizeObservable } from '../../../../shared/src/util/memoizeObservable' import { createAggregateError } from './errors' import { queryGraphQL } from './graphql' diff --git a/client/browser/src/shared/backend/errors.tsx b/browser/src/shared/backend/errors.tsx similarity index 100% rename from client/browser/src/shared/backend/errors.tsx rename to browser/src/shared/backend/errors.tsx diff --git a/client/browser/src/shared/backend/graphql.test.tsx b/browser/src/shared/backend/graphql.test.tsx similarity index 98% rename from client/browser/src/shared/backend/graphql.test.tsx rename to browser/src/shared/backend/graphql.test.tsx index 9299c0d8984..5b02f94c69d 100644 --- a/client/browser/src/shared/backend/graphql.test.tsx +++ b/browser/src/shared/backend/graphql.test.tsx @@ -1,5 +1,5 @@ import { of, throwError } from 'rxjs' -import * as GQL from '../../../../../shared/src/graphql/schema' +import * as GQL from '../../../../shared/src/graphql/schema' import { DEFAULT_SOURCEGRAPH_URL } from '../util/context' import { RequestContext } from './context' import { ERAUTHREQUIRED, ERPRIVATEREPOPUBLICSOURCEGRAPHCOM } from './errors' diff --git a/client/browser/src/shared/backend/graphql.ts b/browser/src/shared/backend/graphql.ts similarity index 97% rename from client/browser/src/shared/backend/graphql.ts rename to browser/src/shared/backend/graphql.ts index f2e38dcb6e8..038907f5978 100644 --- a/client/browser/src/shared/backend/graphql.ts +++ b/browser/src/shared/backend/graphql.ts @@ -1,8 +1,8 @@ import { from, Observable, throwError } from 'rxjs' import { ajax } from 'rxjs/ajax' import { catchError, map } from 'rxjs/operators' -import { GraphQLResult } from '../../../../../shared/src/graphql/graphql' -import * as GQL from '../../../../../shared/src/graphql/schema' +import { GraphQLResult } from '../../../../shared/src/graphql/graphql' +import * as GQL from '../../../../shared/src/graphql/schema' import { background } from '../../browser/runtime' import { isBackground, isInPage } from '../../context' import { DEFAULT_SOURCEGRAPH_URL, repoUrlCache, sourcegraphUrl } from '../util/context' diff --git a/client/browser/src/shared/backend/headers.tsx b/browser/src/shared/backend/headers.tsx similarity index 100% rename from client/browser/src/shared/backend/headers.tsx rename to browser/src/shared/backend/headers.tsx diff --git a/client/browser/src/shared/backend/lsp.tsx b/browser/src/shared/backend/lsp.tsx similarity index 80% rename from client/browser/src/shared/backend/lsp.tsx rename to browser/src/shared/backend/lsp.tsx index 0b0884d4fa5..0f1ee70eef4 100644 --- a/client/browser/src/shared/backend/lsp.tsx +++ b/browser/src/shared/backend/lsp.tsx @@ -1,11 +1,11 @@ import { Location } from '@sourcegraph/extension-api-types' import { from, Observable } from 'rxjs' import { map, switchMap } from 'rxjs/operators' -import { HoverMerged } from '../../../../../shared/src/api/client/types/hover' -import { TextDocumentIdentifier } from '../../../../../shared/src/api/client/types/textDocument' -import { TextDocumentPositionParams } from '../../../../../shared/src/api/protocol' -import { Controller } from '../../../../../shared/src/extensions/controller' -import { AbsoluteRepoFilePosition, FileSpec, RepoSpec, ResolvedRevSpec } from '../../../../../shared/src/util/url' +import { HoverMerged } from '../../../../shared/src/api/client/types/hover' +import { TextDocumentIdentifier } from '../../../../shared/src/api/client/types/textDocument' +import { TextDocumentPositionParams } from '../../../../shared/src/api/protocol' +import { Controller } from '../../../../shared/src/extensions/controller' +import { AbsoluteRepoFilePosition, FileSpec, RepoSpec, ResolvedRevSpec } from '../../../../shared/src/util/url' interface SimpleProviderFns { getHover: (pos: AbsoluteRepoFilePosition) => Observable diff --git a/client/browser/src/shared/backend/search.tsx b/browser/src/shared/backend/search.tsx similarity index 99% rename from client/browser/src/shared/backend/search.tsx rename to browser/src/shared/backend/search.tsx index 07ce2879431..bd7d45fd7d3 100644 --- a/client/browser/src/shared/backend/search.tsx +++ b/browser/src/shared/backend/search.tsx @@ -14,7 +14,7 @@ import { take, toArray, } from 'rxjs/operators' -import * as GQL from '../../../../../shared/src/graphql/schema' +import * as GQL from '../../../../shared/src/graphql/schema' import { getContext } from './context' import { createAggregateError } from './errors' import { queryGraphQL } from './graphql' diff --git a/client/browser/src/shared/backend/server.ts b/browser/src/shared/backend/server.ts similarity index 97% rename from client/browser/src/shared/backend/server.ts rename to browser/src/shared/backend/server.ts index 8ddbc453f22..94a6ac6cb2f 100644 --- a/client/browser/src/shared/backend/server.ts +++ b/browser/src/shared/backend/server.ts @@ -1,6 +1,6 @@ import { Observable } from 'rxjs' import { catchError, map } from 'rxjs/operators' -import * as GQL from '../../../../../shared/src/graphql/schema' +import * as GQL from '../../../../shared/src/graphql/schema' import { isOptions } from '../../context' import { sourcegraphUrl } from '../util/context' import { getContext } from './context' diff --git a/client/browser/src/shared/backend/userEvents.tsx b/browser/src/shared/backend/userEvents.tsx similarity index 100% rename from client/browser/src/shared/backend/userEvents.tsx rename to browser/src/shared/backend/userEvents.tsx diff --git a/client/browser/src/shared/components/Button.tsx b/browser/src/shared/components/Button.tsx similarity index 100% rename from client/browser/src/shared/components/Button.tsx rename to browser/src/shared/components/Button.tsx diff --git a/client/browser/src/shared/components/CodeViewToolbar.scss b/browser/src/shared/components/CodeViewToolbar.scss similarity index 100% rename from client/browser/src/shared/components/CodeViewToolbar.scss rename to browser/src/shared/components/CodeViewToolbar.scss diff --git a/client/browser/src/shared/components/CodeViewToolbar.tsx b/browser/src/shared/components/CodeViewToolbar.tsx similarity index 90% rename from client/browser/src/shared/components/CodeViewToolbar.tsx rename to browser/src/shared/components/CodeViewToolbar.tsx index 7a856affcfc..64c123a7e7f 100644 --- a/client/browser/src/shared/components/CodeViewToolbar.tsx +++ b/browser/src/shared/components/CodeViewToolbar.tsx @@ -2,13 +2,13 @@ import classNames from 'classnames' import H from 'history' import * as React from 'react' import { Subscription } from 'rxjs' -import { ActionNavItemsClassProps, ActionsNavItems } from '../../../../../shared/src/actions/ActionsNavItems' -import { ContributionScope } from '../../../../../shared/src/api/client/context/context' -import { ContributableMenu } from '../../../../../shared/src/api/protocol' -import { ExtensionsControllerProps } from '../../../../../shared/src/extensions/controller' -import { ISite, IUser } from '../../../../../shared/src/graphql/schema' -import { PlatformContextProps } from '../../../../../shared/src/platform/context' -import { TelemetryProps } from '../../../../../shared/src/telemetry/telemetryService' +import { ActionNavItemsClassProps, ActionsNavItems } from '../../../../shared/src/actions/ActionsNavItems' +import { ContributionScope } from '../../../../shared/src/api/client/context/context' +import { ContributableMenu } from '../../../../shared/src/api/protocol' +import { ExtensionsControllerProps } from '../../../../shared/src/extensions/controller' +import { ISite, IUser } from '../../../../shared/src/graphql/schema' +import { PlatformContextProps } from '../../../../shared/src/platform/context' +import { TelemetryProps } from '../../../../shared/src/telemetry/telemetryService' import { FileInfoWithContents } from '../../libs/code_intelligence/code_views' import { fetchCurrentUser, fetchSite } from '../backend/server' import { OpenDiffOnSourcegraph } from './OpenDiffOnSourcegraph' diff --git a/client/browser/src/shared/components/GlobalDebug.tsx b/browser/src/shared/components/GlobalDebug.tsx similarity index 82% rename from client/browser/src/shared/components/GlobalDebug.tsx rename to browser/src/shared/components/GlobalDebug.tsx index 1f5f9c0dd1a..96da19b5355 100644 --- a/client/browser/src/shared/components/GlobalDebug.tsx +++ b/browser/src/shared/components/GlobalDebug.tsx @@ -1,8 +1,8 @@ import * as H from 'history' import * as React from 'react' -import { Controller as ClientController } from '../../../../../shared/src/extensions/controller' -import { ExtensionStatusPopover } from '../../../../../shared/src/extensions/ExtensionStatus' -import { PlatformContextProps } from '../../../../../shared/src/platform/context' +import { Controller as ClientController } from '../../../../shared/src/extensions/controller' +import { ExtensionStatusPopover } from '../../../../shared/src/extensions/ExtensionStatus' +import { PlatformContextProps } from '../../../../shared/src/platform/context' import { sourcegraphUrl } from '../util/context' import { ShortcutProvider } from './ShortcutProvider' diff --git a/client/browser/src/shared/components/Icons.tsx b/browser/src/shared/components/Icons.tsx similarity index 100% rename from client/browser/src/shared/components/Icons.tsx rename to browser/src/shared/components/Icons.tsx diff --git a/client/browser/src/shared/components/OpenDiffOnSourcegraph.tsx b/browser/src/shared/components/OpenDiffOnSourcegraph.tsx similarity index 98% rename from client/browser/src/shared/components/OpenDiffOnSourcegraph.tsx rename to browser/src/shared/components/OpenDiffOnSourcegraph.tsx index a08cb63fbef..0fc96fbf5ae 100644 --- a/client/browser/src/shared/components/OpenDiffOnSourcegraph.tsx +++ b/browser/src/shared/components/OpenDiffOnSourcegraph.tsx @@ -1,7 +1,7 @@ import * as React from 'react' import { Subject, Subscription } from 'rxjs' import { catchError, map, switchMap } from 'rxjs/operators' -import { IFileDiffConnection } from '../../../../../shared/src/graphql/schema' +import { IFileDiffConnection } from '../../../../shared/src/graphql/schema' import { queryRepositoryComparisonFileDiffs } from '../backend/diffs' import { OpenDiffInSourcegraphProps } from '../repo' import { getPlatformName, repoUrlCache, sourcegraphUrl } from '../util/context' diff --git a/client/browser/src/shared/components/OpenOnSourcegraph.tsx b/browser/src/shared/components/OpenOnSourcegraph.tsx similarity index 100% rename from client/browser/src/shared/components/OpenOnSourcegraph.tsx rename to browser/src/shared/components/OpenOnSourcegraph.tsx diff --git a/client/browser/src/shared/components/ShortcutProvider.tsx b/browser/src/shared/components/ShortcutProvider.tsx similarity index 100% rename from client/browser/src/shared/components/ShortcutProvider.tsx rename to browser/src/shared/components/ShortcutProvider.tsx diff --git a/client/browser/src/shared/components/alerts.scss b/browser/src/shared/components/alerts.scss similarity index 100% rename from client/browser/src/shared/components/alerts.scss rename to browser/src/shared/components/alerts.scss diff --git a/client/browser/src/shared/components/symbols/SymbolIcon.tsx b/browser/src/shared/components/symbols/SymbolIcon.tsx similarity index 98% rename from client/browser/src/shared/components/symbols/SymbolIcon.tsx rename to browser/src/shared/components/symbols/SymbolIcon.tsx index 644099f7064..636d9bbc1e3 100644 --- a/client/browser/src/shared/components/symbols/SymbolIcon.tsx +++ b/browser/src/shared/components/symbols/SymbolIcon.tsx @@ -25,7 +25,7 @@ import TimetableIcon from 'mdi-react/TimetableIcon' import WebIcon from 'mdi-react/WebIcon' import WrenchIcon from 'mdi-react/WrenchIcon' import * as React from 'react' -import * as GQL from '../../../../../../shared/src/graphql/schema' +import * as GQL from '../../../../../shared/src/graphql/schema' /** * Returns the icon component for a given symbol kind diff --git a/client/browser/src/shared/global-styles/variables.scss b/browser/src/shared/global-styles/variables.scss similarity index 100% rename from client/browser/src/shared/global-styles/variables.scss rename to browser/src/shared/global-styles/variables.scss diff --git a/client/browser/src/shared/repo/backend.tsx b/browser/src/shared/repo/backend.tsx similarity index 97% rename from client/browser/src/shared/repo/backend.tsx rename to browser/src/shared/repo/backend.tsx index 4b751e08b39..cd02be21a25 100644 --- a/client/browser/src/shared/repo/backend.tsx +++ b/browser/src/shared/repo/backend.tsx @@ -1,7 +1,7 @@ import { Observable } from 'rxjs' import { catchError, delay, filter, map, retryWhen } from 'rxjs/operators' -import { memoizeObservable } from '../../../../../shared/src/util/memoizeObservable' -import { FileSpec, makeRepoURI, RepoSpec, ResolvedRevSpec } from '../../../../../shared/src/util/url' +import { memoizeObservable } from '../../../../shared/src/util/memoizeObservable' +import { FileSpec, makeRepoURI, RepoSpec, ResolvedRevSpec } from '../../../../shared/src/util/url' import { getContext } from '../backend/context' import { CloneInProgressError, ECLONEINPROGESS, RepoNotFoundError, RevNotFoundError } from '../backend/errors' import { queryGraphQL } from '../backend/graphql' diff --git a/client/browser/src/shared/repo/index.tsx b/browser/src/shared/repo/index.tsx similarity index 100% rename from client/browser/src/shared/repo/index.tsx rename to browser/src/shared/repo/index.tsx diff --git a/client/browser/src/shared/util/browser.ts b/browser/src/shared/util/browser.ts similarity index 100% rename from client/browser/src/shared/util/browser.ts rename to browser/src/shared/util/browser.ts diff --git a/client/browser/src/shared/util/context.tsx b/browser/src/shared/util/context.tsx similarity index 100% rename from client/browser/src/shared/util/context.tsx rename to browser/src/shared/util/context.tsx diff --git a/client/browser/src/shared/util/dom.tsx b/browser/src/shared/util/dom.tsx similarity index 100% rename from client/browser/src/shared/util/dom.tsx rename to browser/src/shared/util/dom.tsx diff --git a/client/browser/src/shared/util/featureFlags.ts b/browser/src/shared/util/featureFlags.ts similarity index 100% rename from client/browser/src/shared/util/featureFlags.ts rename to browser/src/shared/util/featureFlags.ts diff --git a/client/browser/src/shared/util/url.test.ts b/browser/src/shared/util/url.test.ts similarity index 100% rename from client/browser/src/shared/util/url.test.ts rename to browser/src/shared/util/url.test.ts diff --git a/client/browser/src/shared/util/url.ts b/browser/src/shared/util/url.ts similarity index 93% rename from client/browser/src/shared/util/url.ts rename to browser/src/shared/util/url.ts index 93ac635e143..61d57009acf 100644 --- a/client/browser/src/shared/util/url.ts +++ b/browser/src/shared/util/url.ts @@ -5,7 +5,7 @@ import { RevSpec, toPrettyBlobURL, ViewStateSpec, -} from '../../../../../shared/src/util/url' +} from '../../../../shared/src/util/url' import { repoUrlCache, sourcegraphUrl } from './context' /** diff --git a/client/browser/src/types/chrome-webstore-upload/index.d.ts b/browser/src/types/chrome-webstore-upload/index.d.ts similarity index 100% rename from client/browser/src/types/chrome-webstore-upload/index.d.ts rename to browser/src/types/chrome-webstore-upload/index.d.ts diff --git a/client/browser/src/types/chrome/index.d.ts b/browser/src/types/chrome/index.d.ts similarity index 100% rename from client/browser/src/types/chrome/index.d.ts rename to browser/src/types/chrome/index.d.ts diff --git a/client/browser/src/types/plist/index.d.ts b/browser/src/types/plist/index.d.ts similarity index 100% rename from client/browser/src/types/plist/index.d.ts rename to browser/src/types/plist/index.d.ts diff --git a/client/browser/src/types/string-score/index.d.ts b/browser/src/types/string-score/index.d.ts similarity index 100% rename from client/browser/src/types/string-score/index.d.ts rename to browser/src/types/string-score/index.d.ts diff --git a/client/browser/src/types/web-ext-types/index.d.ts b/browser/src/types/web-ext-types/index.d.ts similarity index 100% rename from client/browser/src/types/web-ext-types/index.d.ts rename to browser/src/types/web-ext-types/index.d.ts diff --git a/client/browser/src/types/web-extensions/index.d.ts b/browser/src/types/web-extensions/index.d.ts similarity index 100% rename from client/browser/src/types/web-extensions/index.d.ts rename to browser/src/types/web-extensions/index.d.ts diff --git a/client/browser/stories/global.scss b/browser/stories/global.scss similarity index 100% rename from client/browser/stories/global.scss rename to browser/stories/global.scss diff --git a/client/browser/stories/options/Header.tsx b/browser/stories/options/Header.tsx similarity index 100% rename from client/browser/stories/options/Header.tsx rename to browser/stories/options/Header.tsx diff --git a/client/browser/stories/options/Menu.tsx b/browser/stories/options/Menu.tsx similarity index 100% rename from client/browser/stories/options/Menu.tsx rename to browser/stories/options/Menu.tsx diff --git a/client/browser/stories/options/ServerURLForm.tsx b/browser/stories/options/ServerURLForm.tsx similarity index 100% rename from client/browser/stories/options/ServerURLForm.tsx rename to browser/stories/options/ServerURLForm.tsx diff --git a/browser/tsconfig.json b/browser/tsconfig.json new file mode 100644 index 00000000000..5d444d62ee9 --- /dev/null +++ b/browser/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "typeRoots": ["src/types", "../shared/src/types", "../node_modules/@types", "../node_modules/web-ext-types"], + "jsx": "react", + "resolveJsonModule": true + }, + "include": ["**/*"], + "exclude": [ + "../node_modules", + "./build/**/*", + "coverage", + "stories" // TODO fix type errors and include + ] +} diff --git a/client/browser/tslint.json b/browser/tslint.json similarity index 83% rename from client/browser/tslint.json rename to browser/tslint.json index 1bfc2949ba2..7975049042b 100644 --- a/client/browser/tslint.json +++ b/browser/tslint.json @@ -1,5 +1,5 @@ { - "extends": ["../../tslint.json"], + "extends": ["../tslint.json"], "linterOptions": { "exclude": ["node_modules/**", "**/*.json", "coverage/**"] }, "rules": { "deprecation": { diff --git a/client/browser/yarn.lock b/browser/yarn.lock similarity index 100% rename from client/browser/yarn.lock rename to browser/yarn.lock diff --git a/client/browser/jest.config.js b/client/browser/jest.config.js deleted file mode 100644 index ab333c60dee..00000000000 --- a/client/browser/jest.config.js +++ /dev/null @@ -1,7 +0,0 @@ -// @ts-check - -/** @type {jest.InitialOptions} */ -const config = require('../../jest.config.base') - -/** @type {jest.InitialOptions} */ -module.exports = { ...config, displayName: 'client/browser', rootDir: __dirname } diff --git a/client/browser/tsconfig.json b/client/browser/tsconfig.json deleted file mode 100644 index c9136d97619..00000000000 --- a/client/browser/tsconfig.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { - "typeRoots": [ - "src/types", - "../../shared/src/types", - "../../node_modules/@types", - "../../node_modules/web-ext-types" - ], - "jsx": "react", - "resolveJsonModule": true - }, - "include": ["**/*"], - "exclude": [ - "../../node_modules", - "./build/**/*", - "coverage", - "stories" // TODO fix type errors and include - ] -} diff --git a/cmd/frontend/internal/app/sign_out.go b/cmd/frontend/internal/app/sign_out.go index d059b586618..17fb29a48a2 100644 --- a/cmd/frontend/internal/app/sign_out.go +++ b/cmd/frontend/internal/app/sign_out.go @@ -83,14 +83,14 @@ html { -webkit-text-size-adjust: 100%; } body { - /* Body BG color from gray-23 client/browser/src/global-styles/colors.scss*/ + /* Body BG color from gray-23 browser/src/global-styles/colors.scss*/ background-color: #0e121b; } * { font-family: system,-apple-system,San Francisco,\.SFNSDisplay-Regular,Segoe UI,Segoe,Segoe WP,Helvetica Neue,helvetica,Lucida Grande,arial,sans-serif; font-size: 14px; - /* Text color from gray-01 client/browser/src/global-styles/colors.scss */ + /* Text color from gray-01 browser/src/global-styles/colors.scss */ color: #f2f4f8; } .auth-box { @@ -100,7 +100,7 @@ body { margin: 10vh auto auto; overflow: hidden; - /* colors from client/browser/src/global-styles/colors.scss */ + /* colors from browser/src/global-styles/colors.scss */ border: 1px solid #2B3750; background-color: #1D2535; box-shadow: 0 0 8px 0 rgba(0,0,0,.4); @@ -111,7 +111,7 @@ body { .auth-box { border: none; margin-top: 64px; - /* colors from client/browser/src/global-styles/colors.scss */ + /* colors from browser/src/global-styles/colors.scss */ background-color: #0e121b; } } @@ -132,7 +132,7 @@ a { line-height: 20px; border: none; border-radius: 2px; - /* colors from client/browser/src/global-styles/colors.scss */ + /* colors from browser/src/global-styles/colors.scss */ background-color: #2b3750; margin-bottom: 20px; text-decoration: none; diff --git a/dev/foreach-ts-project.sh b/dev/foreach-ts-project.sh index 6c6e7a0541b..0fca8e1ab19 100755 --- a/dev/foreach-ts-project.sh +++ b/dev/foreach-ts-project.sh @@ -4,6 +4,6 @@ set -e unset CDPATH cd "$(dirname "${BASH_SOURCE[0]}")/.." # cd to repo root dir -for dir in web shared packages/sourcegraph-extension-api client/browser; do +for dir in web shared packages/sourcegraph-extension-api browser; do (set -x; cd "$dir" && "$@") done diff --git a/doc/dev/architecture.md b/doc/dev/architecture.md index deacbe0df5d..3af9fcf7306 100644 --- a/doc/dev/architecture.md +++ b/doc/dev/architecture.md @@ -58,7 +58,7 @@ Mirrors repositories from their code host. All other Sourcegraph services talk t gitserver's memory usage consists of short lived git subprocesses. -This is an IO and compute heavy service since most Sourcegraph requests will trigger 1 or more git commands. As such we shard requests for a repo to a specific replica. This allows us to horizontally scale out the service. +This is an IO and compute heavy service since most Sourcegraph requests will trigger 1 or more git commands. As such we shard requests for a repo to a specific replica. This allows us to horizontally scale out the service. The service is stateful (maintaining git clones). However, it only contains data mirrored from upstream code hosts. @@ -98,7 +98,7 @@ Syntect is a Rust service that is responsible for syntax highlighting. Horizontally scalable, but typically only one replica is necessary. -### Browser extensions ([code](https://github.com/sourcegraph/sourcegraph/tree/master/client/browser) | [docs](https://docs.sourcegraph.com/integration/browser_extension)) +### Browser extensions ([code](https://github.com/sourcegraph/sourcegraph/tree/master/browser) | [docs](https://docs.sourcegraph.com/integration/browser_extension)) We publish browser extensions for Chrome, Firefox, and Safari, that provide code intelligence (hover tooltips, jump to definition, find references) when browsing code on code hosts. By default it works for open-source code, but it also works for private code if your company has a Sourcegraph deployment. diff --git a/doc/dev/testing.md b/doc/dev/testing.md index eccdbce3135..0c7d8659c3d 100644 --- a/doc/dev/testing.md +++ b/doc/dev/testing.md @@ -11,7 +11,7 @@ directly, `go test ./util/textutil`. - To run unit tests in development (only running the tests related to uncommitted code), run `yarn test --watch`. - And/or use [vscode-jest](https://github.com/jest-community/vscode-jest) with `jest.autoEnable: true` (and, if you want, `jest.showCoverageOnLoad: true`) - To debug tests in VS Code, use [vscode-jest](https://github.com/jest-community/vscode-jest) and click the **Debug** code lens next to any `test('name ...', ...)` definition in your test file (be sure to set a breakpoint or break on uncaught exceptions by clicking in the left gutter). -- You can also run `yarn test` from any of the individual project dirs (`shared/`, `web/`, `client/browser/`). +- You can also run `yarn test` from any of the individual project dirs (`shared/`, `web/`, `browser/`). Usually while developing you will either have `yarn test --watch` running in a terminal or you will use vscode-jest. diff --git a/doc/dev/typescript/build.md b/doc/dev/typescript/build.md index 15560905820..e0b8ec857ba 100644 --- a/doc/dev/typescript/build.md +++ b/doc/dev/typescript/build.md @@ -8,7 +8,7 @@ We use TypeScript for two products: - [`web`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/web): The main Sourcegraph web application - 2 different entrypoints: [OSS `main.tsx`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/web/src/main.tsx) and [Enterprise `main.tsx`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/web/src/enterprise/main.tsx) -- [`client/browser`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/client/brower): The Sourcegraph browser extension +- [`browser`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/client/brower): The Sourcegraph browser extension These both use shared TypeScript code in [`../shared`](https://sourcegraph.com/github.com/sourcegraph/sourcegraph/-/tree/shared). Each product has its own separate Webpack configuration. diff --git a/doc/integration/browser_extension.md b/doc/integration/browser_extension.md index 629023b6fc7..17900e9cacc 100644 --- a/doc/integration/browser_extension.md +++ b/doc/integration/browser_extension.md @@ -1,6 +1,6 @@ # Sourcegraph browser extension -The [open-source](https://github.com/sourcegraph/sourcegraph/tree/master/client/browser) Sourcegraph +The [open-source](https://github.com/sourcegraph/sourcegraph/tree/master/browser) Sourcegraph browser extension adds code intelligence to files and diffs on GitHub, GitHub Enterprise, GitLab, Phabricator, and Bitbucket Server. diff --git a/enterprise/cmd/frontend/pre-build.sh b/enterprise/cmd/frontend/pre-build.sh index 50ecbe88c28..cfb73e35e97 100755 --- a/enterprise/cmd/frontend/pre-build.sh +++ b/enterprise/cmd/frontend/pre-build.sh @@ -5,7 +5,7 @@ cd $(dirname "${BASH_SOURCE[0]}")/../.. pushd .. yarn --frozen-lockfile --network-timeout 60000 -(pushd client/browser && TARGETS=phabricator yarn build && popd) +(pushd browser && TARGETS=phabricator yarn build && popd) (pushd web && NODE_ENV=production yarn -s run build --color && popd) popd diff --git a/enterprise/dev/ci/gen-pipeline.go b/enterprise/dev/ci/gen-pipeline.go index c64e2900ced..7e9b4be80d3 100644 --- a/enterprise/dev/ci/gen-pipeline.go +++ b/enterprise/dev/ci/gen-pipeline.go @@ -120,7 +120,7 @@ func main() { // Browser extension build pipeline.AddStep(":webpack::chrome:", - bk.Cmd("dev/ci/yarn-build.sh client/browser")) + bk.Cmd("dev/ci/yarn-build.sh browser")) if !isBextReleaseBranch { // Webapp build @@ -143,8 +143,8 @@ func main() { // Browser extension tests pipeline.AddStep(":jest::chrome:", - bk.Cmd("dev/ci/yarn-test.sh client/browser"), - bk.ArtifactPaths("client/browser/coverage/coverage-final.json")) + bk.Cmd("dev/ci/yarn-test.sh browser"), + bk.ArtifactPaths("browser/coverage/coverage-final.json")) // Shared tests pipeline.AddStep(":jest:", @@ -265,7 +265,7 @@ func main() { pipeline.AddStep(":chromium:", bk.Env("PUPPETEER_SKIP_CHROMIUM_DOWNLOAD", ""), bk.Cmd("yarn --frozen-lockfile --network-timeout 60000"), - bk.Cmd("pushd client/browser"), + bk.Cmd("pushd browser"), bk.Cmd("yarn -s run build"), bk.Cmd("yarn -s run test-e2e"), bk.Cmd("popd"), @@ -277,7 +277,7 @@ func main() { pipeline.AddStep(":chrome:", bk.Env("FORCE_COLOR", "1"), bk.Cmd("yarn --frozen-lockfile --network-timeout 60000"), - bk.Cmd("pushd client/browser"), + bk.Cmd("pushd browser"), bk.Cmd("yarn -s run build"), bk.Cmd("yarn release:chrome"), bk.Cmd("popd")) @@ -286,7 +286,7 @@ func main() { pipeline.AddStep(":firefox:", bk.Env("FORCE_COLOR", "1"), bk.Cmd("yarn --frozen-lockfile --network-timeout 60000"), - bk.Cmd("pushd client/browser"), + bk.Cmd("pushd browser"), bk.Cmd("yarn release:ff"), bk.Cmd("popd")) } diff --git a/gulpfile.ts b/gulpfile.ts index 46eeb40dba3..d5fda9a2c3b 100644 --- a/gulpfile.ts +++ b/gulpfile.ts @@ -1,5 +1,5 @@ import gulp from 'gulp' -import { phabricator, watchPhabricator } from './client/browser/gulpfile' +import { phabricator, watchPhabricator } from './browser/gulpfile' import { graphQLTypes, schema, watchGraphQLTypes, watchSchema } from './shared/gulpfile' import { webpack as webWebpack, webpackDevServer as webWebpackDevServer } from './web/gulpfile' diff --git a/jest.config.base.js b/jest.config.base.js index bd0da8e71f5..a0f4de9548f 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -33,7 +33,7 @@ const config = { globals: { 'ts-jest': { diagnostics: { - pathRegex: '(client/browser|shared|web)/src', + pathRegex: '(browser|shared|web)/src', warnOnly: true, }, }, diff --git a/jest.config.js b/jest.config.js index 377e14ffc27..5e5431de2a0 100644 --- a/jest.config.js +++ b/jest.config.js @@ -6,5 +6,5 @@ const config = require('./jest.config.base') /** @type {jest.InitialOptions} */ module.exports = { ...config, - projects: ['client/browser/jest.config.js', 'shared/jest.config.js', 'web/jest.config.js'], + projects: ['browser/jest.config.js', 'shared/jest.config.js', 'web/jest.config.js'], } diff --git a/package.json b/package.json index ed3de597fc4..b4eaa8e0402 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "prettier": "prettier '**/{*.{js?(on),ts?(x),graphql,md,scss},.*.js?(on)}' --write --list-different --config prettier.config.js", "prettier-check": "npm run prettier -- --write=false", "all:tslint": "dev/foreach-ts-project.sh yarn -s run tslint", - "all:stylelint": "yarn --cwd web run stylelint && yarn --cwd client/browser run stylelint", + "all:stylelint": "yarn --cwd web run stylelint && yarn --cwd browser run stylelint", "all:typecheck": "gulp generate && dev/foreach-ts-project.sh ./node_modules/.bin/tsc -p tsconfig.json", "graphql": "gulp graphQLTypes", "graphql-lint": "graphql-schema-linter --old-implements-syntax --comment-descriptions cmd/frontend/graphqlbackend/schema.graphql", @@ -37,7 +37,7 @@ "**/__fixtures__", "**/*.svg", "migrations", - "client/browser/build", + "browser/build", "ui", "**/assets" ] diff --git a/shared/src/panel/views/HierarchicalLocationsView.test.tsx b/shared/src/panel/views/HierarchicalLocationsView.test.tsx index 1b4ce3f20c5..11b5efe36f8 100644 --- a/shared/src/panel/views/HierarchicalLocationsView.test.tsx +++ b/shared/src/panel/views/HierarchicalLocationsView.test.tsx @@ -36,7 +36,7 @@ describe('', () => { } const location: H.Location = { hash: '#L36:18&tab=references', - pathname: '/github.com/sourcegraph/sourcegraph/-/blob/client/browser/src/libs/phabricator/index.tsx', + pathname: '/github.com/sourcegraph/sourcegraph/-/blob/browser/src/libs/phabricator/index.tsx', search: '', state: {}, } diff --git a/web/gulpfile.ts b/web/gulpfile.ts index 734f1cf327c..895945778ff 100644 --- a/web/gulpfile.ts +++ b/web/gulpfile.ts @@ -2,7 +2,7 @@ import log from 'fancy-log' import gulp from 'gulp' import createWebpackCompiler, { Stats } from 'webpack' import WebpackDevServer from 'webpack-dev-server' -import { phabricator, watchPhabricator } from '../client/browser/gulpfile' +import { phabricator, watchPhabricator } from '../browser/gulpfile' import { graphQLTypes, schema, watchGraphQLTypes, watchSchema } from '../shared/gulpfile' import webpackConfig from './webpack.config'