Compare commits

...
Sign in to create a new pull request.

4 commits

5 changed files with 1528 additions and 3194 deletions

View file

@ -1,21 +1,16 @@
module.exports = api => { module.exports = api => {
const isTest = api.env('test'); const isTest = api.env('test');
const preset = [ const preset = ['@babel/preset-env', { targets: 'defaults' }];
"@babel/preset-env", { targets: 'defaults' } const testPreset = ['@babel/preset-env', { targets: { node: process.versions.node } }];
];
const testPreset = [
"@babel/preset-env", { targets: { node: process.versions.node } }
];
const plugins = [ const plugins = [
"@babel/plugin-syntax-dynamic-import", '@babel/plugin-transform-react-jsx',
"@babel/plugin-transform-react-jsx", '@babel/plugin-proposal-class-properties',
"@babel/plugin-proposal-class-properties" ];
]
return { return {
"presets": [isTest ? testPreset : preset], presets: [isTest ? testPreset : preset],
"plugins": plugins plugins: plugins,
} };
} };

4678
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -37,7 +37,6 @@
"@babel/runtime": "^7.12.13", "@babel/runtime": "^7.12.13",
"babel-jest": "^29.7.0", "babel-jest": "^29.7.0",
"babel-loader": "^8.2.2", "babel-loader": "^8.2.2",
"clean-webpack-plugin": "^3.0.0",
"css-loader": "^7.1.2", "css-loader": "^7.1.2",
"fetch-mock": "^8.3.2", "fetch-mock": "^8.3.2",
"jest": "^29.7.0", "jest": "^29.7.0",

View file

@ -4,7 +4,7 @@ from newsreader.news.collection.models import CollectionRule
class CollectionRuleAdmin(admin.ModelAdmin): class CollectionRuleAdmin(admin.ModelAdmin):
fields = ("url", "name", "timezone", "category", "favicon", "user") fields = ("url", "name", "category", "favicon", "user")
list_display = ("name", "type_display", "category", "url", "last_run", "succeeded") list_display = ("name", "type_display", "category", "url", "last_run", "succeeded")
list_filter = ("user",) list_filter = ("user",)

View file

@ -1,7 +1,8 @@
import { resolve } from 'path'; import { resolve } from 'path';
import { CleanWebpackPlugin } from 'clean-webpack-plugin';
import MiniCssExtractPlugin from 'mini-css-extract-plugin'; import MiniCssExtractPlugin from 'mini-css-extract-plugin';
const exlcudeCleanFiles = ['favicon.png'];
export default { export default {
resolve: { extensions: ['.js', '.scss'] }, resolve: { extensions: ['.js', '.scss'] },
entry: { entry: {
@ -10,6 +11,11 @@ export default {
output: { output: {
path: resolve(__dirname, 'src', 'newsreader', 'static'), path: resolve(__dirname, 'src', 'newsreader', 'static'),
filename: 'js/[name].bundle.js', filename: 'js/[name].bundle.js',
clean: {
keep: filename => {
return exlcudeCleanFiles.find(excludedFile => filename.endsWith(excludedFile));
},
},
}, },
module: { module: {
rules: [ rules: [
@ -42,11 +48,5 @@ export default {
}, },
], ],
}, },
plugins: [ plugins: [new MiniCssExtractPlugin({ filename: 'css/main.css' })],
new MiniCssExtractPlugin({ filename: 'css/main.css' }),
new CleanWebpackPlugin({
cleanOnceBeforeBuildPatterns: ['js', 'css', 'fonts'],
cleanAfterEveryBuildPatterns: ['!fonts/**'],
}),
],
}; };