Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor imports to have file extensions to comply with ESM standards #485

Closed
wants to merge 1 commit into from
Closed
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
2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-vue": "^9.20.1",
"esm": "^3.2.25",
"extensionless": "^1.9.6",
"husky": "^8.0.3",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
Expand Down
2 changes: 1 addition & 1 deletion src/nginxconfig/build/webpack-dynamic-import.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import { info } from '../util/log';
import { info } from '../util/log.js';

const originalSrcDir = document.currentScript.src.split('/').slice(0, -2).join('/') + '/';
window.__webpackDynamicImportURL = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/nginxconfig/generators/conf/general.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import { gzipTypes, extensions } from '../../util/types_extensions';
import { gzipTypes, extensions } from '../../util/types_extensions.js';

export default (domains, global) => {
const config = {};
Expand Down
6 changes: 3 additions & 3 deletions src/nginxconfig/generators/conf/nginx.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import { errorLogPathDisabled } from '../../util/logging';
import sslProfiles from '../../util/ssl_profiles';
import websiteConf from './website.conf';
import { errorLogPathDisabled } from '../../util/logging.js';
import sslProfiles from '../../util/ssl_profiles.js';
import websiteConf from './website.conf.js';

export default (domains, global) => {
const config = {};
Expand Down
2 changes: 1 addition & 1 deletion src/nginxconfig/generators/conf/security.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import commonHsts from '../../util/common_hsts';
import commonHsts from '../../util/common_hsts.js';

export default (domains, global) => {
const config = [];
Expand Down
32 changes: 16 additions & 16 deletions src/nginxconfig/generators/conf/website.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,22 +24,22 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import { getSslCertificate, getSslCertificateKey } from '../../util/get_ssl_certificate';
import { extensions, gzipTypes } from '../../util/types_extensions';
import { getDomainAccessLog, getDomainErrorLog } from '../../util/logging';
import commonHsts from '../../util/common_hsts';
import securityConf from './security.conf';
import pythonConf from './python_uwsgi.conf';
import proxyConf from './proxy.conf';
import phpConf from './php_fastcgi.conf';
import generalConf from './general.conf';
import wordPressConf from './wordpress.conf';
import drupalConf from './drupal.conf';
import magentoConf from './magento.conf';
import joomlaConf from './joomla.conf';
import letsEncryptConf from './letsencrypt.conf';
import phpPath from '../../util/php_path';
import phpUpstream from '../../util/php_upstream';
import { getSslCertificate, getSslCertificateKey } from '../../util/get_ssl_certificate.js';
import { extensions, gzipTypes } from '../../util/types_extensions.js';
import { getDomainAccessLog, getDomainErrorLog } from '../../util/logging.js';
import commonHsts from '../../util/common_hsts.js';
import securityConf from './security.conf.js';
import pythonConf from './python_uwsgi.conf.js';
import proxyConf from './proxy.conf.js';
import phpConf from './php_fastcgi.conf.js';
import generalConf from './general.conf.js';
import wordPressConf from './wordpress.conf.js';
import drupalConf from './drupal.conf.js';
import magentoConf from './magento.conf.js';
import joomlaConf from './joomla.conf.js';
import letsEncryptConf from './letsencrypt.conf.js';
import phpPath from '../../util/php_path.js';
import phpUpstream from '../../util/php_upstream.js';

const sslConfig = (domain, global) => {
const config = [];
Expand Down
4 changes: 2 additions & 2 deletions src/nginxconfig/generators/conf/wordpress.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import phpPath from '../../util/php_path';
import phpUpstream from '../../util/php_upstream';
import phpPath from '../../util/php_path.js';
import phpUpstream from '../../util/php_upstream.js';

export default (global, domain) => {
const config = {};
Expand Down
34 changes: 17 additions & 17 deletions src/nginxconfig/generators/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import toConf from './to_conf';
import toYaml from './to_yaml';
import nginxConf from './conf/nginx.conf';
import websiteConf from './conf/website.conf';
import letsEncryptConf from './conf/letsencrypt.conf';
import securityConf from './conf/security.conf';
import generalConf from './conf/general.conf';
import phpConf from './conf/php_fastcgi.conf';
import pythonConf from './conf/python_uwsgi.conf';
import proxyConf from './conf/proxy.conf';
import wordPressConf from './conf/wordpress.conf';
import drupalConf from './conf/drupal.conf';
import magentoConf from './conf/magento.conf';
import joomlaConf from './conf/joomla.conf';
import dockerComposeYaml from './yaml/dockerCompose.yaml';
import dockerConf from './ext/docker';
import shareQuery from '../util/share_query';
import toConf from './to_conf.js';
import toYaml from './to_yaml.js';
import nginxConf from './conf/nginx.conf.js';
import websiteConf from './conf/website.conf.js';
import letsEncryptConf from './conf/letsencrypt.conf.js';
import securityConf from './conf/security.conf.js';
import generalConf from './conf/general.conf.js';
import phpConf from './conf/php_fastcgi.conf.js';
import pythonConf from './conf/python_uwsgi.conf.js';
import proxyConf from './conf/proxy.conf.js';
import wordPressConf from './conf/wordpress.conf.js';
import drupalConf from './conf/drupal.conf.js';
import magentoConf from './conf/magento.conf.js';
import joomlaConf from './conf/joomla.conf.js';
import dockerComposeYaml from './yaml/dockerCompose.yaml.js';
import dockerConf from './ext/docker.js';
import shareQuery from '../util/share_query.js';

export default (domains, global) => {
const files = {};
Expand Down
2 changes: 1 addition & 1 deletion src/nginxconfig/generators/to_conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import isObject from '../util/is_object';
import isObject from '../util/is_object.js';

const isBlock = (item) => {
// If an object, or kv entries, this is considered a block
Expand Down
4 changes: 2 additions & 2 deletions src/nginxconfig/i18n/de/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from './common';
import languages from './languages';
import common from './common.js';
import languages from './languages.js';
import templates from './templates';

export default { common, languages, templates };
2 changes: 1 addition & 1 deletion src/nginxconfig/i18n/de/templates/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../common';
import common from '../common.js';

export default {
title: `${common.nginx}Config`,
Expand Down
4 changes: 2 additions & 2 deletions src/nginxconfig/i18n/de/templates/callouts/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import droplet from './droplet';
import contribute from './contribute';
import droplet from './droplet.js';
import contribute from './contribute.js';

export default { droplet, contribute };
2 changes: 1 addition & 1 deletion src/nginxconfig/i18n/de/templates/domain_sections/https.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
enableEncryptedSslConnection: `${common.enable} verschlüsselte ${common.ssl} Verbindungen`,
Expand Down
20 changes: 10 additions & 10 deletions src/nginxconfig/i18n/de/templates/domain_sections/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import https from './https';
import logging from './logging';
import onion from './onion';
import php from './php';
import presets from './presets';
import python from './python';
import restrict from './restrict';
import reverseProxy from './reverse_proxy';
import routing from './routing';
import server from './server';
import https from './https.js';
import logging from './logging.js';
import onion from './onion.js';
import php from './php.js';
import presets from './presets.js';
import python from './python.js';
import restrict from './restrict.js';
import reverseProxy from './reverse_proxy.js';
import routing from './routing.js';
import server from './server.js';

export default {
https,
Expand Down
2 changes: 1 addition & 1 deletion src/nginxconfig/i18n/de/templates/domain_sections/php.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
phpIsDisabled: `${common.php} ist deaktiviert.`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
pythonIsDisabled: `${common.python} ist deaktiviert.`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
reverseProxyIsDisabled: `${common.reverseProxy} ist deaktiviert.`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
fallbackRouting: 'Fallback Routing',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

const docker = 'Docker';
const dockerfile = 'Dockerfile';
Expand Down
2 changes: 1 addition & 1 deletion src/nginxconfig/i18n/de/templates/global_sections/https.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

const mozilla = 'Mozilla';
const ipv4 = 'IPv4';
Expand Down
18 changes: 9 additions & 9 deletions src/nginxconfig/i18n/de/templates/global_sections/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import https from './https';
import logging from './logging';
import nginx from './nginx';
import performance from './performance';
import python from './python';
import reverseProxy from './reverse_proxy';
import security from './security';
import tools from './tools';
import docker from './docker';
import https from './https.js';
import logging from './logging.js';
import nginx from './nginx.js';
import performance from './performance.js';
import python from './python.js';
import reverseProxy from './reverse_proxy.js';
import security from './security.js';
import tools from './tools.js';
import docker from './docker.js';

export default {
https,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
enableFileNotFoundErrorLogging: `${common.enable} "Seite nicht gefunden" Error Logging in`,
Expand Down
2 changes: 1 addition & 1 deletion src/nginxconfig/i18n/de/templates/global_sections/nginx.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
nginxConfigDirectory: `${common.nginx} Konfigurationsverzeichnis`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
disableHtmlCaching: 'Disable HTML caching', // TODO: translate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
pythonServer: `${common.python} Server`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

const legacyXForwarded = 'Legacy X-Forwarded-* Header';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
whenUsingWordPressUnsafeEvalIsOftenRequiredToAllowFunctionality: `Bei der Verwendung von ${common.wordPress} ist es oft nötig, <code class="slim">script-src 'self' 'unsafe-inline' 'unsafe-eval';</code> in die Content Security Policy aufzunehmen, damit der Admin-Bereich korrekt funktioniert.`,
Expand Down
2 changes: 1 addition & 1 deletion src/nginxconfig/i18n/de/templates/global_sections/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
modularizedStructure: 'Modularisierte Struktur',
Expand Down
6 changes: 3 additions & 3 deletions src/nginxconfig/i18n/de/templates/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import app from './app';
import setup from './setup';
import footer from './footer';
import app from './app.js';
import setup from './setup.js';
import footer from './footer.js';
import domainSections from './domain_sections';
import globalSections from './global_sections';
import setupSections from './setup_sections';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

const certbot = 'Certbot';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
downloadTheGeneratedConfig: 'Generierte Konfigurationsdateien <b>herunterladen</b>:',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import common from '../../common';
import common from '../../common.js';

export default {
letsGoLive: 'Jetzt gehts los!',
Expand Down
Loading
Loading