Merge pull request #148 from UXPin/hotfix-experimental-namespaced-com…

…ponents Hotfix experimental namespaced components
UXPin · Apr 29, 2019 · e0b08af · e0b08af
2 parents fe82c30 + 4532fa0
commit e0b08af
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/packages/uxpin-merge-cli/package.json b/packages/uxpin-merge-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uxpin/merge-cli",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "The Command-line tool integrates the Design System repository with: https://www.uxpin.com/merge",
   "main": "src/index.js",
   "bin": {

diff --git a/packages/uxpin-merge-cli/src/common/types/ComponentRevision.ts b/packages/uxpin-merge-cli/src/common/types/ComponentRevision.ts
@@ -7,4 +7,4 @@ export interface ComponentRevision extends ComponentDefinitionPersistedPart {
 
 export type ComponentDefinitionPersistedPart = Pick<ComponentDefinition, ComponentPersistedProps>;
 
-type ComponentPersistedProps = 'name' | 'info' | 'properties';
+type ComponentPersistedProps = 'name' | 'info' | 'properties' | 'namespace';
diff --git a/...eps/experimentation/server/common/page/data/codeSync/component/getComponentsCollection.ts b/...eps/experimentation/server/common/page/data/codeSync/component/getComponentsCollection.ts
@@ -16,6 +16,7 @@ export function getComponentsCollection(
       componentId,
       info: component.info,
       name: component.name,
+      namespace: component.namespace,
       properties: component.properties,
       revisionId,
     };
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,4 +7,4 @@ export interface ComponentRevision extends ComponentDefinitionPersistedPart {

		export type ComponentDefinitionPersistedPart = Pick<ComponentDefinition, ComponentPersistedProps>;

		type ComponentPersistedProps = 'name' \| 'info' \| 'properties';
		type ComponentPersistedProps = 'name' \| 'info' \| 'properties' \| 'namespace';