Skip to content

Commit

Permalink
Format with prettier (via npm run format)
Browse files Browse the repository at this point in the history
  • Loading branch information
seancolsen committed Jan 14, 2022
1 parent ea98b40 commit a67e8f7
Show file tree
Hide file tree
Showing 215 changed files with 3,353 additions and 2,409 deletions.
19 changes: 4 additions & 15 deletions mathesar_ui/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ module.exports = {
project: ['./tsconfig.json'],
extraFileExtensions: ['.svelte', '.cjs'],
},
plugins: [
'svelte3',
'jest',
'@typescript-eslint',
],
plugins: ['svelte3', 'jest', '@typescript-eslint'],
extends: [
'airbnb-typescript/base',
'plugin:eslint-comments/recommended',
Expand All @@ -24,16 +20,11 @@ module.exports = {
],
rules: {
'import/no-extraneous-dependencies': ['error', { devDependencies: true }],
'no-console': [
'warn',
{ allow: ['error'] },
],
'no-console': ['warn', { allow: ['error'] }],
},
overrides: [
{
files: [
'*.svelte',
],
files: ['*.svelte'],
processor: 'svelte3/svelte3',
rules: {
'import/first': 'off',
Expand Down Expand Up @@ -64,9 +55,7 @@ module.exports = {
},
},
{
files: [
'*.cjs', '*.config.js',
],
files: ['*.cjs', '*.config.js'],
rules: {
'@typescript-eslint/no-var-requires': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
Expand Down
44 changes: 22 additions & 22 deletions mathesar_ui/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const sveltePreprocess = require('svelte-preprocess');
const data = require('../tsconfig.json');
const path = require("path");
const path = require('path');

function getAlias() {
const { paths } = data.compilerOptions;
Expand All @@ -16,41 +16,41 @@ function getAlias() {
}

module.exports = {
"core": { builder: "webpack5" },
"webpackFinal": (config) => {
core: { builder: 'webpack5' },
webpackFinal: (config) => {
config.resolve.alias = {
...config.resolve.alias,
...getAlias(),
svelte: path.resolve('node_modules', 'svelte')
}
config.resolve.extensions.push(".ts", ".tsx", ".mjs", ".js", ".svelte");
svelte: path.resolve('node_modules', 'svelte'),
};
config.resolve.extensions.push('.ts', '.tsx', '.mjs', '.js', '.svelte');
config.module.rules.push({
test: /\.scss$/,
use: ['style-loader', 'css-loader', 'sass-loader'],
include: path.resolve(__dirname, '../'),
resolve: {
alias: {
"@": path.resolve(__dirname, "../src/"),
'@': path.resolve(__dirname, '../src/'),
},
},
});
return config;
},
"stories": [
"../src/**/*.stories.mdx",
"../src/**/*.stories.@(js|jsx|ts|tsx|svelte)"
stories: [
'../src/**/*.stories.mdx',
'../src/**/*.stories.@(js|jsx|ts|tsx|svelte)',
],
"addons": [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-svelte-csf",
"@storybook/addon-docs"
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-svelte-csf',
'@storybook/addon-docs',
],
"svelteOptions": {
"preprocess": sveltePreprocess({
svelteOptions: {
preprocess: sveltePreprocess({
scss: {
renderSync: true
}
})
}
}
renderSync: true,
},
}),
},
};
8 changes: 4 additions & 4 deletions mathesar_ui/.storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import "../src/component-library/styles.scss";
import '../src/component-library/styles.scss';

export const parameters = {
actions: { argTypesRegex: "^on[A-Z].*" },
actions: { argTypesRegex: '^on[A-Z].*' },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
},
},
viewMode: 'docs'
}
viewMode: 'docs',
};
Loading

0 comments on commit a67e8f7

Please sign in to comment.