Skip to content

Commit

Permalink
Merge pull request #116 from theiliad/angular-build-fix
Browse files Browse the repository at this point in the history
Fix angular build on Travis
  • Loading branch information
zvonimirfras authored Dec 3, 2018
2 parents b31263b + 23cda43 commit f0fb033
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
7 changes: 6 additions & 1 deletion packages/angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
"@carbon/charts": "^0.7.9"
},
"devDependencies": {
"ng-packagr": "4.4.0",
"@angular/common": "6.0.0",
"@angular/compiler": "6.0.0",
"@angular/compiler-cli": "6.0.0",
"@angular/core": "6.0.0",
"@storybook/addon-actions": "4.0.0-alpha.16",
"@storybook/addon-backgrounds": "4.0.0-alpha.16",
"@storybook/addon-centered": "4.0.0-alpha.16",
Expand All @@ -36,6 +39,8 @@
"@storybook/addons": "4.0.0-alpha.16",
"@storybook/angular": "4.0.0-alpha.16",
"@storybook/storybook-deployer": "2.3.0",
"@types/node": "8.5.2",
"ng-packagr": "4.4.0",
"typescript": "2.7.2"
},
"ngPackage": {
Expand Down
6 changes: 3 additions & 3 deletions scripts/build-packages-and-demos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ cd packages/core
npm run build
npm run demo:build
typedoc --out ./demo/bundle/documentation ./src/index.ts
cp -a demo/bundle/* ../../pages
cp -a demo/bundle/. ../../pages

# Build Angular demos and copy to `pages` directory
cd ../angular
# Build angular demos
npm run build-storybook
cp -a storybook-dist/* ../../pages/angular
cp -a storybook-dist/. ../../pages/angular
# Build angular bundle for release
npm run build
mv dist ../charts-angular-dist
Expand All @@ -24,7 +24,7 @@ rm -rf angular
mv charts-angular-dist angular

# Build React demos
cd ../react
cd react
npm run build
npm run build-storybook
cp -a storybook-dist/. ../../pages/react
Expand Down

0 comments on commit f0fb033

Please sign in to comment.