Merge pull request #1388 from mchangrh/revert-module-fix-ci

Revert module & fix ci

8 files changed, 19 insertions, 21 deletions

diff --git a/ci/invidiousCI.ts b/ci/invidiousCI.ts
index cb2cd11e..5c618e74 100644
--- a/ci/invidiousCI.ts
+++ b/ci/invidiousCI.ts
@@ -49,7 +49,7 @@ const reliableCheck = mapped
   .filter(instance => instance.url.includes(instance.name))
 
 // finally map to array
-const result: string[] = reliableCheck.map(instance => instance.name)
+const result: string[] = reliableCheck.map(instance => instance.name).sort()
 writeFile(join(__dirname, "./invidiouslist.json"), JSON.stringify(result), (err) => {
   if (err) return console.log(err);
 })
\ No newline at end of file
diff --git a/ci/invidiouslist.json b/ci/invidiouslist.json
index 5e936620..69b6a845 100644
--- a/ci/invidiouslist.json
+++ b/ci/invidiouslist.json
@@ -1 +1 @@
-["yewtu.be","vid.puffyan.us","invidious.snopyta.org","inv.riverside.rocks","invidious-us.kavin.rocks","invidious.osi.kr","tube.cthd.icu","invidious.flokinet.to","yt.artemislena.eu","invidious.mutahar.rocks","invidious.esmailelbob.xyz","youtube.076.ne.jp","invidious.weblibre.org","invidious.namazso.eu","invidious.kavin.rocks"]
\ No newline at end of file
+["inv.cthd.icu","inv.riverside.rocks","invidio.xamh.de","invidious.kavin.rocks","invidious.namazso.eu","invidious.osi.kr","invidious.snopyta.org","vid.puffyan.us","yewtu.be","youtube.076.ne.jp","yt.artemislena.eu"]
\ No newline at end of file
diff --git a/jest.config.cjs b/jest.config.js
index 6711fa80..6711fa80 100644
--- a/jest.config.cjs
+++ b/jest.config.js
diff --git a/package.json b/package.json
index a17a67e9..870ef10f 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,6 @@
   "version": "1.0.0",
   "description": "",
   "main": "background.js",
-  "type": "module",
   "dependencies": {
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index 076f90af..78015cbf 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -1,15 +1,12 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import webpack from "webpack"
-import path from "path"
-import { fileURLToPath } from "url"
-import CopyPlugin from "copy-webpack-plugin"
-import BuildManifest from "./webpack.manifest.cjs";
-const srcDir = "../src/";
-import fs from "fs";
-import ForkTsCheckerWebpackPlugin from "fork-ts-checker-webpack-plugin";
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
+const webpack = require("webpack");
+const path = require('path');
+const CopyPlugin = require('copy-webpack-plugin');
+const BuildManifest = require('./webpack.manifest');
+const srcDir = '../src/';
+const fs = require("fs");
+const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
 
 const edgeLanguages = [
     "de",
@@ -27,7 +24,7 @@ const edgeLanguages = [
     "zh_CN"
 ]
 
-export default env => ({
+module.exports = env => ({
     entry: {
         popup: path.join(__dirname, srcDir + 'popup.ts'),
         background: path.join(__dirname, srcDir + 'background.ts'),
diff --git a/webpack/webpack.dev.js b/webpack/webpack.dev.js
index 9e2eefe5..c1b9472c 100644
--- a/webpack/webpack.dev.js
+++ b/webpack/webpack.dev.js
@@ -1,7 +1,8 @@
-import { merge } from "webpack-merge";
-import common from './webpack.common.js';
+/* eslint-disable @typescript-eslint/no-var-requires */
+const merge = require('webpack-merge');
+const common = require('./webpack.common.js');
 
-export default env => merge(common(env), {
+module.exports = env => merge(common(env), {
     devtool: 'inline-source-map',
     mode: 'development'
 });
\ No newline at end of file
diff --git a/webpack/webpack.manifest.cjs b/webpack/webpack.manifest.js
index 3e30ffc6..3e30ffc6 100644
--- a/webpack/webpack.manifest.cjs
+++ b/webpack/webpack.manifest.js
diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js
index 08edbb78..03e1708e 100644
--- a/webpack/webpack.prod.js
+++ b/webpack/webpack.prod.js
@@ -1,7 +1,8 @@
-import { merge } from "webpack-merge";
-import common from './webpack.common.js';
+/* eslint-disable @typescript-eslint/no-var-requires */
+const { merge } = require('webpack-merge');
+const common = require('./webpack.common.js');
 
-export default env => {
+module.exports = env => {
     let mode = "production";
     env.mode = mode;