When importing from lib don't use file extension

evanw/esbuild#3001 Unfortunally scss imports with non relative paths still don't work with esbuild-wasm if these are inside jsx files. Use relative paths for importing scss from JS. Same for .sh and .py files processed by the raw loader. Replacement done with: for file in $(ls pkg/lib); do echo 'Processing' $file; base=$(basename $file) find pkg/ -type f -exec sed -i "s/$base/${base%.*}/g" {} +; done And fixed up the rest manually.
KKoukiou · Mar 24, 2023 · fdace82 · fdace82
1 parent f91aff3
commit fdace82
Show file tree

Hide file tree

Showing 119 changed files with 230 additions and 230 deletions.
diff --git a/pkg/apps/application-list.jsx b/pkg/apps/application-list.jsx
@@ -28,10 +28,10 @@ import { Page, PageSection, PageSectionVariants } from "@patternfly/react-core/d
 import { RebootingIcon } from "@patternfly/react-icons";
 
 import * as PackageKit from "./packagekit.js";
-import { read_os_release } from "os-release.js";
+import { read_os_release } from "os-release";
 import { icon_url, show_error, launch, ProgressBar, CancelButton } from "./utils.jsx";
 import { ActionButton } from "./application.jsx";
-import { EmptyStatePanel } from "cockpit-components-empty-state.jsx";
+import { EmptyStatePanel } from "cockpit-components-empty-state";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/apps/apps.jsx b/pkg/apps/apps.jsx
@@ -26,7 +26,7 @@ import cockpit from "cockpit";
 import React, { useState } from "react";
 import { createRoot } from 'react-dom/client';
 
-import { EmptyStatePanel } from "cockpit-components-empty-state.jsx";
+import { EmptyStatePanel } from "cockpit-components-empty-state";
 import { ApplicationList } from "./application-list.jsx";
 import { Application } from "./application.jsx";
 import { get_metainfo_db } from "./appstream.js";

diff --git a/pkg/apps/appstream.js b/pkg/apps/appstream.js
@@ -18,8 +18,8 @@
  */
 
 import cockpit from "cockpit";
-import * as python from "python.js";
-import inotify_py from "inotify.py";
+import * as python from "python";
+import inotify_py from "../lib/inotify.py";
 import watch_appstream_py from "./watch-appstream.py";
 
 let metainfo_db = null;

diff --git a/pkg/apps/packagekit.js b/pkg/apps/packagekit.js
@@ -18,7 +18,7 @@
  */
 
 import cockpit from "cockpit";
