Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default defineConfig([
}
},
{
files: ["**/*.js", "js/app.mjs", "js/ip_access_control.mjs", "js/releasenotes.mjs", "js/server.mjs", "js/vendor.mjs"],
files: ["**/*.js", "js/app.mjs", "js/deprecated.mjs", "js/electron_helper.mjs", "js/ip_access_control.mjs", "js/releasenotes.mjs", "js/server.mjs", "js/vendor.mjs", "tests/**/*.mjs"],
languageOptions: {
ecmaVersion: "latest",
globals: {
Expand Down Expand Up @@ -104,11 +104,12 @@ export default defineConfig([
}
},
{
files: ["**/*.js", "js/app.mjs", "js/ip_access_control.mjs", "js/releasenotes.mjs", "js/server.mjs", "js/vendor.mjs"],
files: ["**/*.js", "js/app.mjs", "js/deprecated.mjs", "js/electron_helper.mjs", "js/ip_access_control.mjs", "js/releasenotes.mjs", "js/server.mjs", "js/vendor.mjs", "tests/**/*.mjs"],
ignores: [
"clientonly/index.js",
"js/logger.js",
"tests/**/*.js"
"tests/**/*.js",
"tests/**/*.mjs"
],
rules: {"no-console": "error"}
},
Expand All @@ -118,7 +119,7 @@ export default defineConfig([
},
{
files: ["**/*.mjs"],
ignores: ["js/app.mjs", "js/ip_access_control.mjs", "js/releasenotes.mjs", "js/server.mjs", "js/vendor.mjs"],
ignores: ["js/app.mjs", "js/deprecated.mjs", "js/electron_helper.mjs", "js/ip_access_control.mjs", "js/releasenotes.mjs", "js/server.mjs", "js/vendor.mjs", "tests/**/*.mjs"],
languageOptions: {
ecmaVersion: "latest",
globals: {
Expand All @@ -142,7 +143,7 @@ export default defineConfig([
}
},
{
files: ["tests/**/*.js"],
files: ["tests/**/*.{js,mjs}"],
languageOptions: {
globals: {
...vitest.environments.env.globals
Expand Down
4 changes: 0 additions & 4 deletions js/deprecated.js

This file was deleted.

4 changes: 4 additions & 0 deletions js/deprecated.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
const configs = [];
const clock = ["secondsColor"];

export { configs, clock };
2 changes: 1 addition & 1 deletion js/electron.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ require("./alias-resolver");

const electron = require("electron");
const Log = require("./logger");
const { applyElectronSwitches } = require("./electron_helper");
const { applyElectronSwitches } = require("./electron_helper.mjs");
const { getServerPort } = require("#server_functions");

const corePromise = import("./app.mjs").then(({ default: core }) => core);
Expand Down
4 changes: 2 additions & 2 deletions js/electron_helper.js → js/electron_helper.mjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Log = require("./logger");
import Log from "./logger.js";

/**
* Applies Electron command-line switches from config.
Expand Down Expand Up @@ -27,4 +27,4 @@ const applyElectronSwitches = (commandLine, electronSwitches) => {
}
};

module.exports = { applyElectronSwitches };
export { applyElectronSwitches };
4 changes: 2 additions & 2 deletions js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,11 @@ const getModulePositions = () => {

/**
* Checks the config for deprecated options and throws a warning in the logs
* if it encounters one option from the deprecated.js list
* if it encounters one option from the deprecated.mjs list
* @param {object} userConfig The user config
*/
const checkDeprecatedOptions = (userConfig) => {
const deprecated = require(`${global.root_path}/js/deprecated`);
const deprecated = require(`${global.root_path}/js/deprecated.mjs`);

// check for deprecated core options
const deprecatedOptions = deprecated.configs;
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/helpers/global-setup.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {createRequire} from "node:module";
import { createRequire } from "node:module";

// Load natively: when Vitest evaluates global-setup.js itself, app.mjs would run inside Vite's module loader.
const helpers = createRequire(import.meta.url)("./global-setup.js");

export const {getPage, startApplication, stopApplication, getDocument, fixupIndex, restoreIndex} = helpers;
export const { getPage, startApplication, stopApplication, getDocument, fixupIndex, restoreIndex } = helpers;
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const deprecated = require("../../../js/deprecated");
import * as deprecated from "../../../js/deprecated.mjs";

describe("Deprecated", () => {
it("should be an object", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const Log = require("logger");
const { applyElectronSwitches } = require("../../../js/electron_helper");
import Log from "../../../js/logger.js";
import { applyElectronSwitches } from "../../../js/electron_helper.mjs";

describe("electron switches", () => {
let commandLine;
Expand Down
2 changes: 1 addition & 1 deletion vitest.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ export default defineConfig({
environment: "node",
setupFiles: ["./tests/utils/vitest-setup.js"],
include: [
"tests/unit/**/*_spec.js",
"tests/unit/**/*_spec.{js,mjs}",
"tests/unit/defaultmodules/calendar/calendar_fetcher_utils_bad_rrule.js"
],
testTimeout: 20000,
Expand Down
Loading