Skip to content

Commit

Permalink
Merge branch 'release/1.8.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Igloczek committed Nov 14, 2019
2 parents dbe61e1 + e171873 commit 7d22b49
Show file tree
Hide file tree
Showing 61 changed files with 4,204 additions and 3,634 deletions.
4 changes: 3 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
extends:
- eslint:recommended
- idiomatic
parserOptions:
ecmaVersion: 2017
sourceType: module
env:
node: true
es6: true
amd: true
rules:
no-multi-spaces: 0
space-in-parens: 0
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
>=10.13.0 <11.0.0
>=12.13.0 <13.0.0
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js: 10
node_js: 12
cache:
yarn: true
directories:
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If you want to know more about this project, let's join [Magento Community Engin
3. Run `yarn` or `npm install`
4. Decide where you want to keep your config files.
You can store them in Frontools `config` directory or in `dev/tools/frontools/config`.
There is a `gulp setup` task to copy all sample config files from the `config` to `dev/tools/frontools/config` and create a convenient symlink `tools` in the project root.
There is a `setup` task to copy all sample config files from the `config` to `dev/tools/frontools/config` and create a convenient symlink `tools` in the project root.
If you want to keep config files inside frontools `config` dir, you have to handle this manually.
5. Define your themes in `themes.json`.

Expand Down Expand Up @@ -47,6 +47,7 @@ You will find sample config files for theses plugins in `vendor/snowdog/frontool
* Create [svg-sprite](https://github.com/jkphl/gulp-svg-sprite) configuration

## Tasks list
Plase use `yarn [taskName]` or `npm run [taskName]` to avoid necessity of instaling `gulp-cli` globally.
* `babel` - Run [Babel](https://babeljs.io/), a compiler for writing next generation JavaScript.
* `--theme name` - Process single theme.
* `--prod` - Production output - minifies and uglyfy code.
Expand All @@ -59,7 +60,7 @@ You will find sample config files for theses plugins in `vendor/snowdog/frontool
* `--theme name` - Process single theme.
* `--disableLinting` - Disable SASS and CSS linting.
* `--disableMaps` - Disable inline source maps generation.
* `email-fix` - Fixes email stylesheet for Magento < 2.3.0. [Related issue](https://github.com/MyIntervals/emogrifier/issues/296)
* `emailfix` - Fixes email stylesheet for Magento < 2.3.0. [Related issue](https://github.com/MyIntervals/emogrifier/issues/296)
* `--prod` - Production output - minifies styles and add `.min` sufix.
* `eslint` - Watch and run [eslint](https://github.com/adametry/gulp-eslint) on specified JS file.
* `--file fileName` - You have to specify what file you want to lint, fileName without .js.
Expand Down
5 changes: 5 additions & 0 deletions config/stylelint.yml.sample
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,8 @@ rules:
font-family-no-missing-generic-family-keyword: null
no-duplicate-selectors: null
max-empty-lines: null
declaration-colon-space-after: null
block-opening-brace-space-after: null
declaration-block-single-line-max-declarations: null
number-leading-zero: null
function-comma-space-after: null
2 changes: 1 addition & 1 deletion config/themes.json.sample
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"locale": ["en_US", "pl_PL"],
"parent": "blank",
"stylesDir": "web/css",
"postcss": ["plugins.autoprefixer()"],
"postcss": ["autoprefixer()"],
"disableSuffix": true,
"modules": {
"Snowdog_Sample": "vendor/snowdog/module-sample"
Expand Down
29 changes: 29 additions & 0 deletions gulpfile.esm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { series } from 'gulp'

import pipelineHelper from './helpers/pipeline'

import { babel as babelTask } from './tasks/babel'
import { clean as cleanTask } from './tasks/clean'
import { csslint as cssLintTask } from './tasks/css-lint'
import { dev as devTask } from './tasks/dev'
import { emailFix as emailFixTask } from './tasks/email-fix'
import { inheritance as inheritanceTask } from './tasks/inheritance'
import { sasslint as sassLintTask } from './tasks/sass-lint'
import { setup as setupTask } from './tasks/setup'
import { styles as stylesTask } from './tasks/styles'
import { svg as svgTask } from './tasks/svg'
import { watch as watchTask } from './tasks/watch'

export const babel = series(inheritanceTask, babelTask)
export const clean = cleanTask
export const csslint = cssLintTask
export const dev = series(pipelineHelper, inheritanceTask, babelTask, stylesTask, devTask, watchTask)
export const emailfix = emailFixTask
export const inheritance = inheritanceTask
export const sasslint = sassLintTask
export const setup = setupTask
export const styles = series(inheritanceTask, stylesTask)
export const svg = series(inheritanceTask, svgTask)
export const watch = watchTask

export { default as default } from './tasks/default'
32 changes: 0 additions & 32 deletions gulpfile.js

This file was deleted.

75 changes: 0 additions & 75 deletions helper/babel.js

This file was deleted.

32 changes: 0 additions & 32 deletions helper/config-loader.js

This file was deleted.

28 changes: 0 additions & 28 deletions helper/css-lint.js

This file was deleted.

54 changes: 0 additions & 54 deletions helper/dependency-tree-builder.js

This file was deleted.

22 changes: 0 additions & 22 deletions helper/email-fix.js

This file was deleted.

9 changes: 0 additions & 9 deletions helper/error-message.js

This file was deleted.

24 changes: 0 additions & 24 deletions helper/get-themes.js

This file was deleted.

Loading

0 comments on commit 7d22b49

Please sign in to comment.