Skip to content

Commit

Permalink
fix: npm install with npm 7 (#592)
Browse files Browse the repository at this point in the history
npm install was failing with npm 7 unless using the --legacy-peer-deps
flag. Remove dependency to old version of eslint-config-vaadin
and stylelint-config-vaadin while adapting the configs to try to keep
the rules mostly the same for now. We might consider using the latest
version of eslint-config-vaadin and stylelint-config-vaadin again when
we migrate away from bower and HTML Imports and maybe migrate
this repo to use TypeScript.

Fixes #541.
  • Loading branch information
Haprog authored Mar 16, 2021
1 parent b1841d9 commit e740512
Show file tree
Hide file tree
Showing 8 changed files with 387 additions and 319 deletions.
55 changes: 54 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "vaadin",
"extends": "eslint:recommended",
"env": {
"browser": true,
"node": true,
Expand All @@ -15,6 +15,59 @@
"parserOptions": {
"sourceType": "module"
},
"rules": {
"curly": 2,
"no-caller": 2,
"no-extend-native": 2,
"no-extra-bind": 2,
"no-invalid-this": 2,
"no-multi-spaces": 2,
"no-new-wrappers": 2,
"no-with": 2,
"array-bracket-spacing": [2, "never"],
"brace-style": 2,

"camelcase": [2, {"properties": "never"}],
"comma-spacing": 2,
"comma-style": 2,
"computed-property-spacing": 2,
"func-call-spacing": 2,
"indent": [2, 2, {"SwitchCase": 1}],
"key-spacing": 2,
"keyword-spacing": 2,
"linebreak-style": 2,
"max-len": [2, {"code": 140}],
"no-array-constructor": 2,
"no-multiple-empty-lines": [2, {"max": 2}],
"no-new-object": 2,
"no-trailing-spaces": 2,
"object-curly-spacing": 2,
"quote-props": [2, "consistent"],
"quotes": [2, "single", {"allowTemplateLiterals": true}],
"semi-spacing": 2,
"semi": 2,
"space-before-blocks": 2,
"space-before-function-paren": [2, "never"],
"space-in-parens": 2,
"space-infix-ops": 2,
"spaced-comment": [2, "always"],

"arrow-spacing": 2,
"constructor-super": 2,
"no-confusing-arrow": 2,
"no-const-assign": 2,
"no-dupe-class-members": 2,
"no-duplicate-imports": 2,
"no-this-before-super": 2,
"no-useless-computed-key": 2,
"no-useless-constructor": 2,
"no-useless-rename": 2,
"prefer-const": 2,
"rest-spread-spacing": 2,
"template-curly-spacing": 2,

"no-unused-vars": ["error", { "args": "none" }]
},
"overrides": [{
"files": ["gulpfile.js"],
"parserOptions": {
Expand Down
3 changes: 0 additions & 3 deletions .stylelintrc

This file was deleted.

93 changes: 93 additions & 0 deletions .stylelintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"rules": {
"at-rule-name-case": "lower",
"at-rule-name-space-after": "always-single-line",
"at-rule-semicolon-newline-after": "always",
"block-closing-brace-empty-line-before": "never",
"block-closing-brace-newline-after": "always",
"block-closing-brace-newline-before": "always-multi-line",
"block-closing-brace-space-before": "always-single-line",
"block-no-empty": true,
"block-opening-brace-newline-after": "always-multi-line",
"block-opening-brace-space-after": "always-single-line",
"block-opening-brace-space-before": "always",
"color-hex-length": "short",
"color-no-invalid-hex": true,
"comment-no-empty": true,
"comment-whitespace-inside": "always",
"custom-property-empty-line-before": "never",
"declaration-bang-space-after": "never",
"declaration-bang-space-before": "always",
"declaration-block-no-duplicate-properties": [ true, {
"ignore": ["consecutive-duplicates-with-different-values"]
} ],
"declaration-block-no-redundant-longhand-properties": true,
"declaration-block-no-shorthand-property-overrides": true,
"declaration-block-semicolon-newline-after": "always-multi-line",
"declaration-block-semicolon-space-after": "always-single-line",
"declaration-block-semicolon-space-before": "never",
"declaration-block-single-line-max-declarations": 1,
"declaration-block-trailing-semicolon": "always",
"declaration-colon-newline-after": "always-multi-line",
"declaration-colon-space-after": "always-single-line",
"declaration-colon-space-before": "never",
"font-family-no-duplicate-names": true,
"function-calc-no-unspaced-operator": true,
"function-comma-newline-after": "always-multi-line",
"function-comma-space-after": "always-single-line",
"function-comma-space-before": "never",
"function-linear-gradient-no-nonstandard-direction": true,
"function-max-empty-lines": 0,
"function-name-case": "lower",
"function-parentheses-newline-inside": "always-multi-line",
"function-parentheses-space-inside": "never-single-line",
"function-whitespace-after": "always",
"indentation": null,
"keyframe-declaration-no-important": true,
"length-zero-no-unit": true,
"max-empty-lines": 1,
"media-feature-colon-space-after": "always",
"media-feature-colon-space-before": "never",
"media-feature-name-case": "lower",
"media-feature-name-no-unknown": true,
"media-feature-parentheses-space-inside": "never",
"media-feature-range-operator-space-after": "always",
"media-feature-range-operator-space-before": "always",
"media-query-list-comma-newline-after": "always-multi-line",
"media-query-list-comma-space-after": "always-single-line",
"media-query-list-comma-space-before": "never",
"no-eol-whitespace": true,
"no-invalid-double-slash-comments": true,
"number-no-trailing-zeros": true,
"property-case": "lower",
"property-no-unknown": true,
"rule-empty-line-before": [ "always-multi-line", {
"except": ["first-nested"],
"ignore": ["after-comment"]
} ],
"selector-attribute-brackets-space-inside": "never",
"selector-attribute-operator-space-after": "never",
"selector-attribute-operator-space-before": "never",
"selector-combinator-space-after": "always",
"selector-combinator-space-before": "always",
"selector-descendant-combinator-no-non-space": true,
"selector-list-comma-newline-after": "always",
"selector-list-comma-space-before": "never",
"selector-max-empty-lines": 0,
"selector-pseudo-class-case": "lower",
"selector-pseudo-class-no-unknown": true,
"selector-pseudo-class-parentheses-space-inside": "never",
"selector-pseudo-element-case": "lower",
"selector-pseudo-element-colon-notation": "double",
"selector-pseudo-element-no-unknown": true,
"selector-type-case": "lower",
"shorthand-property-no-redundant-values": true,
"string-no-newline": true,
"unit-case": "lower",
"unit-no-unknown": true,
"value-list-comma-newline-after": "always-multi-line",
"value-list-comma-space-after": "always-single-line",
"value-list-comma-space-before": "never",
"value-list-max-empty-lines": 0
}
}
1 change: 1 addition & 0 deletions demo/element-demo.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<script>
/* eslint-disable no-global-assign */
/* @polymerMixin */
ElementDemo = superClass => {
return class extends superClass {
Expand Down
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
"browserslist": "^4.16.3",
"bundlesize": "^0.18.1",
"eslint": "^7.22.0",
"eslint-config-vaadin": "0.2.7",
"eslint-plugin-html": "^6.1.2",
"fs-extra": "^9.1.0",
"gulp": "^4.0.2",
Expand All @@ -91,7 +90,6 @@
"polyserve": "^0.27.15",
"rollup": "^2.35.1",
"stylelint": "^13.12.0",
"stylelint-config-vaadin": "0.1.4",
"typescript": "^4.1.5",
"uglify-es": "^3.3.9",
"wct-istanbul": "^0.14.3",
Expand Down
2 changes: 1 addition & 1 deletion src/resolver/resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class Resolver {
? this.constructor.__createUrl(
this.baseUrl,
document.baseURI || document.URL
).href.replace(/[^\/]*$/, '')
).href.replace(/[^/]*$/, '')
: '';
}

Expand Down
2 changes: 1 addition & 1 deletion src/router.js
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export class Router extends Resolver {
const baseHref = baseElement && baseElement.getAttribute('href');
super([], Object.assign({
// Default options
baseUrl: baseHref && Resolver.__createUrl(baseHref, document.URL).href.replace(/[^\/]*$/, '')
baseUrl: baseHref && Resolver.__createUrl(baseHref, document.URL).href.replace(/[^/]*$/, '')
}, options));

this.resolveRoute = context => this.__resolveRoute(context);
Expand Down
Loading

0 comments on commit e740512

Please sign in to comment.