Skip to content

Commit

Permalink
add missing files/update files
Browse files Browse the repository at this point in the history
  • Loading branch information
dpfaffenbauer committed Nov 12, 2018
1 parent 3f09934 commit 7f66ef5
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 10 deletions.
23 changes: 23 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module.exports = {
'root': true,
'env': {
'browser': true,
'commonjs': true,
'es6': true,
},
'extends': [
'eslint:recommended',
'airbnb-base'
],
'globals': { 'UIkit': true },
'parser': 'babel-eslint',
'rules': {
'no-extra-semi': 'error',
'no-template-curly-in-string': 'error',
'no-caller': 'error',
'global-require': 'off',
'no-extra-bind': 'warn',
'no-empty': ['error', { 'allowEmptyCatch': true }],
'no-process-exit': 'warn',
}
};
24 changes: 24 additions & 0 deletions .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = {
'ignoreFiles': ['**/vendor/**/*', '**/pimcore/**/*'],
'rules': {
'block-no-empty': true,
'color-no-invalid-hex': true,
'declaration-colon-space-after': 'always',
'declaration-colon-space-before': 'never',
'function-comma-space-after': 'always',
'function-url-quotes': 'always',
'media-feature-colon-space-after': 'always',
'media-feature-colon-space-before': 'never',
'media-feature-name-no-vendor-prefix': true,
'max-empty-lines': 5,
'number-leading-zero': 'never',
'number-no-trailing-zeros': true,
'property-no-vendor-prefix': true,
'declaration-block-no-duplicate-properties': true,
'declaration-block-trailing-semicolon': 'always',
'declaration-block-semicolon-space-before': 'never',
'selector-list-comma-space-before': 'never',
'selector-list-comma-newline-after': 'always',
'string-quotes': 'single',
}
};
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "pimcore-skeleton",
"version": "5.4.0",
"description": "Pimcore Skeleton with Docker and Webpack",
"name": "wvision-bundle",
"version": "2.0.0",
"description": "A full-featured frontend-optimizer for developing projects with pimcore",
"author": "w-vision AG <support@w-vision.ch>",
"license": "GPL-3.0-or-later",
"license": "GPL-3.0",
"homepage": "https://www.w-vision.ch",
"repository": "https://github.com/w-vision/pimcore-skeleton",
"repository": "https://github.com/w-vision/Wvision",
"scripts": {
"build": "./node_modules/.bin/encore production",
"deploy": "php vendor/bin/dep deploy",
Expand All @@ -19,7 +19,7 @@
"watch": "./node_modules/.bin/encore dev --watch"
},
"devDependencies": {
"@symfony/webpack-encore": "^0.20.1",
"@symfony/webpack-encore": "^0.20.0",
"autoprefixer": "^8.3.0",
"babel-eslint": "^8.2.3",
"eslint": "^4.19.1",
Expand All @@ -36,7 +36,7 @@
"dependencies": {
"foundation-emails": "^2.2.1",
"imagesloaded": "^4.1.4",
"uikit": "^3.0.0-rc.11",
"uikit": "^3.0.0-rc.10",
"webfontloader": "^1.6.28"
},
"browserslist": [
Expand All @@ -47,4 +47,4 @@
"eslintIgnore": [
"assets/js/vendor/**/*"
]
}
}
4 changes: 2 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const paths = {
};

Encore
// Set output and public paths
// Set output and public paths
.setOutputPath(paths.output)
.setPublicPath(paths.public)

Expand Down Expand Up @@ -88,4 +88,4 @@ for (const rule of config.module.rules) {
}
}

module.exports = config;
module.exports = config;

0 comments on commit 7f66ef5

Please sign in to comment.