Skip to content

Commit

Permalink
Fix storybook broken after updating to sb 6+ and angular 12+ (#43)
Browse files Browse the repository at this point in the history
* Update storybook dependencies

* Reactivate storybook build in CI workflow

* Fix linter checks

* Minor update

* Actually build storybook in CI workflow

* Update to Angular 12.2 but storybook still does not load global style

* Downgrade angular to 12.1.x to fix storybook scss global import issue
  • Loading branch information
tschaffter committed Aug 19, 2021
1 parent ec5d995 commit f696def
Show file tree
Hide file tree
Showing 6 changed files with 464 additions and 816 deletions.
15 changes: 9 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,22 @@ jobs:
echo ::set-output name=version_minor::${MINOR}
echo ::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo ::set-output name=push::${PUSH}
- name: Use Node.js ${{ env.node_version }}
uses: actions/setup-node@v2.4.0
with:
node-version: ${{ env.node_version }}

- name: Install dependencies
run: |
npm ci
npm install -g @angular/cli
- name: Build sage-angular-demo
run: ng build sage-angular-demo --configuration production --baseHref="${{ env.gh_pages_url }}/${{ steps.prep.outputs.version }}/demo/"

# - name: Build storybook
# run: npm run build:storybook
- name: Build storybook
run: npm run build:storybook

- name: Commit to gh-pages
run: |
Expand All @@ -97,7 +100,7 @@ jobs:
# Update gh-pages: version specified
STORYBOOK_TARGET_DIR=gh-pages/${{ steps.prep.outputs.version }}/storybook
mkdir -p ${STORYBOOK_TARGET_DIR}
#cp -R storybook-static/* ${STORYBOOK_TARGET_DIR}
cp -R storybook-static/* ${STORYBOOK_TARGET_DIR}
DEMO_TARGET_DIR=gh-pages/${{ steps.prep.outputs.version }}/demo
mkdir -p ${DEMO_TARGET_DIR}
cp -R dist/sage-angular-demo/* ${DEMO_TARGET_DIR}
Expand All @@ -107,23 +110,23 @@ jobs:
# Update major version (e.g. "1.2.3" => "1")
STORYBOOK_TARGET_DIR=gh-pages/latest/storybook
mkdir -p ${STORYBOOK_TARGET_DIR}
#cp -R storybook-static/* ${STORYBOOK_TARGET_DIR}
cp -R storybook-static/* ${STORYBOOK_TARGET_DIR}
DEMO_TARGET_DIR=gh-pages/latest/demo
mkdir -p ${DEMO_TARGET_DIR}
cp -R dist/sage-angular-demo/* ${DEMO_TARGET_DIR}
# Update major version (e.g. "1.2.3" => "1")
STORYBOOK_TARGET_DIR=gh-pages/${{ steps.prep.outputs.version_major }}/storybook
mkdir -p ${STORYBOOK_TARGET_DIR}
#cp -R storybook-static/* ${STORYBOOK_TARGET_DIR}
cp -R storybook-static/* ${STORYBOOK_TARGET_DIR}
DEMO_TARGET_DIR=gh-pages/${{ steps.prep.outputs.version_major }}/demo
mkdir -p ${DEMO_TARGET_DIR}
cp -R dist/sage-angular-demo/* ${DEMO_TARGET_DIR}
# Update minor version (e.g. "1.2.3" => "1.2")
STORYBOOK_TARGET_DIR=gh-pages/${{ steps.prep.outputs.version_minor }}/storybook
mkdir -p ${STORYBOOK_TARGET_DIR}
#cp -R storybook-static/* ${STORYBOOK_TARGET_DIR}
cp -R storybook-static/* ${STORYBOOK_TARGET_DIR}
DEMO_TARGET_DIR=gh-pages/${{ steps.prep.outputs.version_minor }}/demo
mkdir -p ${DEMO_TARGET_DIR}
cp -R dist/sage-angular-demo/* ${DEMO_TARGET_DIR}
Expand Down
3 changes: 0 additions & 3 deletions .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ module.exports = {
"../stories/**/*.stories.@(js|jsx|ts|tsx)"
],
"addons": [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-controls",
"@storybook/addon-actions",
"storybook-addon-themes"
],
core: {
Expand Down
Loading

0 comments on commit f696def

Please sign in to comment.