diff --git a/.github/workflows/dev-stg-build.yml b/.github/workflows/dev-stg-build.yml index 03ed5580..3f3b3b4f 100644 --- a/.github/workflows/dev-stg-build.yml +++ b/.github/workflows/dev-stg-build.yml @@ -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' diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml index 6f844822..a8bea719 100644 --- a/.github/workflows/production-build.yml +++ b/.github/workflows/production-build.yml @@ -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);") @@ -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 @@ -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 - - - \ No newline at end of file + git push origin main diff --git a/package.json b/package.json index f9041924..ff75b2b3 100644 --- a/package.json +++ b/package.json @@ -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", @@ -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", diff --git a/src/components/itemBrowser/ItemBrowser.tsx b/src/components/itemBrowser/ItemBrowser.tsx index 73c23cee..af0bb9bd 100644 --- a/src/components/itemBrowser/ItemBrowser.tsx +++ b/src/components/itemBrowser/ItemBrowser.tsx @@ -1,6 +1,6 @@ import { AvailableIcons, - BreadCrumb, + BreadCrumbDeprecated as BreadCrumb, PreviewCard as ChiliPreview, Colors, Icon, @@ -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'; diff --git a/vite.config.ts b/vite.config.ts index 94663bfd..7928e6e4 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -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/ @@ -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: { diff --git a/yarn.lock b/yarn.lock index 5d23d3b9..5a238480 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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"