Skip to content

Commit 23a05a0

Browse files
committed
reverted builder etc,
1 parent c62b0cf commit 23a05a0

8 files changed

+121
-95
lines changed

angular.json

+9-17
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,20 @@
1111
"schematics": {},
1212
"architect": {
1313
"build": {
14-
"builder": "@angular-devkit/build-angular:browser-esbuild",
14+
"builder": "@angular-builders/custom-webpack:browser",
1515
"options": {
16-
"customWebpackConfig": {
17-
"path": "./extra-webpack.config.js",
18-
"replaceDuplicatePlugins": true
19-
},
2016
"outputPath": "app/poddr",
2117
"index": "src/index.html",
22-
"main": "src/main.ts",
23-
"polyfills": "src/polyfills.ts",
18+
"polyfills": ["src/polyfills.ts"],
2419
"tsConfig": "src/tsconfig.app.json",
2520
"assets": ["src/assets"],
2621
"styles": ["src/styles.css"],
2722
"scripts": [],
28-
"webWorkerTsConfig": "tsconfig.worker.json"
23+
"webWorkerTsConfig": "tsconfig.worker.json",
24+
"main": "src/main.ts",
25+
"customWebpackConfig": {
26+
"path": "./extra-webpack.config.js"
27+
}
2928
},
3029
"configurations": {
3130
"production": {
@@ -42,8 +41,6 @@
4241
"aot": true,
4342
"deleteOutputPath": true,
4443
"extractLicenses": true,
45-
"vendorChunk": false,
46-
"buildOptimizer": true,
4744
"budgets": [
4845
{
4946
"type": "initial",
@@ -63,19 +60,14 @@
6360
"lint": {
6461
"builder": "@angular-eslint/builder:lint",
6562
"options": {
66-
"lintFilePatterns": [
67-
"src/**/*.ts",
68-
"src/**/*.html"
69-
]
63+
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
7064
}
7165
}
7266
}
7367
}
7468
},
7569
"cli": {
76-
"schematicCollections": [
77-
"@angular-eslint/schematics"
78-
],
70+
"schematicCollections": ["@angular-eslint/schematics"],
7971
"analytics": false
8072
},
8173
"schematics": {

extra-webpack.config.js

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
import WorkerPlugin from "worker-plugin";
2-
import NodeTargetPlugin from "webpack/lib/node/NodeTargetPlugin.js";
1+
const WorkerPlugin = require("worker-plugin");
2+
const NodeTargetPlugin = require("webpack/lib/node/NodeTargetPlugin");
33

4-
export default (config, options) => {
4+
module.exports = (config, options) => {
55
config.plugins.forEach((plugin) => {
66
if (plugin instanceof WorkerPlugin) {
77
plugin.options.plugins.push(new NodeTargetPlugin());
88
}
99
});
10+
1011
config.target = "electron-renderer";
1112
return config;
1213
};

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"version": "2.1.0",
55
"description": "Podcast client",
66
"main": "main.js",
7-
"type": "module",
87
"repository": {
98
"type": "git",
109
"url": "git://github.com/Sn8z/Poddr.git"
@@ -82,7 +81,7 @@
8281
"@sn8z/pop-pop.css": "^1.0.2",
8382
"dbus-next": "^0.10.2",
8483
"electron-log": "^5.2.4",
85-
"electron-store": "^10.0.0",
84+
"electron-store": "8.2.0",
8685
"electron-window-state": "^5.0.3",
8786
"mousetrap": "^1.6.3",
8887
"mpris-service": "2.1.2",

src/app/podcast/podcast.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
faMusic,
2323
faExternalLinkAlt
2424
} from '@fortawesome/free-solid-svg-icons';
25-
import * as parsePodcast from 'node-podcast-parser';
25+
import parsePodcast from 'node-podcast-parser';
2626
import * as log from 'electron-log';
2727
import { Subscription } from 'rxjs';
2828

src/app/services/favourites.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { BehaviorSubject } from 'rxjs';
33
import { PodcastService } from './podcast.service';
44
import { ToastService } from './toast.service';
55
import Store from 'electron-store';
6-
import * as parsePodcast from 'node-podcast-parser';
6+
import parsePodcast from "node-podcast-parser";
77
import * as log from 'electron-log';
88

99
@Injectable({

src/app/workers/latest.worker.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/// <reference lib="webworker" />
22

33
import * as log from 'electron-log';
4-
import * as parsePodcast from 'node-podcast-parser';
4+
import parsePodcast from "node-podcast-parser";
55

66
addEventListener('message', ({ data }) => {
77
let updatedValue = [];

tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"declaration": false,
1010
"skipLibCheck": true,
1111
"moduleResolution": "Node",
12-
"module": "ESNext",
12+
"module": "ES2022",
1313
"target": "ES2022",
1414
"emitDecoratorMetadata": true,
1515
"experimentalDecorators": true,

0 commit comments

Comments
 (0)