Skip to content

Commit

Permalink
fix(eslint-config): fix peer dependency mismatch (#2477)
Browse files Browse the repository at this point in the history
* fix(eslint-config): fix peer dependency mismatch

* fix linting issues

* update changeset

Co-authored-by: Pascal Schilp <pascalschilp@gmail.com>
  • Loading branch information
pndewit and thepassle committed Aug 3, 2022
1 parent a8bc80e commit 61e2668
Show file tree
Hide file tree
Showing 79 changed files with 587 additions and 378 deletions.
13 changes: 13 additions & 0 deletions .changeset/purple-ears-own.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
'@open-wc/building-rollup': patch
'@open-wc/building-utils': patch
'@open-wc/codelabs': patch
'@open-wc/dev-server-hmr': patch
'@open-wc/eslint-config': patch
'eslint-plugin-lit-a11y': patch
'@open-wc/scoped-elements': patch
'storybook-addon-markdown-docs': patch
'@open-wc/testing-helpers': patch
---

update eslint, eslint-config-airbnb-base and eslint-plugin-import
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@
"concurrently": "^6.0.2",
"copyfiles": "^2.4.1",
"core-js": "^3.11.1",
"eslint": "^7.6.0",
"eslint-config-airbnb-base": "^14.2.1",
"eslint": "^8.21.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-html": "^6.1.2",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-import": "^2.26.0",
"eslint-plugin-no-only-tests": "^2.6.0",
"eslint-plugin-wc": "^1.3.0",
"fs-extra": "^10.0.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/building-rollup/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* @typedef {import('./src/types').SpaOptions} SpaOptions
*/

const { createBasicConfig } = require('./src/createBasicConfig');
const { createSpaConfig } = require('./src/createSpaConfig');
const { createMpaConfig } = require('./src/createMpaConfig');
const { createBasicConfig } = require('./src/createBasicConfig.js');
const { createSpaConfig } = require('./src/createSpaConfig.js');
const { createMpaConfig } = require('./src/createMpaConfig.js');

module.exports = { createBasicConfig, createSpaConfig, createMpaConfig };
4 changes: 2 additions & 2 deletions packages/building-rollup/src/babel/babel-configs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { babelPluginBundledHelpers } = require('./babel-plugin-bundled-helpers');
const { isFalsy } = require('../utils');
const { babelPluginBundledHelpers } = require('./babel-plugin-bundled-helpers.js');
const { isFalsy } = require('../utils.js');

const createBabelConfigRollupBuild = ({ developmentMode }) => ({
babelHelpers: 'bundled',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { types } = require('@babel/core');
const { HELPER_MODULE_NAME } = require('./rollup-plugin-bundled-babel-helpers');
const { HELPER_MODULE_NAME } = require('./rollup-plugin-bundled-babel-helpers.js');

/**
* Babel plugin which imports babel helpers from a helper module.
Expand Down
6 changes: 3 additions & 3 deletions packages/building-rollup/src/createBasicConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const {
createBabelConfigRollupBuild,
babelConfigLegacyRollupGenerate,
babelConfigSystemJs,
} = require('./babel/babel-configs');
const { bundledBabelHelpers } = require('./babel/rollup-plugin-bundled-babel-helpers');
const { isFalsy, pluginWithOptions, dedupedBabelPlugin } = require('./utils');
} = require('./babel/babel-configs.js');
const { bundledBabelHelpers } = require('./babel/rollup-plugin-bundled-babel-helpers.js');
const { isFalsy, pluginWithOptions, dedupedBabelPlugin } = require('./utils.js');

/**
* @param {BasicOptions} userOptions
Expand Down
6 changes: 3 additions & 3 deletions packages/building-rollup/src/createSpaConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ const { importMetaAssets } = require('@web/rollup-plugin-import-meta-assets');
const { polyfillsLoader } = require('@web/rollup-plugin-polyfills-loader');
const path = require('path');
const { generateSW } = require('rollup-plugin-workbox');
const { createBasicConfig } = require('./createBasicConfig');
const { pluginWithOptions, applyServiceWorkerRegistration, isFalsy } = require('./utils');
const { defaultPolyfills } = require('./polyfills');
const { createBasicConfig } = require('./createBasicConfig.js');
const { pluginWithOptions, applyServiceWorkerRegistration, isFalsy } = require('./utils.js');
const { defaultPolyfills } = require('./polyfills.js');

/**
* @param {SpaOptions} options
Expand Down
2 changes: 1 addition & 1 deletion packages/building-utils/dom5-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const {
predicates,
getAttribute,
hasAttribute,
} = require('./dom5-fork');
} = require('./dom5-fork/index.js');

/**
* @param {string} tag
Expand Down
12 changes: 6 additions & 6 deletions packages/building-utils/index-html/create-index-html.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const { serialize } = require('parse5');
const path = require('path');
const deepmerge = require('deepmerge');
const { createScript, createElement } = require('../dom5-utils');
const { append, insertBefore, query, predicates } = require('../dom5-fork');
const { getPolyfills } = require('./polyfills');
const { createLoaderScript } = require('./loader-script');
const { minifyIndexHTML, defaultMinifyHTMLConfig } = require('./minify-index-html');
const { createContentHash, cleanImportPath, polyfillFilename } = require('./utils');
const { createScript, createElement } = require('../dom5-utils.js');
const { append, insertBefore, query, predicates } = require('../dom5-fork/index.js');
const { getPolyfills } = require('./polyfills.js');
const { createLoaderScript } = require('./loader-script.js');
const { minifyIndexHTML, defaultMinifyHTMLConfig } = require('./minify-index-html.js');
const { createContentHash, cleanImportPath, polyfillFilename } = require('./utils.js');

/** @typedef {import('parse5').Document} ASTNode */

Expand Down
2 changes: 1 addition & 1 deletion packages/building-utils/index-html/extract-resources.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { parse } = require('parse5');
const { isUri } = require('valid-url');
const { queryAll, predicates, getAttribute, remove } = require('../dom5-fork');
const { queryAll, predicates, getAttribute, remove } = require('../dom5-fork/index.js');

/**
* @typedef {object} ExtractResult
Expand Down
8 changes: 4 additions & 4 deletions packages/building-utils/index-html/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { createIndexHTML } = require('./create-index-html');
const { minifyIndexHTML } = require('./minify-index-html');
const { extractResources } = require('./extract-resources');
const { findInlineEntryId } = require('./inline-entry');
const { createIndexHTML } = require('./create-index-html.js');
const { minifyIndexHTML } = require('./minify-index-html.js');
const { extractResources } = require('./extract-resources.js');
const { findInlineEntryId } = require('./inline-entry.js');

module.exports = {
createIndexHTML,
Expand Down
2 changes: 1 addition & 1 deletion packages/building-utils/index-html/loader-script.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const Terser = require('terser');
const { cleanImportPath, polyfillFilename } = require('./utils');
const { cleanImportPath, polyfillFilename } = require('./utils.js');

/**
* @typedef {import('./create-index-html').EntriesConfig} EntriesConfig
Expand Down
2 changes: 1 addition & 1 deletion packages/building-utils/index-html/polyfills.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const path = require('path');
const fs = require('fs');
const Terser = require('terser');
const { createContentHash } = require('./utils');
const { createContentHash } = require('./utils.js');

/** @typedef {import('./create-index-html').PolyfillInstruction} PolyfillInstruction */
/** @typedef {import('./create-index-html').CreateIndexHTMLConfig} CreateIndexHTMLConfig */
Expand Down
10 changes: 5 additions & 5 deletions packages/building-utils/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const findSupportedBrowsers = require('./find-supported-browsers');
const defaultFileExtensions = require('./default-file-extensions');
const { toBrowserPath } = require('./to-browser-path');
const { toFilePath } = require('./to-file-path');
const dom5Utils = require('./dom5-utils');
const findSupportedBrowsers = require('./find-supported-browsers.js');
const defaultFileExtensions = require('./default-file-extensions.js');
const { toBrowserPath } = require('./to-browser-path.js');
const { toFilePath } = require('./to-file-path.js');
const dom5Utils = require('./dom5-utils.js');

module.exports = {
findSupportedBrowsers,
Expand Down
4 changes: 2 additions & 2 deletions packages/building-utils/test-node/dom5-utils.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { expect } = require('chai');
const { parse } = require('parse5');
const { getAttribute, getTextContent } = require('../dom5-fork');
const { findJsScripts, findImportMapScripts } = require('../dom5-utils');
const { getAttribute, getTextContent } = require('../dom5-fork/index.js');
const { findJsScripts, findImportMapScripts } = require('../dom5-utils.js');

const htmlString = `
<html>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { expect } = require('chai');
const { extractResources } = require('../../index-html');
const { getAttribute, queryAll, predicates } = require('../../dom5-fork');
const { extractResources } = require('../../index-html/index.js');
const { getAttribute, queryAll, predicates } = require('../../dom5-fork/index.js');

describe('extract-resources', () => {
it('returns any resources found', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const { expect } = require('chai');
const { parse } = require('parse5');
const path = require('path');
const fs = require('fs');
const { createIndexHTML } = require('../../index-html');
const { createIndexHTML } = require('../../index-html/index.js');

const updateSnapshots = process.argv.includes('--update-snapshots');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { expect } = require('chai');
const fs = require('fs');
const path = require('path');
const { createLoaderScript } = require('../../index-html/loader-script');
const { createLoaderScript } = require('../../index-html/loader-script.js');

const updateSnapshots = process.argv.includes('--update-snapshots');

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const path = require('path');
const { expect } = require('chai');
const { getPolyfills } = require('../../index-html/polyfills');
const { getPolyfills } = require('../../index-html/polyfills.js');

describe('polyfills', () => {
it('returns the correct polyfills', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/building-utils/to-file-path.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const path = require('path');
* but it should use `/` in the browser.
*/
function toFilePath(browserPath) {
return browserPath.replace(new RegExp('/', 'g'), path.sep);
return browserPath.replace(/\//g, path.sep);
}

module.exports = { toFilePath };
2 changes: 1 addition & 1 deletion packages/codelabs/build-codelabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const fs = require('fs-extra');
const path = require('path');
const markedSync = require('marked');
const cheerio = require('cheerio');
const createCodelabIndex = require('./createCodelabIndex');
const createCodelabIndex = require('./createCodelabIndex.js');

const outputDir = path.join(__dirname, '..', '..', '_site', 'codelabs');

Expand Down
16 changes: 8 additions & 8 deletions packages/dev-server-hmr/src/babel/babelPluginWcHmr.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,19 @@

const path = require('path');

const { findDefinedCustomElement } = require('./customElementsDefine');
const { findDecoratedCustomElement } = require('./decorators');
const { findDefinedCustomElement } = require('./customElementsDefine.js');
const { findDecoratedCustomElement } = require('./decorators.js');
const {
injectRegisterClass,
injectRuntime,
isClassRegistered,
findComponentName,
} = require('./inject');
const { parseOptions, singlePath, addToSet } = require('./utils');
const { isFunctionComponent } = require('./functions');
const { getImportedVariableNames } = require('./getImportedVariableNames');
const { implementsBaseClass } = require('./class');
const { createError } = require('../utils');
} = require('./inject.js');
const { parseOptions, singlePath, addToSet } = require('./utils.js');
const { isFunctionComponent } = require('./functions.js');
const { getImportedVariableNames } = require('./getImportedVariableNames.js');
const { implementsBaseClass } = require('./class.js');
const { createError } = require('../utils.js');

/** @returns {PluginObj} */
function babelPluginWcHmr() {
Expand Down
4 changes: 2 additions & 2 deletions packages/dev-server-hmr/src/babel/babelTransform.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { transformAsync } = require('@babel/core');

const babelPluginWcHmr = require('./babelPluginWcHmr');
const { createError } = require('../utils');
const babelPluginWcHmr = require('./babelPluginWcHmr.js');
const { createError } = require('../utils.js');

/** @typedef {import('./babelPluginWcHmr').BabelPluginWcHmrOptions} BabelPluginWcHmrOptions */

Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-hmr/src/babel/class.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/** @typedef {import('@babel/types').ClassExpression} ClassExpression */
/** @template T @typedef {import('@babel/core').NodePath<T>} NodePath<T> */

const { singlePath } = require('./utils');
const { singlePath } = require('./utils.js');

/**
* @param {NodePath<ClassDeclaration> | NodePath<ClassExpression>} classDeclOrExpr
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-hmr/src/babel/customElementsDefine.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/** @typedef {import('@babel/types').Expression} Expression */
/** @template T @typedef {import('@babel/core').NodePath<T>} NodePath<T> */

const { resolvePath, findComponentDefinition, singlePath } = require('./utils');
const { resolvePath, findComponentDefinition, singlePath } = require('./utils.js');

const GLOBALS = ['window', 'self', 'globalThis'];

Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-hmr/src/babel/decorators.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/** @typedef {import('./babelPluginWcHmr').Decorator} Decorator */
/** @template T @typedef {import('@babel/core').NodePath<T>} NodePath<T> */

const { findComponentDefinition, singlePath } = require('./utils');
const { findComponentDefinition, singlePath } = require('./utils.js');

/**
* @param {Set<string>} decoratorNames
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-hmr/src/babel/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/** @typedef {import('./babelPluginWcHmr').Decorator} Decorator */
/** @template T @typedef {import('@babel/core').NodePath<T>} NodePath<T> */

const { singlePath } = require('./utils');
const { singlePath } = require('./utils.js');

/**
* @param {NodePath<CallExpression>} callExpr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/** @typedef {import('./babelPluginWcHmr').FunctionOption} FunctionOption */

const path = require('path');
const { singlePath } = require('./utils');
const { singlePath } = require('./utils.js');

/**
* @param {string} importSpecifier
Expand Down
4 changes: 2 additions & 2 deletions packages/dev-server-hmr/src/babel/inject.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
/** @template T @typedef {import('@babel/core').NodePath<T>} NodePath<T> */

const { parse, types: t } = require('@babel/core');
const { WC_HMR_NAMESPACE, WC_HMR_MODULE_PATCH, WC_HMR_MODULE_RUNTIME } = require('../constants');
const { singlePath, parseStatement } = require('./utils');
const { WC_HMR_NAMESPACE, WC_HMR_MODULE_PATCH, WC_HMR_MODULE_RUNTIME } = require('../constants.js');
const { singlePath, parseStatement } = require('./utils.js');

const REGISTER_FN_NAME = 'register';

Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-hmr/src/babel/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/** @template T @typedef {import('@babel/core').NodePath<T>} NodePath<T> */

const { parse } = require('@babel/core');
const { createError } = require('../utils');
const { createError } = require('../utils.js');

/**
* @param {BabelPluginWcHmrOptions} options
Expand Down
10 changes: 7 additions & 3 deletions packages/dev-server-hmr/src/hmrPlugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,13 @@ const { hmrPlugin: createBaseHmrPlugin } = require('@web/dev-server-hmr');
const fs = require('fs');
const path = require('path');

const { WC_HMR_MODULE_PREFIX, WC_HMR_MODULE_RUNTIME, WC_HMR_MODULE_PATCH } = require('./constants');
const { parseConfig, createMatchers, createError } = require('./utils');
const { babelTransform } = require('./babel/babelTransform');
const {
WC_HMR_MODULE_PREFIX,
WC_HMR_MODULE_RUNTIME,
WC_HMR_MODULE_PATCH,
} = require('./constants.js');
const { parseConfig, createMatchers, createError } = require('./utils.js');
const { babelTransform } = require('./babel/babelTransform.js');

const wcHmrRuntime = fs.readFileSync(path.resolve(__dirname, 'wcHmrRuntime.js'), 'utf-8');

Expand Down
12 changes: 6 additions & 6 deletions packages/dev-server-hmr/src/index.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const { hmrPlugin } = require('./hmrPlugin');
const { litElement } = require('./presets/litElement');
const { lit } = require('./presets/lit');
const { fastElement } = require('./presets/fastElement');
const { haunted } = require('./presets/haunted');
const { WC_HMR_MODULE_RUNTIME } = require('./constants');
const { hmrPlugin } = require('./hmrPlugin.js');
const { litElement } = require('./presets/litElement.js');
const { lit } = require('./presets/lit.js');
const { fastElement } = require('./presets/fastElement.js');
const { haunted } = require('./presets/haunted.js');
const { WC_HMR_MODULE_RUNTIME } = require('./constants.js');

const presets = { litElement, fastElement, haunted, lit };

Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-hmr/test-node/babel/base-class.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable import/no-extraneous-dependencies */
const { expect } = require('chai');
const path = require('path');
const { banner, transform, rootDir } = require('./utils');
const { banner, transform, rootDir } = require('./utils.js');

describe('babelPluginWcHmr - detecting base class', () => {
it('global base class', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint-disable import/no-extraneous-dependencies */
const { expect } = require('chai');
const { banner, transform } = require('./utils');
const { banner, transform } = require('./utils.js');

describe('babelPluginWcHmr - detecting customElements.define', () => {
it('injects registration when detecting a customElements.define', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-hmr/test-node/babel/decorators.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable import/no-extraneous-dependencies */
const { expect } = require('chai');
const path = require('path');
const { banner, transform, rootDir } = require('./utils');
const { banner, transform, rootDir } = require('./utils.js');

describe('babelPluginWcHmr - detecting decorators', () => {
it('compiled decorator with decorator name', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/dev-server-hmr/test-node/babel/functions.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable import/no-extraneous-dependencies */
const { expect } = require('chai');
const path = require('path');
const { banner, transform, rootDir } = require('./utils');
const { banner, transform, rootDir } = require('./utils.js');

describe('babelPluginWcHmr - detecting function components', () => {
it('global function name', () => {
Expand Down

0 comments on commit 61e2668

Please sign in to comment.