diff --git a/assets/css/app.css b/assets/css/app.scss similarity index 96% rename from assets/css/app.css rename to assets/css/app.scss index fe931f2..affa2d0 100644 --- a/assets/css/app.css +++ b/assets/css/app.scss @@ -1,5 +1,6 @@ -@import url('/assets/css/noto-sans.css'); -@import url("/assets/css/beam-weapon.css"); +@import 'reset.css'; +@import 'noto-sans.css'; +@import 'beam-weapon.css'; * { --hover-color: #f18902; diff --git a/client/.swcrc b/client/.swcrc index 9782104..02ff879 100644 --- a/client/.swcrc +++ b/client/.swcrc @@ -20,11 +20,11 @@ "topLevelAwait": true, "importMeta": true }, + "target": "es2022", "minify": { "compress": true, "mangle": true - }, - "target": "es2022" + } }, "minify": true } diff --git a/client/package.json b/client/package.json index 76e6684..adb6397 100644 --- a/client/package.json +++ b/client/package.json @@ -5,5 +5,6 @@ "@swc/helpers": "^0.4.3", "@swc/wasm-web": "^1.2.212", "browserslist": "^4.21.1" - } + }, + "resolutions": { "terser": "npm:@swc/core" } } diff --git a/client/spack.config.js b/client/spack.config.js index 9f8ef0f..a7a91c2 100644 --- a/client/spack.config.js +++ b/client/spack.config.js @@ -1,5 +1,4 @@ const { config } = require("@swc/core/spack"); -const path = require("path"); module.exports = config({ entry: { @@ -9,4 +8,5 @@ module.exports = config({ output: { path: __dirname + "/dist", }, + mode: 'production' }); diff --git a/client/src/app.js b/client/src/app.js index 495c421..c6be388 100644 --- a/client/src/app.js +++ b/client/src/app.js @@ -1,31 +1,31 @@ -import "./shared/rich-text-editor"; +import "./shared/rich-text-editor.js"; import "./shared/form-navigation.js"; import "./shared/image-popup.js"; import "./shared/nav/ow-nav.js"; import "./shared/nav/ow-path.js"; -import "./shared/price/price-input"; -import "./shared/price/price-view"; +import "./shared/price/price-input.js"; +import "./shared/price/price-view.js"; import "./ow-account/ow-account.js"; import "./local-businesses/local-businesses.js"; -import "./local-businesses/local-business-item"; -import "./local-businesses/local-business"; +import "./local-businesses/local-business-item.js"; +import "./local-businesses/local-business.js"; import "./login-form.js"; import "./register-form.js"; -import "./business-items/business-item"; -import "./business-items/business-item-editor"; +import "./business-items/business-item.js"; +import "./business-items/business-item-editor.js"; -import "./news/ow-articles"; -import "./news/news-article"; +import "./news/ow-articles.js"; +import "./news/news-article.js"; -import "./contacts/contact-info-list"; -import "./contacts/contact-info"; -import "./contacts/contact-info-editor"; -import "./contacts/contact-type-icon"; -import "./contacts/edit-contact-info"; +import "./contacts/contact-info-list.js"; +import "./contacts/contact-info.js"; +import "./contacts/contact-info-editor.js"; +import "./contacts/contact-type-icon.js"; +import "./contacts/edit-contact-info.js"; import "./offers/marketplace-offer"; import "./offers/marketplace-offers"; diff --git a/client/src/offers/offer-form.js b/client/src/offers/offer-form.js index 8a31088..fb96a53 100644 --- a/client/src/offers/offer-form.js +++ b/client/src/offers/offer-form.js @@ -1,4 +1,4 @@ -import { Component, FORM_STYLE, TIP } from "../shared"; +import { Component, FORM_STYLE, TIP_STYLE } from "../shared"; customElements.define('offer-form', class extends Component { static get observedAttributes() { @@ -29,7 +29,7 @@ customElements.define('offer-form', class extends Component { margin-right: 16px; } } - ${ FORM_STYLE }${ TIP } + ${ FORM_STYLE }${ TIP_STYLE }
diff --git a/client/src/register-form/register-business-form.js b/client/src/register-form/register-business-form.js index 1f83abb..bd7c030 100644 --- a/client/src/register-form/register-business-form.js +++ b/client/src/register-form/register-business-form.js @@ -1,4 +1,4 @@ -import { FORM_STYLE, TIP, PseudoForm } from "../shared"; +import { FORM_STYLE, TIP_STYLE, PseudoForm } from "../shared"; customElements.define('register-business-form', class extends PseudoForm { constructor() { @@ -7,7 +7,7 @@ customElements.define('register-business-form', class extends PseudoForm { :host { display: block; } * { font-family: 'Noto Sans', sans-serif; } textarea { min-height: 200px; } - ${ FORM_STYLE }${ TIP } + ${ FORM_STYLE }${ TIP_STYLE }
diff --git a/client/src/register-form/register-user-type.js b/client/src/register-form/register-user-type.js index 6ccfcb6..c27e8c1 100644 --- a/client/src/register-form/register-user-type.js +++ b/client/src/register-form/register-user-type.js @@ -1,4 +1,4 @@ -import { Component, BUTTON_STYLE, TIP } from "../shared"; +import { Component, BUTTON_STYLE, TIP_STYLE } from "../shared"; customElements.define('register-user-type', class extends Component { constructor() { @@ -52,7 +52,7 @@ customElements.define('register-user-type', class extends Component { height: 200px; } } - ${ BUTTON_STYLE }${ TIP } + ${ BUTTON_STYLE }${ TIP_STYLE }