-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #96 from pamil/beta
Update to Sylius v1.2.0-BETA
- Loading branch information
Showing
8 changed files
with
143 additions
and
41 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "presets": [ | ||
| ["env", { | ||
| "targets": { | ||
| "node": "6" | ||
| }, | ||
| "useBuiltIns": true | ||
| }] | ||
| ], | ||
| "plugins": [ | ||
| ["transform-object-rest-spread", { | ||
| "useBuiltIns": true | ||
| }], | ||
| ["transform-runtime", { | ||
| "helpers": true, | ||
| "polyfill": true, | ||
| "regenerator": true | ||
| }] | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| module.exports = { | ||
| extends: 'airbnb-base', | ||
| rules: { | ||
| 'function-paren-newline': ['error', 'consistent'], | ||
| 'max-len': ['warn', 120, 2, { | ||
| ignoreUrls: true, | ||
| ignoreComments: false, | ||
| ignoreRegExpLiterals: true, | ||
| ignoreStrings: true, | ||
| ignoreTemplateLiterals: true, | ||
| }], | ||
| }, | ||
| }; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| import chug from 'gulp-chug'; | ||
| import gulp from 'gulp'; | ||
| import upath from 'path'; | ||
| import yargs from 'yargs'; | ||
|
|
||
| const { argv } = yargs | ||
| .options({ | ||
| rootPath: { | ||
| description: '<path> path to web assets directory', | ||
| type: 'string', | ||
| requiresArg: true, | ||
| required: false, | ||
| }, | ||
| vendorPath: { | ||
| description: '<path> path to vendor directory', | ||
| type: 'string', | ||
| requiresArg: true, | ||
| required: false, | ||
| }, | ||
| nodeModulesPath: { | ||
| description: '<path> path to node_modules directory', | ||
| type: 'string', | ||
| requiresArg: true, | ||
| required: false, | ||
| }, | ||
| }); | ||
|
|
||
| const config = [ | ||
| '--rootPath', | ||
| argv.rootPath || '../../../../../../../tests/Application/web/assets', | ||
| ...(argv.vendorPath ? [ | ||
| '--vendorPath', | ||
| upath.joinSafe(argv.vendorPath, 'sylius/sylius/src/Sylius/Bundle'), | ||
| ] : []), | ||
| '--nodeModulesPath', | ||
| argv.nodeModulesPath || '../../../../../../../tests/Application/node_modules', | ||
| ]; | ||
|
|
||
| export const buildAdmin = function buildAdmin() { | ||
| return gulp.src('../../vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle/gulpfile.babel.js', { read: false }) | ||
| .pipe(chug({ args: config })); | ||
| }; | ||
| buildAdmin.description = 'Build admin assets.'; | ||
|
|
||
| export const watchAdmin = function watchAdmin() { | ||
| return gulp.src('../../vendor/sylius/sylius/src/Sylius/Bundle/AdminBundle/gulpfile.babel.js', { read: false }) | ||
| .pipe(chug({ args: config, tasks: 'watch' })); | ||
| }; | ||
| watchAdmin.description = 'Watch admin asset sources and rebuild on changes.'; | ||
|
|
||
| export const buildShop = function buildShop() { | ||
| return gulp.src('../../vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle/gulpfile.babel.js', { read: false }) | ||
| .pipe(chug({ args: config })); | ||
| }; | ||
| buildShop.description = 'Build shop assets.'; | ||
|
|
||
| export const watchShop = function watchShop() { | ||
| return gulp.src('../../vendor/sylius/sylius/src/Sylius/Bundle/ShopBundle/gulpfile.babel.js', { read: false }) | ||
| .pipe(chug({ args: config, tasks: 'watch' })); | ||
| }; | ||
| watchShop.description = 'Watch shop asset sources and rebuild on changes.'; | ||
|
|
||
| export const build = gulp.parallel(buildAdmin, buildShop); | ||
| build.description = 'Build assets.'; | ||
|
|
||
| gulp.task('admin', buildAdmin); | ||
| gulp.task('admin-watch', watchAdmin); | ||
| gulp.task('shop', buildShop); | ||
| gulp.task('shop-watch', watchShop); | ||
|
|
||
| export default build; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters