Skip to content

Commit 39e68a0

Browse files
v-rudkovskiyr-brown
authored andcommitted
update dependencies
1 parent eaa079c commit 39e68a0

17 files changed

+16560
-6618
lines changed

Diff for: .eslintrc.js

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
1-
// https://eslint.org/docs/user-guide/configuring
2-
3-
module.exports = {
4-
root: true,
5-
parserOptions: {
6-
parser: 'babel-eslint',
7-
},
8-
env: {
9-
browser: true,
10-
},
11-
extends: ['airbnb-base'],
12-
// check if imports actually resolve
13-
settings: {
14-
'import/resolver': {
15-
webpack: {
16-
config: 'build/webpack.base.conf.js'
17-
}
18-
}
19-
},
20-
// add your custom rules here
21-
rules: {
22-
// allow optionalDependencies
23-
'import/no-extraneous-dependencies': ['error', {
24-
optionalDependencies: ['test/index.js']
25-
}],
26-
// allow debugger during development
27-
'no-debugger': 'error',
28-
//custom spaces rules
29-
'indent': 'off',
30-
'indent-legacy': ['error', 4, { SwitchCase: 1 }],
31-
'linebreak-style': 0,
32-
'max-len': ['error', 120, { ignoreComments: true }],
33-
'vue/no-template-key': 'off',
34-
'object-curly-newline': ["error", { "consistent": true }],
35-
},
36-
};
1+
// https://eslint.org/docs/user-guide/configuring
2+
3+
module.exports = {
4+
root: true,
5+
parserOptions: {
6+
parser: 'babel-eslint',
7+
},
8+
env: {
9+
browser: true,
10+
},
11+
extends: ['airbnb-base'],
12+
// check if imports actually resolve
13+
settings: {
14+
'import/resolver': {
15+
webpack: {
16+
config: 'build/webpack.base.conf.cjs'
17+
}
18+
}
19+
},
20+
// add your custom rules here
21+
rules: {
22+
// allow optionalDependencies
23+
'import/no-extraneous-dependencies': ['error', {
24+
optionalDependencies: ['test/index.js']
25+
}],
26+
// allow debugger during development
27+
'no-debugger': 'error',
28+
//custom spaces rules
29+
'indent': 'off',
30+
'indent-legacy': ['error', 4, { SwitchCase: 1 }],
31+
'linebreak-style': 0,
32+
'max-len': ['error', 120, { ignoreComments: true }],
33+
'vue/no-template-key': 'off',
34+
'object-curly-newline': ["error", { "consistent": true }],
35+
},
36+
};

Diff for: build/build.js renamed to build/build.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const ora = require('ora');
55
const rm = require('rimraf');
66
const chalk = require('chalk');
77
const webpack = require('webpack');
8-
const webpackConfig = require('./webpack.prod.conf');
8+
const webpackConfig = require('./webpack.prod.conf.cjs');
99

1010
const spinner = ora('building for production... ');
1111
spinner.start();

Diff for: build/webpack.base.conf.js renamed to build/webpack.base.conf.cjs

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
const path = require('path');
22
const eslintFriendlyFormatter = require('eslint-friendly-formatter');
3+
const ESLintPlugin = require('eslint-webpack-plugin');
34
const pkg = require('../package.json');
45

56
const namespace = 'NetLicensing';
@@ -33,15 +34,16 @@ module.exports = {
3334
exclude: /node_modules/,
3435
include: [resolve('src'), resolve('test')],
3536
},
36-
{
37-
test: /(\.jsx|\.js)$/,
38-
loader: 'eslint-loader',
39-
include: [resolve('src'), resolve('test')],
40-
options: {
41-
formatter: eslintFriendlyFormatter,
42-
emitWarning: true,
43-
},
44-
},
37+
// {
38+
// test: /(\.jsx|\.js)$/,
39+
// loader: 'eslint-loader',
40+
// include: [resolve('src'), resolve('test')],
41+
// options: {
42+
// formatter: eslintFriendlyFormatter,
43+
// emitWarning: true,
44+
// },
45+
// },
4546
],
4647
},
48+
plugins: [new ESLintPlugin()],
4749
};
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
const { merge } = require('webpack-merge');
2-
const webWebpackConfig = require('./webpack.web.conf');
2+
const webWebpackConfig = require('./webpack.web.conf.cjs');
33

44
const webpackConfig = merge(webWebpackConfig, {
55
mode: 'development',
66
devtool: 'source-map',
77
});
88

99
module.exports = webpackConfig;
10-

Diff for: build/webpack.node.conf.js renamed to build/webpack.node.conf.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const { merge } = require('webpack-merge');
22
const pkg = require('../package.json');
3-
const baseWebpackConfig = require('./webpack.base.conf');
3+
const baseWebpackConfig = require('./webpack.base.conf.cjs');
44

55
const { name } = pkg;
66

Diff for: build/webpack.prod.conf.js renamed to build/webpack.prod.conf.cjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { merge } = require('webpack-merge');
22
const TerserPlugin = require("terser-webpack-plugin");
3-
const webWebpackConfig = require('./webpack.web.conf');
4-
const nodeWebpackConfig = require('./webpack.node.conf');
3+
const webWebpackConfig = require('./webpack.web.conf.cjs');
4+
const nodeWebpackConfig = require('./webpack.node.conf.cjs');
55

66
const webpackConfig = {
77
mode: 'production',

Diff for: build/webpack.test.conf.js renamed to build/webpack.test.conf.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// This is the webpack config used for unit tests.
22
const { merge } = require('webpack-merge');
3-
const baseWebpackConfig = require('./webpack.base.conf');
3+
const baseWebpackConfig = require('./webpack.base.conf.cjs');
44

55
const webpackConfig = merge(baseWebpackConfig, {
66
mode: 'development',

Diff for: build/webpack.web.conf.js renamed to build/webpack.web.conf.cjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const { merge } = require('webpack-merge');
22
const pkg = require('../package.json');
3-
const baseWebpackConfig = require('./webpack.base.conf');
3+
const baseWebpackConfig = require('./webpack.base.conf.cjs');
44

55
const { name } = pkg;
66

0 commit comments

Comments
 (0)