diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index adf92245..ccb44888 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -38,9 +38,9 @@ jobs: npm run build npm publish cd ../csc-ui-react - npm version ${{ steps.release.outputs.major }}.${{ steps.release.outputs.minor }}.${{ steps.release.outputs.patch }} npm ci npm run build + (version="$(node ../csc-ui/scripts/getLatestVersion.js)"; npm --no-git-tag-version version ${version}) npm publish env: NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} diff --git a/package-lock.json b/package-lock.json index 9defde99..e0586da4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27555,7 +27555,7 @@ }, "packages/csc-ui": { "name": "@cscfi/csc-ui", - "version": "2.2.4", + "version": "2.2.6", "license": "MIT", "dependencies": { "@mdi/js": "^7.4.47", diff --git a/packages/csc-ui/scripts/getLatestVersion.js b/packages/csc-ui/scripts/getLatestVersion.js new file mode 100644 index 00000000..34382aec --- /dev/null +++ b/packages/csc-ui/scripts/getLatestVersion.js @@ -0,0 +1,5 @@ +const packageInfo = require('../package.json'); + +const version = packageInfo.version; + +console.log(version); diff --git a/packages/csc-ui/scripts/move-styles.js b/packages/csc-ui/scripts/move-styles.js index 8377a1a1..e4cf6b2e 100644 --- a/packages/csc-ui/scripts/move-styles.js +++ b/packages/csc-ui/scripts/move-styles.js @@ -9,7 +9,7 @@ for (const dir of dirs) { fs.mkdirSync(dir, { recursive: true }); } - fs.cp('./dist/components/styles', dir, { recursive: true }, (err) => { + fs.cp('./dist/styles', dir, { recursive: true }, (err) => { if (err) { console.error(err); } diff --git a/packages/csc-ui/stencil.config.ts b/packages/csc-ui/stencil.config.ts index 8ee815b2..01896665 100644 --- a/packages/csc-ui/stencil.config.ts +++ b/packages/csc-ui/stencil.config.ts @@ -8,19 +8,12 @@ export const config: Config = { { type: 'dist', esmLoaderPath: '../loader', - copy: [{ src: 'styles', dest: 'dist/', keepDirStructure: true }], + copy: [{ src: 'styles', dest: '../', keepDirStructure: true }], }, { type: 'dist-custom-elements', dir: 'dist/components', - copy: [ - { - src: 'styles', - dest: 'dist/components/', - keepDirStructure: true, - }, - ], customElementsExportBehavior: 'single-export-module', externalRuntime: false, }, diff --git a/packages/react-app/src/App.tsx b/packages/react-app/src/App.tsx index 462cc38b..812478b5 100644 --- a/packages/react-app/src/App.tsx +++ b/packages/react-app/src/App.tsx @@ -1,7 +1,7 @@ import { useState } from 'react' import './App.css'; import { CButton, COption, CSelect, CSwitch, CCheckbox, CCard, CCardTitle, CCardContent, CCardActions, CSlider, CTag } from '@cscfi/csc-ui-react'; -import { CSelectItem } from '../../csc-ui/dist/types/types'; +import { CSelectItem } from '@cscfi/csc-ui'; function App() { const [count, setCount] = useState(0);