Skip to content

Commit

Permalink
Merge pull request #33 from spryker-shop/master-merge-suite-167
Browse files Browse the repository at this point in the history
Master merge suite 167
  • Loading branch information
Alessandro Bellini authored Jun 19, 2018
2 parents ebf0553 + 324e1d0 commit bd5048c
Show file tree
Hide file tree
Showing 16 changed files with 459 additions and 285 deletions.
151 changes: 20 additions & 131 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion data/import/navigation_node.csv
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ SHIPMENT_PROVIDERS,node_key_35,,label,Rocket,,rocket,Rocket,,rocket,,
SOCIAL_LINKS,node_key_36,,external_url,Twitter,https://twitter.com/sprysys?lang=de,twitter,Twitter,https://twitter.com/sprysys?lang=de,twitter,,
SOCIAL_LINKS,node_key_37,,external_url,Xing,https://www.xing.com/companies/sprykersystemsgmbh,xing,Xing,https://www.xing.com/companies/sprykersystemsgmbh,xing,,
SOCIAL_LINKS,node_key_38,,external_url,LinkedIn,https://www.linkedin.com/company/spryker-systems-gmbh,linkedin,LinkedIn,https://www.linkedin.com/company/spryker-systems-gmbh,linkedin,,
SOCIAL_LINKS,node_key_39,,external_url,YouTube,https://www.youtube.com/channel/UC6lVOEbqXxUh0W5FMTvlPDQ,youtube,YouTube,https://www.youtube.com,youtube,,
SOCIAL_LINKS,node_key_39,,external_url,YouTube,https://www.youtube.com,youtube,YouTube,https://www.youtube.com,youtube,,
19 changes: 7 additions & 12 deletions frontend/build.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
// require suite-frontend-builder
const builder = require('@spryker/suite-frontend-builder');
// get the webpack compiler
const compiler = require('./libs/compiler');

// require project settings
const settings = require('./settings');

// get the mode arg from `npm run xxx` script
// defined in package.json
// get the mode arg from `npm run xxx` script defined in package.json
const [mode] = process.argv.slice(2);

// register custom development configuration factory
require('./config/development');
// get the webpack configuration associated with the provided mode
const config = require(`./configs/${mode}`);

// build the project using the configuration factory
// associated with the provided mode
builder.build(settings, mode);
// build the project
compiler.compile(config);
Loading

0 comments on commit bd5048c

Please sign in to comment.