diff --git a/.eslintrc.js b/.eslintrc.js
index 3e78ec5..76d441a 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,8 +1,12 @@
const resolve = require('./resolve.config');
-const browserRollupConfig = require('./config/jest-puppeteer.rollup.config.js');
module.exports = {
- extends: ['plugin:jest-playwright/recommended', 'plugin:@typescript-eslint/recommended', 'plugin:react/recommended', 'airbnb', 'prettier'],
+ extends: [
+ 'plugin:@typescript-eslint/recommended',
+ 'plugin:react/recommended',
+ 'airbnb',
+ 'prettier',
+ ],
env: {
browser: true,
es2020: true,
@@ -43,6 +47,13 @@ module.exports = {
'consistent-return': 'off',
'import/prefer-default-export': 'off',
'import/no-extraneous-dependencies': 'off',
+ 'import/no-unresolved': [
+ 'error',
+ {
+ ignore: [`^@/.*`],
+ },
+ ],
+ '@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/no-explicit-any': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
@@ -54,12 +65,6 @@ module.exports = {
allowedNames: ['self', '_self'], // Allow `const self = this`; `[]` by default
},
],
- 'import/no-unresolved': [
- 'error',
- {
- ignore: [`^@/.*`],
- },
- ],
'import/extensions': [
'error',
'ignorePackages',
@@ -73,8 +78,10 @@ module.exports = {
},
overrides: [
{
- files: ['*.test.*', `*${browserRollupConfig.js.input}.*`],
+ files: ['*.test.*', '**/tests/**'],
rules: {
+ 'no-shadow': 'off',
+ 'no-use-before-define': 'off',
'no-restricted-syntax': 'off',
'@typescript-eslint/ban-ts-comment': 'off',
'@typescript-eslint/no-empty-function': 'off',
@@ -87,16 +94,10 @@ module.exports = {
'no-void': 'off',
'no-empty-function': 'off',
'no-new-func': 'off',
- 'import/no-unresolved': [
- 'error',
- {
- ignore: [`\\./${browserRollupConfig.build}/${browserRollupConfig.html.output}$`, `^@/.*`],
- },
- ],
},
},
{
- files: ['rollup.config.*'],
+ files: ['*rollup*'],
rules: {
'no-console': 'off',
'global-require': 'off',
diff --git a/.prettierrc b/.prettierrc
index a324b31..9b0f0c6 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,5 +1,5 @@
{
- "printWidth": 150,
+ "printWidth": 100,
"tabWidth": 2,
"singleQuote": true,
"trailingComma": "es5",
diff --git a/babel.config.base.js b/babel.config.base.js
index 7247b49..b077b0d 100644
--- a/babel.config.base.js
+++ b/babel.config.base.js
@@ -1,21 +1,13 @@
module.exports = function (api) {
api.cache.using(() => process.env.NODE_ENV);
- const isRollup = api.caller((caller) => !!(caller && caller.name === 'babel-rollup-build'));
const isJest = api.caller((caller) => !!(caller && caller.name === 'babel-jest'));
- if (isRollup) {
- return {
- plugins: [
- '@babel/plugin-transform-runtime',
- '@babel/plugin-proposal-class-properties',
- ['@babel/plugin-proposal-private-methods', { loose: false }],
- ],
- };
- }
-
if (isJest) {
return {
- plugins: ['@babel/plugin-transform-modules-commonjs', ['@babel/plugin-proposal-private-methods', { loose: false }]],
+ plugins: [
+ '@babel/plugin-transform-modules-commonjs',
+ ['@babel/plugin-proposal-private-methods', { loose: false }],
+ ],
presets: [
[
'@babel/preset-env',
diff --git a/config/jest-browser.env.js b/config/jest-browser.env.js
deleted file mode 100644
index da645ee..0000000
--- a/config/jest-browser.env.js
+++ /dev/null
@@ -1,32 +0,0 @@
-const PlaywrightEnvironment = require('jest-playwright-preset/lib/PlaywrightEnvironment').default;
-const { setupRollupTest, cleanupRollupTest } = require('./jest-browser.rollup.js');
-
-const buildTests = [];
-
-class BrowserRollupEnvironment extends PlaywrightEnvironment {
- constructor(envConfig, envContext) {
- super(envConfig, envContext);
-
- this.watch = (envConfig.displayName.name || '').includes('-dev');
- this.ctx = envContext;
- this.cfg = envConfig;
- }
-
- async setup() {
- const { testPath } = this.ctx;
-
- if (!buildTests.includes(testPath)) {
- await cleanupRollupTest(testPath, this.cfg.cache);
- await setupRollupTest(this.cfg.rootDir, this.ctx.testPath, this.cfg.cache && this.cfg.cacheDirectory, this.watch);
- buildTests.push(testPath);
- }
-
- await super.setup();
- }
-
- async teardown() {
- await super.teardown();
- }
-}
-
-module.exports = BrowserRollupEnvironment;
diff --git a/config/jest-browser.globalSetup.js b/config/jest-browser.globalSetup.js
deleted file mode 100644
index af775c0..0000000
--- a/config/jest-browser.globalSetup.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const { globalSetup } = require('jest-playwright-preset');
-
-module.exports = async (jestConfig) => {
- await globalSetup(jestConfig);
-};
diff --git a/config/jest-browser.globalTeardown.js b/config/jest-browser.globalTeardown.js
deleted file mode 100644
index f88db2c..0000000
--- a/config/jest-browser.globalTeardown.js
+++ /dev/null
@@ -1,36 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const { execSync } = require('child_process');
-const del = require('del');
-const { globalTeardown } = require('jest-playwright-preset');
-
-const coverageTempDir = './.nyc_output';
-const coverageTempDirFile = 'coverage.json';
-const reportDir = './.coverage/browser';
-
-module.exports = async (jestConfig) => {
- await globalTeardown(jestConfig);
-
- const { rootDir } = jestConfig;
- const coverageTempDirPath = path.resolve(rootDir, coverageTempDir);
- const coverageTempFilePath = path.resolve(coverageTempDirPath, coverageTempDirFile);
- const reportDirPath = path.resolve(rootDir, reportDir);
-
- if (fs.existsSync(coverageTempFilePath)) {
- const coverageReportText = ' COVERAGE ';
-
- console.log('');
- console.log(`\x1b[1m\x1b[44m${coverageReportText}\x1b[0m`);
- console.log(`Reporting from: "${path.relative(rootDir, coverageTempFilePath)}" in "${path.relative(rootDir, reportDirPath)}"`);
-
- del.sync(reportDirPath);
- execSync(`npx nyc report --reporter=lcov --report-dir=${reportDir}`, {
- cwd: rootDir,
- });
-
- const [deletedTempDir] = del.sync(coverageTempDirPath);
- if (deletedTempDir) {
- console.log('Deleted:', path.relative(rootDir, deletedTempDir));
- }
- }
-};
diff --git a/config/jest-browser.rollup.config.js b/config/jest-browser.rollup.config.js
deleted file mode 100644
index 177cf2b..0000000
--- a/config/jest-browser.rollup.config.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const path = require('path');
-
-module.exports = {
- port: 8080,
- root: path.join(__dirname, '../'),
- build: '.build',
- html: {
- input: 'index.html',
- output: 'build.html',
- },
- js: {
- input: 'index.browser',
- output: 'build',
- },
- dev: {
- servePort: 18080,
- livereloadPort: 28080,
- },
-};
diff --git a/config/jest-browser.rollup.js b/config/jest-browser.rollup.js
deleted file mode 100644
index 75b8e04..0000000
--- a/config/jest-browser.rollup.js
+++ /dev/null
@@ -1,337 +0,0 @@
-const fs = require('fs');
-const crypto = require('crypto');
-const path = require('path');
-const del = require('del');
-const chalk = require('chalk');
-const readline = require('readline');
-const rollup = require('rollup');
-const rollupPluginHtml = require('@rollup/plugin-html');
-const rollupPluginStyles = require('rollup-plugin-styles');
-const rollupPluginServe = require('rollup-plugin-serve');
-const rollupPluginLivereload = require('rollup-plugin-livereload');
-const deploymentConfig = require('./jest-browser.rollup.config.js');
-
-const rollupConfigName = 'rollup.config.js';
-const cacheFilePrefix = 'jest-browser-overlayscrollbars-cache-';
-const cacheEncoding = 'utf8';
-const cacheHash = 'md5';
-
-const rollupAdditionalWatchFiles = (files) => ({
- buildStart() {
- if (files) {
- files.forEach((file) => {
- if (fs.existsSync(file)) {
- this.addWatchFile(file);
- }
- });
- }
- },
-});
-
-const makeHtmlAttributes = (attributes) => {
- if (!attributes) {
- return '';
- }
-
- const keys = Object.keys(attributes);
- // eslint-disable-next-line no-param-reassign
- // eslint-disable-next-line no-return-assign
- return keys.reduce((result, key) => (result += ` ${key}="${attributes[key]}"`), '');
-};
-
-const genHtmlTemplateFunc = (contentOrContentFn) => ({ attributes, files, meta, publicPath, title }) => {
- const scripts = (files.js || [])
- .map(({ fileName }) => ``)
- .join('\n');
-
- const links = (files.css || [])
- .map(({ fileName }) => ``)
- .join('\n');
-
- const metas = meta.map((input) => ``).join('\n');
-
- return `
-
-
- ${metas}
- ${title}
-
- ${links}
-
-
- ${(typeof contentOrContentFn === 'function' ? contentOrContentFn() : contentOrContentFn) || ''}
- ${scripts}
-
-
-