From 9cf15f6baa62bf08a506f2eaf91e8995b1f910d6 Mon Sep 17 00:00:00 2001 From: Patrik Oldsberg Date: Thu, 26 Nov 2020 16:54:36 +0100 Subject: [PATCH] core-api: move extension and component data utils into extensions/ Co-authored-by: blam --- .../componentData.test.tsx | 0 .../src/{lib => extensions}/componentData.tsx | 0 .../{lib => extensions}/extensions.test.tsx | 0 .../src/{lib => extensions}/extensions.tsx | 0 packages/core-api/src/extensions/index.ts | 22 +++++++++++++++++++ .../core-api/src/plugin/collection.test.tsx | 2 +- packages/core-api/src/plugin/collection.ts | 2 +- .../core-api/src/routing/discovery.test.tsx | 2 +- packages/core-api/src/routing/discovery.tsx | 2 +- 9 files changed, 26 insertions(+), 4 deletions(-) rename packages/core-api/src/{lib => extensions}/componentData.test.tsx (100%) rename packages/core-api/src/{lib => extensions}/componentData.tsx (100%) rename packages/core-api/src/{lib => extensions}/extensions.test.tsx (100%) rename packages/core-api/src/{lib => extensions}/extensions.tsx (100%) create mode 100644 packages/core-api/src/extensions/index.ts diff --git a/packages/core-api/src/lib/componentData.test.tsx b/packages/core-api/src/extensions/componentData.test.tsx similarity index 100% rename from packages/core-api/src/lib/componentData.test.tsx rename to packages/core-api/src/extensions/componentData.test.tsx diff --git a/packages/core-api/src/lib/componentData.tsx b/packages/core-api/src/extensions/componentData.tsx similarity index 100% rename from packages/core-api/src/lib/componentData.tsx rename to packages/core-api/src/extensions/componentData.tsx diff --git a/packages/core-api/src/lib/extensions.test.tsx b/packages/core-api/src/extensions/extensions.test.tsx similarity index 100% rename from packages/core-api/src/lib/extensions.test.tsx rename to packages/core-api/src/extensions/extensions.test.tsx diff --git a/packages/core-api/src/lib/extensions.tsx b/packages/core-api/src/extensions/extensions.tsx similarity index 100% rename from packages/core-api/src/lib/extensions.tsx rename to packages/core-api/src/extensions/extensions.tsx diff --git a/packages/core-api/src/extensions/index.ts b/packages/core-api/src/extensions/index.ts new file mode 100644 index 0000000000..26a0c597b1 --- /dev/null +++ b/packages/core-api/src/extensions/index.ts @@ -0,0 +1,22 @@ +/* + * Copyright 2020 Spotify AB + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +export { attachComponentData, getComponentData } from './componentData'; +export { + createReactExtension, + createRoutableExtension, + createComponentExtension, +} from './extensions'; diff --git a/packages/core-api/src/plugin/collection.test.tsx b/packages/core-api/src/plugin/collection.test.tsx index cb123cd2b1..fd94303ef4 100644 --- a/packages/core-api/src/plugin/collection.test.tsx +++ b/packages/core-api/src/plugin/collection.test.tsx @@ -20,7 +20,7 @@ import { createPlugin } from '../plugin'; import { createRoutableExtension, createComponentExtension, -} from '../lib/extensions'; +} from '../extensions'; import { MemoryRouter, Routes, Route } from 'react-router-dom'; import { collectPlugins } from './collection'; diff --git a/packages/core-api/src/plugin/collection.ts b/packages/core-api/src/plugin/collection.ts index 23139deac4..0811f66445 100644 --- a/packages/core-api/src/plugin/collection.ts +++ b/packages/core-api/src/plugin/collection.ts @@ -31,7 +31,7 @@ import React, { isValidElement, ReactNode } from 'react'; import { BackstagePlugin } from './types'; -import { getComponentData } from '../lib/componentData'; +import { getComponentData } from '../extensions'; export const collectPlugins = (tree: ReactNode) => { const plugins = new Set(); diff --git a/packages/core-api/src/routing/discovery.test.tsx b/packages/core-api/src/routing/discovery.test.tsx index 02c80297c0..be553d9ce5 100644 --- a/packages/core-api/src/routing/discovery.test.tsx +++ b/packages/core-api/src/routing/discovery.test.tsx @@ -18,7 +18,7 @@ import React, { PropsWithChildren } from 'react'; import { collectRoutes, collectRouteParents } from './discovery'; import { createRouteRef } from './RouteRef'; import { createPlugin } from '../plugin'; -import { createRoutableExtension } from '../lib/extensions'; +import { createRoutableExtension } from '../extensions'; import { MemoryRouter, Routes, Route } from 'react-router-dom'; const mockConfig = () => ({ path: '/foo', title: 'Foo' }); diff --git a/packages/core-api/src/routing/discovery.tsx b/packages/core-api/src/routing/discovery.tsx index 96946e1ca3..973c96e420 100644 --- a/packages/core-api/src/routing/discovery.tsx +++ b/packages/core-api/src/routing/discovery.tsx @@ -16,7 +16,7 @@ import React, { isValidElement, ReactNode } from 'react'; import { RouteRef } from './types'; -import { getComponentData } from '../lib/componentData'; +import { getComponentData } from '../extensions'; export const collectRoutes = (tree: ReactNode) => { const treeMap = new Map();