Skip to content

Commit

Permalink
chore(merge): merge latest changes from main into the current PR
Browse files Browse the repository at this point in the history
  • Loading branch information
masoudmanson committed Feb 15, 2024
2 parents c8af49a + ffbd3f1 commit cefa4a1
Show file tree
Hide file tree
Showing 47 changed files with 29,368 additions and 210,425 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

# Step 5: Install project dependencies using Yarn
- name: Install dependencies
run: yarn ci
run: yarn

# Step 6: Build the component library in 'dist/' directory
- name: Build component library in dist/
Expand Down Expand Up @@ -101,7 +101,7 @@ jobs:
const [owner, repo] = ownerAndRepo.split('/');
const head = "prod";
const base = "main";
const title = "feat: Merge prod into main";
const title = "chore(release): Merge prod into main";
const pr = await github.rest.pulls.list({owner, repo, base, head: `${owner}:${head}`})
if (pr.data.length>0) {
return pr.data[0].number;
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# yarn v2 files
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

Expand Down
31 changes: 30 additions & 1 deletion .storybook/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,27 @@ const path = require("path");
module.exports = ({ config }) => {
config.resolve.alias = {
...config.resolve.alias,
src: path.resolve(__dirname, "../packages/components/src"),
src: [
path.resolve(__dirname, "../packages/components/src"),
path.resolve(__dirname, "../packages/data-viz/src"),
],
};

/**
* (masoudmanson): Due to a Storybook build issue in production mode, where importing
* cross-referenced workspace packages fails, this workaround involves falling back
* to the source code of the affected packages. This is a temporary solution until the
* underlying issue is resolved in Storybook.
* Resolving monorepo packages in this manner necessitates a custom SCSS loader for
* .sss files, as the src/index.ts file of each package includes an import link to the
* style-dictionary variable files.
*/
config.resolve.fallback = {
"@czi-sds/components": path.resolve(
__dirname,
"../packages/components/src"
),
"@czi-sds/data-viz": path.resolve(__dirname, "../packages/data-viz/src"),
};

// remove svg from existing rule
Expand Down Expand Up @@ -33,5 +53,14 @@ module.exports = ({ config }) => {
},
});

/**
* (masoudmanson): Add a custom SCSS loader for .sss files, as the src/index.ts file of
* each package includes an import link to the style-dictionary variable files.
*/
config.module.rules.push({
test: /\.scss$/,
use: ["sass-loader"],
});

return config;
};
Binary file modified .yarn/install-state.gz
Binary file not shown.
Loading

0 comments on commit cefa4a1

Please sign in to comment.