From 4ac4a7c671e73ab3fec6b54eac3989f1970eadac Mon Sep 17 00:00:00 2001 From: Yangshun Tay Date: Mon, 1 Apr 2019 22:18:44 -0700 Subject: [PATCH] misc(v2): make packages dir more consistent --- packages/docusaurus-plugin-content-docs/package.json | 2 +- .../{ => src}/__tests__/__snapshots__/sidebars.test.js.snap | 0 .../{ => src}/__tests__/index.test.js | 2 +- .../{ => src}/__tests__/metadata.test.js | 4 ++-- .../{ => src}/__tests__/order.test.js | 2 +- .../{ => src}/__tests__/sidebars.test.js | 4 ++-- packages/docusaurus-plugin-content-docs/{ => src}/index.js | 6 +++--- packages/docusaurus-plugin-content-pages/package.json | 2 +- .../{ => src}/__tests__/index.test.js | 2 +- packages/docusaurus-plugin-content-pages/{ => src}/index.js | 0 packages/docusaurus-plugin-sitemap/package.json | 2 +- .../{ => src}/__tests__/index.test.js | 2 +- packages/docusaurus-plugin-sitemap/{ => src}/index.js | 0 packages/docusaurus-utils/package.json | 2 +- .../docusaurus-utils/{test => src/__tests__}/index.test.js | 0 packages/docusaurus-utils/{ => src}/index.js | 0 16 files changed, 15 insertions(+), 15 deletions(-) rename packages/docusaurus-plugin-content-docs/{ => src}/__tests__/__snapshots__/sidebars.test.js.snap (100%) rename packages/docusaurus-plugin-content-docs/{ => src}/__tests__/index.test.js (99%) rename packages/docusaurus-plugin-content-docs/{ => src}/__tests__/metadata.test.js (98%) rename packages/docusaurus-plugin-content-docs/{ => src}/__tests__/order.test.js (99%) rename packages/docusaurus-plugin-content-docs/{ => src}/__tests__/sidebars.test.js (94%) rename packages/docusaurus-plugin-content-docs/{ => src}/index.js (97%) rename packages/docusaurus-plugin-content-pages/{ => src}/__tests__/index.test.js (98%) rename packages/docusaurus-plugin-content-pages/{ => src}/index.js (100%) rename packages/docusaurus-plugin-sitemap/{ => src}/__tests__/index.test.js (95%) rename packages/docusaurus-plugin-sitemap/{ => src}/index.js (100%) rename packages/docusaurus-utils/{test => src/__tests__}/index.test.js (100%) rename packages/docusaurus-utils/{ => src}/index.js (100%) diff --git a/packages/docusaurus-plugin-content-docs/package.json b/packages/docusaurus-plugin-content-docs/package.json index 32aa7a7755..4bd0804ca8 100644 --- a/packages/docusaurus-plugin-content-docs/package.json +++ b/packages/docusaurus-plugin-content-docs/package.json @@ -2,7 +2,7 @@ "name": "@docusaurus/plugin-content-docs", "version": "1.0.0", "description": "Documentation plugin for Docusaurus", - "main": "index.js", + "main": "src/index.js", "license": "MIT", "dependencies": { "@babel/polyfill": "^7.4.0", diff --git a/packages/docusaurus-plugin-content-docs/__tests__/__snapshots__/sidebars.test.js.snap b/packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/sidebars.test.js.snap similarity index 100% rename from packages/docusaurus-plugin-content-docs/__tests__/__snapshots__/sidebars.test.js.snap rename to packages/docusaurus-plugin-content-docs/src/__tests__/__snapshots__/sidebars.test.js.snap diff --git a/packages/docusaurus-plugin-content-docs/__tests__/index.test.js b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.js similarity index 99% rename from packages/docusaurus-plugin-content-docs/__tests__/index.test.js rename to packages/docusaurus-plugin-content-docs/src/__tests__/index.test.js index 8da3424645..73ae02a3a7 100644 --- a/packages/docusaurus-plugin-content-docs/__tests__/index.test.js +++ b/packages/docusaurus-plugin-content-docs/src/__tests__/index.test.js @@ -7,7 +7,7 @@ import '@babel/polyfill'; import path from 'path'; -import loadSetup from '../../docusaurus/test/loadSetup'; +import loadSetup from '../../../docusaurus/test/loadSetup'; import DocusaurusPluginContentDocs from '../index'; describe('loadDocs', () => { diff --git a/packages/docusaurus-plugin-content-docs/__tests__/metadata.test.js b/packages/docusaurus-plugin-content-docs/src/__tests__/metadata.test.js similarity index 98% rename from packages/docusaurus-plugin-content-docs/__tests__/metadata.test.js rename to packages/docusaurus-plugin-content-docs/src/__tests__/metadata.test.js index 8915839126..4e1a236dad 100644 --- a/packages/docusaurus-plugin-content-docs/__tests__/metadata.test.js +++ b/packages/docusaurus-plugin-content-docs/src/__tests__/metadata.test.js @@ -7,8 +7,8 @@ import '@babel/polyfill'; import path from 'path'; -import processMetadata from '../src/metadata'; -import loadSetup from '../../docusaurus/test/loadSetup'; +import processMetadata from '../metadata'; +import loadSetup from '../../../docusaurus/test/loadSetup'; describe('processMetadata', () => { test('normal docs', async () => { diff --git a/packages/docusaurus-plugin-content-docs/__tests__/order.test.js b/packages/docusaurus-plugin-content-docs/src/__tests__/order.test.js similarity index 99% rename from packages/docusaurus-plugin-content-docs/__tests__/order.test.js rename to packages/docusaurus-plugin-content-docs/src/__tests__/order.test.js index 1b5e967194..db3ef1098c 100644 --- a/packages/docusaurus-plugin-content-docs/__tests__/order.test.js +++ b/packages/docusaurus-plugin-content-docs/src/__tests__/order.test.js @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import createOrder from '../src/order'; +import createOrder from '../order'; describe('createOrder', () => { test('multiple sidebars with subcategory', () => { diff --git a/packages/docusaurus-plugin-content-docs/__tests__/sidebars.test.js b/packages/docusaurus-plugin-content-docs/src/__tests__/sidebars.test.js similarity index 94% rename from packages/docusaurus-plugin-content-docs/__tests__/sidebars.test.js rename to packages/docusaurus-plugin-content-docs/src/__tests__/sidebars.test.js index 66b861c0c0..833144b393 100644 --- a/packages/docusaurus-plugin-content-docs/__tests__/sidebars.test.js +++ b/packages/docusaurus-plugin-content-docs/src/__tests__/sidebars.test.js @@ -6,8 +6,8 @@ */ import path from 'path'; -import loadSidebars from '../src/sidebars'; -import loadSetup from '../../docusaurus/test/loadSetup'; +import loadSidebars from '../sidebars'; +import loadSetup from '../../../docusaurus/test/loadSetup'; /* eslint-disable global-require, import/no-dynamic-require */ diff --git a/packages/docusaurus-plugin-content-docs/index.js b/packages/docusaurus-plugin-content-docs/src/index.js similarity index 97% rename from packages/docusaurus-plugin-content-docs/index.js rename to packages/docusaurus-plugin-content-docs/src/index.js index 00a9d348f7..078fda2168 100644 --- a/packages/docusaurus-plugin-content-docs/index.js +++ b/packages/docusaurus-plugin-content-docs/src/index.js @@ -10,9 +10,9 @@ const importFresh = require('import-fresh'); const path = require('path'); const {getSubFolder, idx, normalizeUrl} = require('@docusaurus/utils'); -const createOrder = require('./src/order'); -const loadSidebars = require('./src/sidebars'); -const processMetadata = require('./src/metadata'); +const createOrder = require('./order'); +const loadSidebars = require('./sidebars'); +const processMetadata = require('./metadata'); const DEFAULT_OPTIONS = { metadataKey: 'docsMetadata', diff --git a/packages/docusaurus-plugin-content-pages/package.json b/packages/docusaurus-plugin-content-pages/package.json index 10c052e2e2..ddea837140 100644 --- a/packages/docusaurus-plugin-content-pages/package.json +++ b/packages/docusaurus-plugin-content-pages/package.json @@ -2,7 +2,7 @@ "name": "@docusaurus/plugin-content-pages", "version": "1.0.0", "description": "Pages content plugin for Docusaurus", - "main": "index.js", + "main": "src/index.js", "license": "MIT", "dependencies": { "@docusaurus/utils": "^1.0.0", diff --git a/packages/docusaurus-plugin-content-pages/__tests__/index.test.js b/packages/docusaurus-plugin-content-pages/src/__tests__/index.test.js similarity index 98% rename from packages/docusaurus-plugin-content-pages/__tests__/index.test.js rename to packages/docusaurus-plugin-content-pages/src/__tests__/index.test.js index 850f99454e..3771239e85 100644 --- a/packages/docusaurus-plugin-content-pages/__tests__/index.test.js +++ b/packages/docusaurus-plugin-content-pages/src/__tests__/index.test.js @@ -7,7 +7,7 @@ import path from 'path'; -import loadSetup from '../../docusaurus/test/loadSetup'; +import loadSetup from '../../../docusaurus/test/loadSetup'; import DocusaurusPluginContentPages from '../index'; describe('docusaurus-plugin-content-pages', () => { diff --git a/packages/docusaurus-plugin-content-pages/index.js b/packages/docusaurus-plugin-content-pages/src/index.js similarity index 100% rename from packages/docusaurus-plugin-content-pages/index.js rename to packages/docusaurus-plugin-content-pages/src/index.js diff --git a/packages/docusaurus-plugin-sitemap/package.json b/packages/docusaurus-plugin-sitemap/package.json index 787c9d5487..6e8e12179f 100644 --- a/packages/docusaurus-plugin-sitemap/package.json +++ b/packages/docusaurus-plugin-sitemap/package.json @@ -2,7 +2,7 @@ "name": "@docusaurus/plugin-sitemap", "version": "1.0.0", "description": "Simple sitemap generation plugin for Docusaurus", - "main": "index.js", + "main": "src/index.js", "license": "MIT", "dependencies": { "sitemap": "^2.1.0" diff --git a/packages/docusaurus-plugin-sitemap/__tests__/index.test.js b/packages/docusaurus-plugin-sitemap/src/__tests__/index.test.js similarity index 95% rename from packages/docusaurus-plugin-sitemap/__tests__/index.test.js rename to packages/docusaurus-plugin-sitemap/src/__tests__/index.test.js index 3becd03333..c9e2e8cf64 100644 --- a/packages/docusaurus-plugin-sitemap/__tests__/index.test.js +++ b/packages/docusaurus-plugin-sitemap/src/__tests__/index.test.js @@ -5,7 +5,7 @@ * LICENSE file in the root directory of this source tree. */ -import loadSetup from '../../docusaurus/test/loadSetup'; +import loadSetup from '../../../docusaurus/test/loadSetup'; import DocusaurusPluginSitemap from '../index'; describe('docusaurus-plugin-sitemap', () => { diff --git a/packages/docusaurus-plugin-sitemap/index.js b/packages/docusaurus-plugin-sitemap/src/index.js similarity index 100% rename from packages/docusaurus-plugin-sitemap/index.js rename to packages/docusaurus-plugin-sitemap/src/index.js diff --git a/packages/docusaurus-utils/package.json b/packages/docusaurus-utils/package.json index 53ffbc4c3f..9bb202cdd4 100644 --- a/packages/docusaurus-utils/package.json +++ b/packages/docusaurus-utils/package.json @@ -2,7 +2,7 @@ "name": "@docusaurus/utils", "version": "1.0.0", "description": "A set of utility functions for Docusaurus packages", - "main": "index.js", + "main": "src/index.js", "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5", diff --git a/packages/docusaurus-utils/test/index.test.js b/packages/docusaurus-utils/src/__tests__/index.test.js similarity index 100% rename from packages/docusaurus-utils/test/index.test.js rename to packages/docusaurus-utils/src/__tests__/index.test.js diff --git a/packages/docusaurus-utils/index.js b/packages/docusaurus-utils/src/index.js similarity index 100% rename from packages/docusaurus-utils/index.js rename to packages/docusaurus-utils/src/index.js