diff --git a/__tests__/__snapshots__/fetchers.js.snap b/__tests__/__snapshots__/fetchers.js.snap deleted file mode 100644 index 8bb05b8e1e..0000000000 --- a/__tests__/__snapshots__/fetchers.js.snap +++ /dev/null @@ -1 +0,0 @@ -exports[`test TarballFetcher.fetch throws 1`] = `"https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz: Bad hash. Expected foo but got 9689b3b48d63ff70f170a192bec3c01b04f58f45 "`; diff --git a/__tests__/fetchers.js b/__tests__/fetchers.js index 6bfb81a905..f7aadc388f 100644 --- a/__tests__/fetchers.js +++ b/__tests__/fetchers.js @@ -1,10 +1,10 @@ /* @flow */ /* eslint max-len: 0 */ -import TarballFetcher, {LocalTarballFetcher} from '../src/fetchers/tarball-fetcher.js'; +// import TarballFetcher, {LocalTarballFetcher} from '../src/fetchers/tarball-fetcher.js'; import BaseFetcher from '../src/fetchers/base-fetcher.js'; import CopyFetcher from '../src/fetchers/copy-fetcher.js'; -import GitFetcher from '../src/fetchers/git-fetcher.js'; +// import GitFetcher from '../src/fetchers/git-fetcher.js'; import {NoopReporter} from '../src/reporters/index.js'; import Config from '../src/config.js'; import mkdir from './_temp.js'; @@ -53,60 +53,60 @@ test('CopyFetcher.fetch', async () => { expect(contentFoo).toBe('bar'); }); -test('GitFetcher.fetch', async () => { - const dir = await mkdir('git-fetcher'); - const fetcher = new GitFetcher(dir, { - type: 'git', - reference: 'https://github.com/PolymerElements/font-roboto', - hash: '2fd5c7bd715a24fb5b250298a140a3ba1b71fe46', - registry: 'bower', - }, await createConfig()); - await fetcher.fetch(); - const name = (await fs.readJson(path.join(dir, 'bower.json'))).name; - expect(name).toBe('font-roboto'); -}); +// test('GitFetcher.fetch', async () => { +// const dir = await mkdir('git-fetcher'); +// const fetcher = new GitFetcher(dir, { +// type: 'git', +// reference: 'https://github.com/PolymerElements/font-roboto', +// hash: '2fd5c7bd715a24fb5b250298a140a3ba1b71fe46', +// registry: 'bower', +// }, await createConfig()); +// await fetcher.fetch(); +// const name = (await fs.readJson(path.join(dir, 'bower.json'))).name; +// expect(name).toBe('font-roboto'); +// }); -test('TarballFetcher.fetch', async () => { - const dir = await mkdir('tarball-fetcher'); - const fetcher = new TarballFetcher(dir, { - type: 'tarball', - hash: '9689b3b48d63ff70f170a192bec3c01b04f58f45', - reference: 'https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz', - registry: 'bower', - }, await createConfig()); +// test('TarballFetcher.fetch', async () => { +// const dir = await mkdir('tarball-fetcher'); +// const fetcher = new TarballFetcher(dir, { +// type: 'tarball', +// hash: '9689b3b48d63ff70f170a192bec3c01b04f58f45', +// reference: 'https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz', +// registry: 'bower', +// }, await createConfig()); - await fetcher.fetch(); - const name = (await fs.readJson(path.join(dir, 'bower.json'))).name; - expect(name).toBe('font-roboto'); -}); +// await fetcher.fetch(); +// const name = (await fs.readJson(path.join(dir, 'bower.json'))).name; +// expect(name).toBe('font-roboto'); +// }); -test('TarballFetcher.fetch throws', async () => { - const dir = await mkdir('tarball-fetcher'); - const url = 'https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz'; - const fetcher = new TarballFetcher(dir, { - type: 'tarball', - hash: 'foo', - reference: url, - registry: 'bower', - }, await createConfig()); - let error; - try { - await fetcher.fetch(); - } catch (e) { - error = e; - } - expect(error && error.message).toMatchSnapshot(); -}); +// test('TarballFetcher.fetch throws', async () => { +// const dir = await mkdir('tarball-fetcher'); +// const url = 'https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz'; +// const fetcher = new TarballFetcher(dir, { +// type: 'tarball', +// hash: 'foo', +// reference: url, +// registry: 'bower', +// }, await createConfig()); +// let error; +// try { +// await fetcher.fetch(); +// } catch (e) { +// error = e; +// } +// expect(error && error.message).toMatchSnapshot(); +// }); -test('TarballFetcher.fetch supports local ungzipped tarball', async () => { - const dir = await mkdir('tarball-fetcher'); - const fetcher = new LocalTarballFetcher(dir, { - type: 'tarball', - hash: '76d4316a3965259f7074f167f44a7a7a393884be', - reference: path.join(__dirname, 'fixtures', 'fetchers', 'tarball', 'ungzipped.tar'), - registry: 'bower', - }, await createConfig()); - await fetcher.fetch(); - const name = (await fs.readJson(path.join(dir, 'bower.json'))).name; - expect(name).toBe('font-roboto'); -}); +// test('TarballFetcher.fetch supports local ungzipped tarball', async () => { +// const dir = await mkdir('tarball-fetcher'); +// const fetcher = new LocalTarballFetcher(dir, { +// type: 'tarball', +// hash: '76d4316a3965259f7074f167f44a7a7a393884be', +// reference: path.join(__dirname, 'fixtures', 'fetchers', 'tarball', 'ungzipped.tar'), +// registry: 'bower', +// }, await createConfig()); +// await fetcher.fetch(); +// const name = (await fs.readJson(path.join(dir, 'bower.json'))).name; +// expect(name).toBe('font-roboto'); +// }); diff --git a/__tests__/package-resolver.js b/__tests__/package-resolver.js index 9525338709..69325879d6 100644 --- a/__tests__/package-resolver.js +++ b/__tests__/package-resolver.js @@ -34,11 +34,11 @@ function addTest(pattern, registry = 'npm') { }); } -addTest('github:PolymerElements/paper-elements', 'bower'); // github url -addTest('https://github.com/PolymerElements/font-roboto.git', 'bower'); // hosted git url +// addTest('github:PolymerElements/paper-elements', 'bower'); // github url +// addTest('https://github.com/PolymerElements/font-roboto.git', 'bower'); // hosted git url addTest('https://github.com/npm-ml/re'); // git url with no .git addTest('https://bitbucket.org/hgarcia/node-bitbucket-api.git'); // hosted git url -addTest('https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz'); // tarball +// addTest('https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz'); // tarball addTest('https://github.com/npm-ml/ocaml.git#npm-4.02.3'); // hash addTest('gitlab:leanlabsio/kanban'); // gitlab addTest('gist:d59975ac23e26ad4e25b'); // gist url diff --git a/src/registries/index.js b/src/registries/index.js index 83e907aa61..831497aeca 100644 --- a/src/registries/index.js +++ b/src/registries/index.js @@ -2,12 +2,12 @@ import YarnRegistry from './yarn-registry.js'; import NpmRegistry from './npm-registry.js'; -import BowerRegistry from './bower-registry.js'; +// import BowerRegistry from './bower-registry.js'; export const registries = { npm: NpmRegistry, yarn: YarnRegistry, - bower: BowerRegistry, + // bower: BowerRegistry, }; export const registryNames = Object.keys(registries); diff --git a/src/resolvers/index.js b/src/resolvers/index.js index e6f010cb7a..a482523361 100644 --- a/src/resolvers/index.js +++ b/src/resolvers/index.js @@ -1,11 +1,11 @@ /* @flow */ import RegistryNpm from './registries/npm-resolver.js'; -import RegistryBower from './registries/bower-resolver.js'; +// import RegistryBower from './registries/bower-resolver.js'; import RegistryYarn from './registries/yarn-resolver.js'; export const registries = { - bower: RegistryBower, + // bower: RegistryBower, npm: RegistryNpm, yarn: RegistryYarn, }; diff --git a/src/resolvers/registries/bower-resolver.js b/src/resolvers/registries/bower-resolver.js index b2f4ddf2c2..cf7a01bb2f 100644 --- a/src/resolvers/registries/bower-resolver.js +++ b/src/resolvers/registries/bower-resolver.js @@ -1,28 +1,28 @@ /* @flow */ -import type {Manifest} from '../../types.js'; -import {MessageError} from '../../errors.js'; -import RegistryResolver from './registry-resolver.js'; -import GitResolver from '../exotics/git-resolver.js'; +// import type {Manifest} from '../../types.js'; +// import {MessageError} from '../../errors.js'; +// import RegistryResolver from './registry-resolver.js'; +// import GitResolver from '../exotics/git-resolver.js'; -export default class BowerResolver extends RegistryResolver { - static registry = 'bower'; +// export default class BowerResolver extends RegistryResolver { +// static registry = 'bower'; - resolveRequest(): Promise { - return this.config.requestManager.request({ - url: `${this.registryConfig.registry}/packages/${this.name}`, - json: true, - queue: this.resolver.fetchingQueue, - }); - } +// resolveRequest(): Promise { +// return this.config.requestManager.request({ +// url: `${this.registryConfig.registry}/packages/${this.name}`, +// json: true, +// queue: this.resolver.fetchingQueue, +// }); +// } - async resolve(): Promise { - const body = await this.resolveRequest(); +// async resolve(): Promise { +// const body = await this.resolveRequest(); - if (body != null) { - return this.fork(GitResolver, false, `${body.url}#${this.range}`); - } else { - throw new MessageError(this.reporter.lang('packageNotFoundRegistry', this.name, 'bower')); - } - } -} +// if (body != null) { +// return this.fork(GitResolver, false, `${body.url}#${this.range}`); +// } else { +// throw new MessageError(this.reporter.lang('packageNotFoundRegistry', this.name, 'bower')); +// } +// } +// }