-import * as PK from "packagekit.js";
+import * as PK from "packagekit";
 
 class ProgressReporter {
     constructor(base, range, callback) {

diff --git a/pkg/apps/utils.jsx b/pkg/apps/utils.jsx
@@ -23,7 +23,7 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.
 import { Progress } from "@patternfly/react-core/dist/esm/components/Progress/index.js";
 import { Split, SplitItem } from "@patternfly/react-core/dist/esm/layouts/Split/index.js";
 import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/index.js";
-import { show_modal_dialog } from "cockpit-components-dialog.jsx";
+import { show_modal_dialog } from "cockpit-components-dialog";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/kdump/kdump-view.jsx b/pkg/kdump/kdump-view.jsx
@@ -40,9 +40,9 @@ import { Title } from "@patternfly/react-core/dist/esm/components/Title/index.js
 import { Tooltip, TooltipPosition } from "@patternfly/react-core/dist/esm/components/Tooltip/index.js";
 import { OutlinedQuestionCircleIcon } from "@patternfly/react-icons";
 
-import { useDialogs, DialogsContext } from "dialogs.jsx";
-import { show_modal_dialog } from "cockpit-components-dialog.jsx";
-import { ModalError } from 'cockpit-components-inline-notification.jsx';
+import { useDialogs, DialogsContext } from "dialogs";
+import { show_modal_dialog } from "cockpit-components-dialog";
+import { ModalError } from 'cockpit-components-inline-notification';
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/kdump/kdump.js b/pkg/kdump/kdump.js
@@ -29,7 +29,7 @@ import { createRoot } from "react-dom/client";
 import { KdumpPage } from "./kdump-view.jsx";
 import * as kdumpClient from "./kdump-client.js";
 import { superuser } from "superuser";
-import { WithDialogs } from "dialogs.jsx";
+import { WithDialogs } from "dialogs";
 
 import './kdump.scss';
 

diff --git a/pkg/lib/cockpit-components-context-menu.jsx b/pkg/lib/cockpit-components-context-menu.jsx
@@ -21,7 +21,7 @@ import cockpit from "cockpit";
 import React from "react";
 import PropTypes from "prop-types";
 
-import "context-menu.css";
+import "context-menu";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/lib/cockpit-components-dialog.jsx b/pkg/lib/cockpit-components-dialog.jsx
@@ -29,7 +29,7 @@ import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/inde
 import { Stack, StackItem } from "@patternfly/react-core/dist/esm/layouts/Stack/index.js";
 import { HelpIcon, ExternalLinkAltIcon } from '@patternfly/react-icons';
 
-import "cockpit-components-dialog.scss";
+import "./cockpit-components-dialog.scss";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/lib/cockpit-components-install-dialog.jsx b/pkg/lib/cockpit-components-install-dialog.jsx
@@ -22,10 +22,10 @@ import React from "react";
 
 import { WarningTriangleIcon } from "@patternfly/react-icons";
 
-import { show_modal_dialog } from "cockpit-components-dialog.jsx";
-import * as PK from "packagekit.js";
+import { show_modal_dialog } from "cockpit-components-dialog";
+import * as PK from "packagekit";
 
-import "cockpit-components-install-dialog.css";
+import "cockpit-components-install-dialog";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/lib/cockpit-components-logs-panel.jsx b/pkg/lib/cockpit-components-logs-panel.jsx
@@ -26,8 +26,8 @@ import { Card, CardActions, CardBody, CardHeader, CardTitle } from "@patternfly/
 import { ExclamationTriangleIcon, TimesCircleIcon } from '@patternfly/react-icons';
 
 import { journal } from "journal";
-import "journal.css";
-import "cockpit-components-logs-panel.scss";
+import "./journal.css";
+import "./cockpit-components-logs-panel.scss";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/lib/cockpit-components-modifications.jsx b/pkg/lib/cockpit-components-modifications.jsx
@@ -29,7 +29,7 @@ import { TextArea } from "@patternfly/react-core/dist/esm/components/TextArea/in
 import { CheckIcon, CopyIcon, ExternalLinkAltIcon, OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 
 import cockpit from "cockpit";
-import 'cockpit-components-modifications.css';
+import './cockpit-components-modifications.css';
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/lib/cockpit-components-plot.jsx b/pkg/lib/cockpit-components-plot.jsx
@@ -20,7 +20,7 @@
 import cockpit from "cockpit";
 
 import React, { useState, useRef, useLayoutEffect } from 'react';
-import { useEvent } from "hooks.js";
+import { useEvent } from "hooks";
 
 import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js";
 import { Dropdown, DropdownItem, DropdownSeparator, DropdownToggle } from "@patternfly/react-core/dist/esm/components/Dropdown/index.js";
@@ -29,7 +29,7 @@ import { AngleLeftIcon, AngleRightIcon, SearchMinusIcon } from '@patternfly/reac
 
 import * as timeformat from "timeformat";
 import '@patternfly/patternfly/patternfly-charts.scss';
-import "cockpit-components-plot.scss";
+import "./cockpit-components-plot.scss";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/lib/cockpit-components-shutdown.jsx b/pkg/lib/cockpit-components-shutdown.jsx
@@ -30,11 +30,11 @@ import { TextArea } from "@patternfly/react-core/dist/esm/components/TextArea/in
 import { DatePicker } from "@patternfly/react-core/dist/esm/components/DatePicker/index.js";
 import { TimePicker } from "@patternfly/react-core/dist/esm/components/TimePicker/index.js";
 
-import { ServerTime } from 'serverTime.js';
-import * as timeformat from "timeformat.js";
-import { DialogsContext } from "dialogs.jsx";
+import { ServerTime } from 'serverTime';
+import * as timeformat from "timeformat";
+import { DialogsContext } from "dialogs";
 
-import "cockpit-components-shutdown.scss";
+import "./cockpit-components-shutdown.scss";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/lib/cockpit-components-terminal.jsx b/pkg/lib/cockpit-components-terminal.jsx
@@ -24,10 +24,10 @@ import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.
 import { Terminal as Term } from "xterm";
 import { CanvasAddon } from 'xterm-addon-canvas';
 
-import { ContextMenu } from "cockpit-components-context-menu.jsx";
+import { ContextMenu } from "cockpit-components-context-menu";
 import cockpit from "cockpit";
 
-import "console.css";
+import "console";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/lib/credentials-ssh-private-keys.sh b/pkg/lib/credentials-ssh-private-keys.sh
@@ -28,7 +28,7 @@ cd "$1" || exit 0
 # After that each .pub file gets its on set of blocks
 for file in *.pub; do
     printf "\v"
-    cat "$file"
-    printf "\v%s\v" "$file"
-    ssh-keygen -l -f "$file" || true
+    cat "${file%.*}"
+    printf "\v%s\v" "${file%.*}"
+    ssh-keygen -l -f "${file%.*}" || true
 done
diff --git a/pkg/lib/credentials.js b/pkg/lib/credentials.js
@@ -19,8 +19,8 @@
 
 import cockpit from "cockpit";
 
-import lister from "credentials-ssh-private-keys.sh";
-import remove_key from "credentials-ssh-remove-key.sh";
+import lister from "./credentials-ssh-private-keys.sh";
+import remove_key from "./credentials-ssh-remove-key.sh";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/lib/ct-card.scss b/pkg/lib/ct-card.scss
@@ -1,4 +1,4 @@
-@use "_global-variables.scss" as *;
+@use "_global-variables" as *;
 
 /* Rely on the margin from the Card for spacing */
 .ct-card.pf-c-card .table {

diff --git a/pkg/lib/dialogs.jsx b/pkg/lib/dialogs.jsx
@@ -21,7 +21,7 @@
  *
  * Example:
  *
- * import { WithDialogs, useDialogs } from "dialogs.jsx";
+ * import { WithDialogs, useDialogs } from "dialogs";
  *
  * const App = () =>
  *   <WithDialogs>
@@ -71,7 +71,7 @@
  * A class component can declare a static context type and then use
  * "this.context" to find the Dialogs object:
  *
- * import { DialogsContext } from "dialogs.jsx";
+ * import { DialogsContext } from "dialogs";
  *
  * class ExampleButton extends React.Component {
  *   static contextType = DialogsContext;

diff --git a/pkg/lib/serverTime.js b/pkg/lib/serverTime.js
@@ -28,17 +28,17 @@ import { Spinner } from "@patternfly/react-core/dist/esm/components/Spinner/inde
 import { TimePicker } from "@patternfly/react-core/dist/esm/components/TimePicker/index.js";
 import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/index.js";
 import { CloseIcon, ExclamationCircleIcon, InfoCircleIcon, PlusIcon } from "@patternfly/react-icons";
-import { show_modal_dialog } from "cockpit-components-dialog.jsx";
-import { useObject, useEvent } from "hooks.js";
+import { show_modal_dialog } from "cockpit-components-dialog";
+import { useObject, useEvent } from "hooks";
 
-import * as service from "service.js";
-import * as timeformat from "timeformat.js";
-import * as python from "python.js";
+import * as service from "service";
+import * as timeformat from "timeformat";
+import * as python from "python";
 import get_timesync_backend_py from "./get-timesync-backend.py";
 
-import { superuser } from "superuser.js";
+import { superuser } from "superuser";
 
-import "serverTime.scss";
+import "serverTime";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/metrics/metrics.jsx b/pkg/metrics/metrics.jsx
@@ -44,22 +44,21 @@ import {
 
 import cockpit from 'cockpit';
 import * as machine_info from "../lib/machine-info.js";
-import * as packagekit from "packagekit.js";
+import * as packagekit from "packagekit";
 import * as service from "service";
 import * as timeformat from "timeformat";
 import { superuser } from "superuser";
 import { journal } from "journal";
-import { useObject, useEvent, useInit } from "hooks.js";
-import { WithDialogs, useDialogs } from "dialogs.jsx";
+import { useObject, useEvent, useInit } from "hooks";
+import { WithDialogs, useDialogs } from "dialogs";
 
-import { EmptyStatePanel } from "../lib/cockpit-components-empty-state.jsx";
-import { JournalOutput } from "cockpit-components-logs-panel.jsx";
-import { install_dialog } from "cockpit-components-install-dialog.jsx";
-import { ModalError } from "cockpit-components-inline-notification.jsx";
-import { FirewalldRequest } from "cockpit-components-firewalld-request.jsx";
+import { EmptyStatePanel } from "cockpit-components-empty-state";
+import { JournalOutput } from "cockpit-components-logs-panel";
+import { install_dialog } from "cockpit-components-install-dialog";
+import { ModalError } from "cockpit-components-inline-notification";
+import { FirewalldRequest } from "cockpit-components-firewalld-request";
 
 import "./metrics.scss";
-import "journal.css";
 
 const MSEC_PER_H = 3600000;
 const INTERVAL = 5000;

diff --git a/pkg/metrics/metrics.scss b/pkg/metrics/metrics.scss
@@ -6,6 +6,8 @@
 // utilities for `pf-u...` classes
 @import "@patternfly/patternfly/utilities/Spacing/spacing.css";
 
+@import "../lib/journal.css";
+
 #app {
   section.pf-c-page__main-breadcrumb {
     padding-bottom: var(--pf-c-page__main-breadcrumb--PaddingTop);

diff --git a/pkg/networkmanager/bond.jsx b/pkg/networkmanager/bond.jsx
@@ -28,7 +28,7 @@ import { ExternalLinkSquareAltIcon, HelpIcon } from '@patternfly/react-icons';
 
 import { MacMenu, MemberInterfaceChoices, NetworkModal, Name, dialogSave } from './dialogs-common.jsx';
 import { ModelContext } from './model-context.jsx';
-import { useDialogs } from "dialogs.jsx";
+import { useDialogs } from "dialogs";
 
 import { v4 as uuidv4 } from 'uuid';
 import {

diff --git a/pkg/networkmanager/bridge.jsx b/pkg/networkmanager/bridge.jsx
@@ -26,7 +26,7 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/
 
 import { MemberInterfaceChoices, NetworkModal, Name, dialogSave } from './dialogs-common.jsx';
 import { ModelContext } from './model-context.jsx';
-import { useDialogs } from "dialogs.jsx";
+import { useDialogs } from "dialogs";
 
 import { v4 as uuidv4 } from 'uuid';
 import {

diff --git a/pkg/networkmanager/bridgeport.jsx b/pkg/networkmanager/bridgeport.jsx
@@ -25,7 +25,7 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/
 
 import { NetworkModal, dialogSave } from './dialogs-common.jsx';
 import { ModelContext } from './model-context.jsx';
-import { useDialogs } from "dialogs.jsx";
+import { useDialogs } from "dialogs";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/networkmanager/dialogs-common.jsx b/pkg/networkmanager/dialogs-common.jsx
@@ -37,9 +37,9 @@ import { TeamPortDialog } from './teamport.jsx';
 import { VlanDialog, getGhostSettings as getVlanGhostSettings } from './vlan.jsx';
 import { MtuDialog } from './mtu.jsx';
 import { MacDialog } from './mac.jsx';
-import { ModalError } from 'cockpit-components-inline-notification.jsx';
+import { ModalError } from 'cockpit-components-inline-notification';
 import { ModelContext } from './model-context.jsx';
-import { useDialogs } from "dialogs.jsx";
+import { useDialogs } from "dialogs";
 
 import {
     apply_group_member,

diff --git a/pkg/networkmanager/firewall.jsx b/pkg/networkmanager/firewall.jsx
@@ -41,13 +41,13 @@ import { Modal } from "@patternfly/react-core/dist/esm/components/Modal/index.js
 import { ExclamationCircleIcon } from '@patternfly/react-icons';
 
 import firewall from "./firewall-client.js";
-import { ListingTable } from 'cockpit-components-table.jsx';
-import { ModalError } from "cockpit-components-inline-notification.jsx";
-import { EmptyStatePanel } from "cockpit-components-empty-state.jsx";
+import { ListingTable } from 'cockpit-components-table';
+import { ModalError } from "cockpit-components-inline-notification";
+import { EmptyStatePanel } from "cockpit-components-empty-state";
 import { FirewallSwitch } from "./firewall-switch.jsx";
 
 import { superuser } from "superuser";
-import { WithDialogs, DialogsContext } from "dialogs.jsx";
+import { WithDialogs, DialogsContext } from "dialogs";
 
 import "./networking.scss";
 

diff --git a/pkg/networkmanager/interfaces.js b/pkg/networkmanager/interfaces.js
@@ -21,13 +21,13 @@ import cockpit from 'cockpit';
 
 import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js";
 
-import { fmt_to_fragments } from 'utils.jsx';
+import { fmt_to_fragments } from 'utils';
 import * as utils from './utils.js';
 import { v4 as uuidv4 } from 'uuid';
 
 import "./networking.scss";
 
-import { show_modal_dialog } from "cockpit-components-dialog.jsx";
+import { show_modal_dialog } from "cockpit-components-dialog";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/networkmanager/ip-settings.jsx b/pkg/networkmanager/ip-settings.jsx
@@ -31,7 +31,7 @@ import { MinusIcon, PlusIcon } from '@patternfly/react-icons';
 
 import { NetworkModal, dialogSave } from './dialogs-common.jsx';
 import { ModelContext } from './model-context.jsx';
-import { useDialogs } from "dialogs.jsx";
+import { useDialogs } from "dialogs";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/networkmanager/mac.jsx b/pkg/networkmanager/mac.jsx
@@ -23,7 +23,7 @@ import { FormGroup } from "@patternfly/react-core/dist/esm/components/Form/index
 
 import { MacMenu, NetworkModal, dialogSave } from './dialogs-common.jsx';
 import { ModelContext } from './model-context.jsx';
-import { useDialogs } from "dialogs.jsx";
+import { useDialogs } from "dialogs";
 
 const _ = cockpit.gettext;
 

diff --git a/pkg/networkmanager/mtu.jsx b/pkg/networkmanager/mtu.jsx
@@ -24,7 +24,7 @@ import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput/
 
 import { NetworkModal, dialogSave } from './dialogs-common.jsx';
 import { ModelContext } from './model-context.jsx';
-import { useDialogs } from "dialogs.jsx";
+import { useDialogs } from "dialogs";
 
 const _ = cockpit.gettext;