Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] switch to new shared components lib #181

Merged
merged 3 commits into from
Aug 7, 2024
Merged

[Fix] switch to new shared components lib #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81cb2fe
[Fix] switch to new shared components lib
psamusev Aug 2, 2024
1b88627
chore: update version
psamusev Aug 2, 2024
fdc984c
Merge branch 'main' into feature/WRS-1808-Change-bundle-tool-for-graf…
psamusev Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/dev-stg-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,5 +163,4 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.PACKAGE_SECRET }}
with:
commit-message: 'CI: bumps version to {{version}} [skip ci]'
version-type: 'prerelease'

version-type: 'prerelease'
9 changes: 3 additions & 6 deletions .github/workflows/production-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
npm version patch
git add package.json yarn.lock
git commit -m "CI: Bump version to $(jq -r .version < package.json) [skip ci]" --allow-empty
git push origin main
git push origin main
- name: copy file branch
run: |
export CURRENT_PACKAGE_VERSION=$(node --eval="var pjson = require('./package.json');console.log(pjson.version);")
Expand All @@ -67,7 +67,7 @@ jobs:
with:
inlineScript: |
az storage blob upload-batch -d studio-ui -s upload/ --connection-string "${{ secrets.AZURE_CDN_STUDIO_PRD_CONNECTION_STRING }}" --overwrite true

bump-version:
needs: build
runs-on: ubuntu-latest
Expand Down Expand Up @@ -96,7 +96,4 @@ jobs:
npm version preminor
git add package.json yarn.lock
git commit -m "CI: Bump version to $(jq -r .version < package.json) [skip ci]" --allow-empty
git push origin main



git push origin main
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "studio-ui",
"private": true,
"version": "1.14.0-0",
"version": "1.14.0-rc.0",
"type": "module",
"description": "The Studio UI for CHILI GraFx",
"main": "src/main.tsx",
Expand All @@ -24,7 +24,7 @@
"validate-versions": "node validate_versions.cjs"
},
"dependencies": {
"@chili-publish/grafx-shared-components": "^0.71.2",
"@chili-publish/grafx-shared-components": "^0.72.8",
"@chili-publish/studio-sdk": "^1.13.0",
"axios": "^1.6.0",
"react": "^18.2.0",
Expand Down
6 changes: 3 additions & 3 deletions src/components/itemBrowser/ItemBrowser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
AvailableIcons,
BreadCrumb,
BreadCrumbDeprecated as BreadCrumb,
PreviewCard as ChiliPreview,
Colors,
Icon,
Expand All @@ -18,15 +18,15 @@ import { useVariablePanelContext } from '../../contexts/VariablePanelContext';
import { ContentType } from '../../contexts/VariablePanelContext.types';
import { AssetType } from '../../utils/ApiTypes';
import { getDataIdForSUI, getDataTestIdForSUI } from '../../utils/dataIds';
import { UNABLE_TO_LOAD_PANEL } from '../../utils/mediaUtils';
import {
BreadCrumbsWrapper,
EmptySearchResultContainer,
LoadPageContainer,
ResourcesContainer,
SearchInputWrapper,
EmptySearchResultContainer,
} from './ItemBrowser.styles';
import { ItemCache, PreviewResponse } from './ItemCache';
import { UNABLE_TO_LOAD_PANEL } from '../../utils/mediaUtils';

const TOP_BAR_HEIGHT_REM = '4rem';
const TOP_BAR_BORDER_HEIGHT = '1px';
Expand Down
3 changes: 2 additions & 1 deletion vite.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineConfig } from 'vite';
import react from '@vitejs/plugin-react-swc';
import { defineConfig } from 'vite';
import EnvironmentPlugin from 'vite-plugin-environment';

// https://vitejs.dev/config/
Expand All @@ -11,6 +11,7 @@ export default ({ mode }) => {
},
base: './',
optimizeDeps: {
// To debug linked version of '@chili-publish/grafx-shared-components', exclude it from this array
include: ['@chili-publish/grafx-shared-components', '@chili-publish/studio-sdk'],
},
resolve: {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,10 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==

"@chili-publish/grafx-shared-components@^0.71.2":
version "0.71.2"
resolved "https://npm.pkg.github.com/download/@chili-publish/grafx-shared-components/0.71.2/ddbcdc253ff68980129d5d2523ccb34a96650f50#ddbcdc253ff68980129d5d2523ccb34a96650f50"
integrity sha512-Cfgu5gF+hEgTjkQ3vtqsBfStYIQiWvDU1G25s4IRIB0MMkvCOgg3GSui+Rtu3yRVYa/IgKjiOhYx/cI6/cbFbg==
"@chili-publish/grafx-shared-components@^0.72.8":
version "0.72.8"
resolved "https://npm.pkg.github.com/download/@chili-publish/grafx-shared-components/0.72.8/fbd14408f8e77d72bbdbe9b99c050b0d5dc5bbaa#fbd14408f8e77d72bbdbe9b99c050b0d5dc5bbaa"
integrity sha512-OdCenl/n/y+odYxFg+2aEmQTwdle85Ezk6p53rdBfveLpUbCwFB84wdGuVgnHQJImmQFcCczMR0DSIWuPKUN+A==
dependencies:
"@fortawesome/fontawesome-svg-core" "^6.4.0"
"@fortawesome/pro-light-svg-icons" "^6.4.0"
Expand Down
Loading