Merge pull request #171 from CSCfi/style-import-fix

Fix missing styles
CSCfi · Oct 23, 2024 · bbeb661 · bbeb661
2 parents 5cbf9fe + e7ed874
commit bbeb661
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 15 deletions.
diff --git 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
diff --git a/packages/csc-ui/scripts/getLatestVersion.js 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
@@ -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/src/components/c-select/c-select.tsx b/packages/csc-ui/src/components/c-select/c-select.tsx
@@ -327,8 +327,6 @@ export class CSelect {
       this._selectionElement?.replaceChildren();
     }
 
-    console.log('VALUE VAIHTUS', v);
-
     this._selectOption(this.returnObject ? v : { name: v, value: v });
   }
 
@@ -338,7 +336,6 @@ export class CSelect {
   }
 
   private _selectOption({ value, name }: { value: string; name: string }) {
-    console.log('selecteerataan', value, name);
     this._dropdownElement.close();
 
     const selection = this._setCurrentIndex({ name, value });

diff --git 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
@@ -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);