merge master

.gitignore

@@ -10,10 +10,10 @@ Thumbs.db
 .vscode
 
 # Dependency directory
+/dist
 node_modules
 build
 src/vendor
-tmp
 test/visual-regression-tests/backstop_data
 .tmp
 *.log
@@ -23,7 +23,9 @@ test/visual-regression-tests/backstop_data
 ghpages
 
 # Generated CSS files
-docs/css/fiori-fundamentals.css
-docs/css/fui-site.css
+/docs/css/fiori-fundamentals.css
+/docs/css/fui-site.css
 test/visual-regression-tests/config/backstopConfigCI.json
 docs/_config-library.yml
+/less/fiori-fundamentals-ie11.less
+/less/fiori-fundamentals.less

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="1.4.9-rc.0"></a>
+## [1.4.9-rc.0](https://github.com/SAP/fundamental/compare/v1.4.8...v1.4.9-rc.0) (2019-03-26)
+
+
+### Bug Fixes
+
+* organize scripts and change dist folder workflow ([#1345](https://github.com/SAP/fundamental/issues/1345)) ([356114d](https://github.com/SAP/fundamental/commit/356114d))
+
+
+
 <a name="1.4.8"></a>
 ## [1.4.8](https://github.com/SAP/fundamental/compare/v1.4.8-rc.0...v1.4.8) (2019-03-22)
 

README.md

@@ -46,25 +46,17 @@ You can clone the entire repo and work in the full project where we manage the [
 
 1. **Install Ruby Gems** - These gems are needed to be installed for the documentation site: `gem install ruby bundle jekyll`
 
-1. **Install Bundle Dependencies** - Bundle dependencies must be installed the from `docs` directory:
-`cd docs` and then `bundle install`
+1. **Serve the documentation website locally** - `npm start`
 
-1. **Serve it locally** - The documentation website is served from the `docs/_site` directory which is generated by Jekyll. To generate and launch the documentation site, from the root simply execute `npm start`
+1. **Serve the development playground locally**: `npm run start:playground`
 
 
 ### Project Dependencies
 The project has the following prerequisites and works best with the noted versions.
 
 * Git (for downloading this repo)
-* [Node LTS](https://nodejs.org/) 8.12.0
-* [Gulp](https://gulpjs.com/) 6.4.1
-* SCSS (for CSS)
-* Nunjucks (for testing)
-* Ruby (for documentation site)
-* Python 2 (for Jekyll - documentation site)
-* Bundle (for documentation site)
-* Jekyll (for documentation site)
-* Xcode (for some macOS users)
+* [Node LTS](https://nodejs.org/)
+* Ruby (for running the documentation website locally)
 
 ## Limitations
 

ci-scripts/publish-rc.sh

@@ -9,4 +9,7 @@ npm run std-version -- --prerelease rc --no-verify
 
 git push --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" "$TRAVIS_BRANCH" > /dev/null 2>&1;
 
+#build dist folder
+npm run build -- --production
+
 npm publish --tag prerelease

ci-scripts/publish.sh

@@ -17,7 +17,10 @@ git push --follow-tags "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG" master >
 
 npm run release:create -- --repo $TRAVIS_REPO_SLUG --tag $release_tag --branch master
 
+#build dist folder
+npm run build -- --production
+
 npm publish
 
-npm run build-doc
+npm run build:docs
 npm run deploy -- --repo "https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG"