Skip to content

Commit

Permalink
fix(ci): disable components-ovh && fix components dependency to ensur…
Browse files Browse the repository at this point in the history
…e build order
  • Loading branch information
dpellier committed Dec 15, 2023
1 parent fa64b1b commit 9da5056
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 14 deletions.
4 changes: 0 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
"packages/common/*",
"packages/components",
"packages/components/src/!(dist|loader)*",
"packages/components-ovh",
"packages/components-ovh/!(loader|custom-elements|custom-elements-bundle)*",
"packages/components-ovh/!(loader|custom-elements|custom-elements-bundle)*/react",
"packages/components-ovh/!(loader|custom-elements|custom-elements-bundle)*/vue",
"packages/shared-dependencies/*",
"packages/storybook",
"packages/themes/*"
Expand Down
10 changes: 8 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,14 @@
"build:react": "npm --prefix react run build",
"build:vue": "npm --prefix vue run build"
},
"dependencies": {
"@ovhcloud/ods-common-core": "16.5.0",
"@ovhcloud/ods-common-stencil": "16.5.0",
"@ovhcloud/ods-common-theming": "16.5.0"
},
"devDependencies": {
"@ovhcloud/ods-common-scripts": "16.6.0",
"@ovhcloud/ods-dev": "16.6.0"
"@ovhcloud/ods-common-scripts": "16.5.0",
"@ovhcloud/ods-common-testing": "16.5.0",
"@ovhcloud/ods-stencil-dev": "16.5.0"
}
}
15 changes: 7 additions & 8 deletions packages/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
"start:quiet": "yarn list:releases && start-storybook -p 6006 --quiet"
},
"dependencies": {
"@ovhcloud/ods-cdk": "16.6.0",
"@ovhcloud/ods-cdk-dev": "16.6.0",
"@ovhcloud/ods-common-core": "16.6.0",
"@ovhcloud/ods-common-stencil": "16.6.0",
"@ovhcloud/ods-common-theming": "16.6.0",
"@ovhcloud/ods-components": "16.6.0",
"@ovhcloud/ods-components-ovh": "16.6.0",
"@ovhcloud/ods-theme-blue-jeans": "16.6.0",
"@ovhcloud/ods-cdk": "16.5.0",
"@ovhcloud/ods-cdk-dev": "16.5.0",
"@ovhcloud/ods-common-core": "16.5.0",
"@ovhcloud/ods-common-stencil": "16.5.0",
"@ovhcloud/ods-common-theming": "16.5.0",
"@ovhcloud/ods-components": "16.5.0",
"@ovhcloud/ods-theme-blue-jeans": "16.5.0",
"react": "16.14.0"
},
"devDependencies": {
Expand Down
34 changes: 34 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5016,6 +5016,7 @@ __metadata:
languageName: unknown
linkType: soft

<<<<<<< HEAD
>>>>>>> 39768c75 (refactor(stencil): move all components && fix doc)
"@ovhcloud/ods-component-ovh-location-tile-react@workspace:packages/components-ovh/location-tile/react":
version: 0.0.0-use.local
Expand Down Expand Up @@ -5052,6 +5053,8 @@ __metadata:
languageName: unknown
linkType: soft

=======
>>>>>>> 6cea9cba (fix(ci): disable components-ovh && fix components dependency to ensure build order)
"@ovhcloud/ods-component-pagination@workspace:packages/components/src/pagination":
version: 0.0.0-use.local
resolution: "@ovhcloud/ods-component-pagination@workspace:packages/components/src/pagination"
Expand Down Expand Up @@ -6055,6 +6058,7 @@ __metadata:
languageName: unknown
linkType: soft

<<<<<<< HEAD
"@ovhcloud/[email protected], @ovhcloud/ods-components-ovh@workspace:packages/components-ovh":
>>>>>>> 39768c75 (refactor(stencil): move all components && fix doc)
version: 0.0.0-use.local
Expand Down Expand Up @@ -6118,6 +6122,18 @@ __metadata:
"@ovhcloud/ods-common-scripts": 16.5.0
"@ovhcloud/ods-dev": 16.5.0
>>>>>>> 2907f97f (refactor(stencil): init new arch with text)
=======
"@ovhcloud/[email protected], @ovhcloud/ods-components@workspace:packages/components":
version: 0.0.0-use.local
resolution: "@ovhcloud/ods-components@workspace:packages/components"
dependencies:
"@ovhcloud/ods-common-core": 16.5.0
"@ovhcloud/ods-common-scripts": 16.5.0
"@ovhcloud/ods-common-stencil": 16.5.0
"@ovhcloud/ods-common-testing": 16.5.0
"@ovhcloud/ods-common-theming": 16.5.0
"@ovhcloud/ods-stencil-dev": 16.5.0
>>>>>>> 6cea9cba (fix(ci): disable components-ovh && fix components dependency to ensure build order)
languageName: unknown
linkType: soft

Expand All @@ -6133,7 +6149,11 @@ __metadata:
languageName: unknown
linkType: soft

<<<<<<< HEAD
"@ovhcloud/[email protected], @ovhcloud/ods-react-dev@workspace:packages/shared-dependencies/odsReactDev":
=======
"@ovhcloud/ods-react-dev@workspace:packages/shared-dependencies/odsReactDev":
>>>>>>> 6cea9cba (fix(ci): disable components-ovh && fix components dependency to ensure build order)
version: 0.0.0-use.local
resolution: "@ovhcloud/ods-react-dev@workspace:packages/shared-dependencies/odsReactDev"
dependencies:
Expand Down Expand Up @@ -6164,6 +6184,7 @@ __metadata:
resolution: "@ovhcloud/ods-storybook@workspace:packages/storybook"
dependencies:
"@babel/core": 7.16.0
<<<<<<< HEAD
"@ovhcloud/ods-cdk": 16.6.0
"@ovhcloud/ods-cdk-dev": 16.6.0
"@ovhcloud/ods-common-core": 16.6.0
Expand All @@ -6172,6 +6193,15 @@ __metadata:
"@ovhcloud/ods-components": 16.6.0
"@ovhcloud/ods-components-ovh": 16.6.0
"@ovhcloud/ods-theme-blue-jeans": 16.6.0
=======
"@ovhcloud/ods-cdk": 16.5.0
"@ovhcloud/ods-cdk-dev": 16.5.0
"@ovhcloud/ods-common-core": 16.5.0
"@ovhcloud/ods-common-stencil": 16.5.0
"@ovhcloud/ods-common-theming": 16.5.0
"@ovhcloud/ods-components": 16.5.0
"@ovhcloud/ods-theme-blue-jeans": 16.5.0
>>>>>>> 6cea9cba (fix(ci): disable components-ovh && fix components dependency to ensure build order)
"@storybook/addon-a11y": 6.4.19
"@storybook/addon-actions": 6.4.19
"@storybook/addon-backgrounds": 6.4.19
Expand Down Expand Up @@ -6217,7 +6247,11 @@ __metadata:
languageName: unknown
linkType: soft

<<<<<<< HEAD
"@ovhcloud/[email protected], @ovhcloud/ods-vue-dev@workspace:packages/shared-dependencies/odsVueDev":
=======
"@ovhcloud/ods-vue-dev@workspace:packages/shared-dependencies/odsVueDev":
>>>>>>> 6cea9cba (fix(ci): disable components-ovh && fix components dependency to ensure build order)
version: 0.0.0-use.local
resolution: "@ovhcloud/ods-vue-dev@workspace:packages/shared-dependencies/odsVueDev"
dependencies:
Expand Down

0 comments on commit 9da5056

Please sign in to comment.