diff --git a/apps/front/README.md b/apps/front/README.md index 290d1661..08a39845 100644 --- a/apps/front/README.md +++ b/apps/front/README.md @@ -45,7 +45,7 @@ return new Promise((resolve) => { // duplicate route with lang if the router is configured on this way "/fr", "/fr/work", - "/fr/work/first-work", + "/fr/work/first-work" ]) }) ``` diff --git a/apps/front/config/config.js b/apps/front/config/config.js index 394da735..abaf8c5c 100644 --- a/apps/front/config/config.js +++ b/apps/front/config/config.js @@ -30,5 +30,5 @@ export default { // Build htaccess htaccessTemplateFilePath: resolve( "config/tasks/build-htaccess/templates/.htaccess.template" - ), + ) } diff --git a/apps/front/config/tasks/build-htaccess/build-htaccess.js b/apps/front/config/tasks/build-htaccess/build-htaccess.js index 776cd9fa..4c9d2b40 100644 --- a/apps/front/config/tasks/build-htaccess/build-htaccess.js +++ b/apps/front/config/tasks/build-htaccess/build-htaccess.js @@ -39,7 +39,7 @@ const _createHtpasswdFile = async ({ outputPath, user, password }) => { log("create htpasswd file", { outputPath, user, - password, + password }) if (!outputPath || !user || !password) { @@ -74,7 +74,7 @@ const _htpasswdLinkInHtaccess = async ({ newHtaccessFilePath, serverWebRootPath AuthType Basic AuthName "Restricted Area" Require valid-user - `, + ` ] .join("\n") .replace(/ +/g, "") @@ -90,14 +90,14 @@ const _htpasswdLinkInHtaccess = async ({ newHtaccessFilePath, serverWebRootPath */ const _rewriteHttpToHttpsInHtaccess = async (newHtaccessFilePath) => { debug("rewrite http to https in htaccess", { - newHtaccessFilePath, + newHtaccessFilePath }) const template = [ `# Force http to https RewriteCond %{HTTPS} off RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R,L] - `, + ` ] .join("\n") .replace(/ +/g, "") @@ -115,12 +115,12 @@ export default async ({ user, password, outputPath, - htaccessTemplatePath, + htaccessTemplatePath }) => { // create htaccess file and get returned newHtaccessFilePath const newHtaccessFilePath = await _createHtaccessFile({ outputPath, - htaccessTemplatePath, + htaccessTemplatePath }) if (!newHtaccessFilePath) return diff --git a/apps/front/config/vite-plugins/vite-chersite-custom-logger.ts b/apps/front/config/vite-plugins/vite-chersite-custom-logger.ts index 3e8fe2c1..536df0b2 100644 --- a/apps/front/config/vite-plugins/vite-chersite-custom-logger.ts +++ b/apps/front/config/vite-plugins/vite-chersite-custom-logger.ts @@ -6,7 +6,7 @@ export const viteChersiteCustomLogger = ({ protocol, host, port, - base, + base }: { protocol: "http" | "https" host: string diff --git a/apps/front/config/vite-plugins/vite-plugin-build-dotenv.ts b/apps/front/config/vite-plugins/vite-plugin-build-dotenv.ts index 270ed540..0321d12d 100644 --- a/apps/front/config/vite-plugins/vite-plugin-build-dotenv.ts +++ b/apps/front/config/vite-plugins/vite-plugin-build-dotenv.ts @@ -4,7 +4,7 @@ import buildDotenv from "../tasks/build-dotenv/build-dotenv" export default function buildDotenvPlugin({ envVars = process.env, dotenvOutDir, - additionalVarKeys, + additionalVarKeys }: { envVars: { [x: string]: any } dotenvOutDir: string[] @@ -14,6 +14,6 @@ export default function buildDotenvPlugin({ name: "vite-plugin-dotenv", buildStart: async () => { await buildDotenv({ envVars, dotenvOutDir, additionalVarKeys }) - }, + } } } diff --git a/apps/front/config/vite-plugins/vite-plugin-build-htaccess.ts b/apps/front/config/vite-plugins/vite-plugin-build-htaccess.ts index db327387..92756aa7 100644 --- a/apps/front/config/vite-plugins/vite-plugin-build-htaccess.ts +++ b/apps/front/config/vite-plugins/vite-plugin-build-htaccess.ts @@ -7,7 +7,7 @@ export default function buildHtaccessPlugin({ serverWebRootPath, htaccessTemplatePath, outputPath, - enable, + enable }: { user: string | undefined password: string | undefined @@ -29,8 +29,8 @@ export default function buildHtaccessPlugin({ serverWebRootPath, password, htaccessTemplatePath, - outputPath, + outputPath }) - }, + } } } diff --git a/apps/front/config/vite-plugins/vite-plugin-html.js b/apps/front/config/vite-plugins/vite-plugin-html.js index 65aeea7f..64825bd7 100644 --- a/apps/front/config/vite-plugins/vite-plugin-html.js +++ b/apps/front/config/vite-plugins/vite-plugin-html.js @@ -3,6 +3,6 @@ export default function htmlPlugin(env) { name: "html-transform", transformIndexHtml(html) { return html.replace(/<!-- VITE_APP_URL -->/gm, `${env.VITE_APP_URL}`) - }, + } } } diff --git a/apps/front/index.html b/apps/front/index.html index 38246121..8cc4e54f 100644 --- a/apps/front/index.html +++ b/apps/front/index.html @@ -1,4 +1,4 @@ -<!DOCTYPE html> +<!doctype html> <html lang="en"> <head> <meta charset="UTF-8" /> diff --git a/apps/front/prerender/__tests__/ManifestParser.test.ts b/apps/front/prerender/__tests__/ManifestParser.test.ts index d32f1924..237fabec 100644 --- a/apps/front/prerender/__tests__/ManifestParser.test.ts +++ b/apps/front/prerender/__tests__/ManifestParser.test.ts @@ -7,7 +7,7 @@ const url = import.meta.url const manifestRaw = fs.readFileSync( path.join(path.dirname(fileURLToPath(url)), `fixtures/manifest.json`), - { encoding: "utf8" }, + { encoding: "utf8" } ) it("should return assets list", () => { diff --git a/apps/front/prerender/helpers/ManifestParser.ts b/apps/front/prerender/helpers/ManifestParser.ts index 39797026..0982bca1 100644 --- a/apps/front/prerender/helpers/ManifestParser.ts +++ b/apps/front/prerender/helpers/ManifestParser.ts @@ -123,7 +123,7 @@ export class ManifestParser { } else { return { ...a, - [ext]: [b], + [ext]: [b] } } }, {}) @@ -157,7 +157,7 @@ export class ManifestParser { ...a, jsonManifest[b].file, ...(jsonManifest[b]?.assets || []), - ...(jsonManifest[b]?.css || []), + ...(jsonManifest[b]?.css || []) ] : a, [] diff --git a/apps/front/prerender/prerender.ts b/apps/front/prerender/prerender.ts index b129ca98..8fb0f0c6 100644 --- a/apps/front/prerender/prerender.ts +++ b/apps/front/prerender/prerender.ts @@ -44,7 +44,7 @@ export const prerender = async (urls: string[], outDirStatic = config.outDirStat }, onError(x) { console.error(x) - }, + } }) } catch (e) { console.log(e) diff --git a/apps/front/server.js b/apps/front/server.js index f60ee9ff..76387c23 100644 --- a/apps/front/server.js +++ b/apps/front/server.js @@ -39,7 +39,7 @@ const isSSL = protocol === "https" // dev script to inject const devScripts = { - js: [{ tag: "script", attr: { type: "module", src: "/src/index.tsx" } }], + js: [{ tag: "script", attr: { type: "module", src: "/src/index.tsx" } }] } // Create Vite server in middleware mode. @@ -50,9 +50,9 @@ const isSSL = protocol === "https" server: { middlewareMode: true, https: (isSSL && { key, cert }) || false, - cors: false, + cors: false }, - appType: "custom", + appType: "custom" }) // use vite's connect instance as middleware @@ -75,7 +75,7 @@ const isSSL = protocol === "https" onError(e) { res.statusCode = 500 console.error(e) - }, + } }) } catch (e) { vite.ssrFixStacktrace(e) diff --git a/apps/front/src/components/cookiesBanner/CookiesBanner.tsx b/apps/front/src/components/cookiesBanner/CookiesBanner.tsx index ac42824c..b6b1390e 100644 --- a/apps/front/src/components/cookiesBanner/CookiesBanner.tsx +++ b/apps/front/src/components/cookiesBanner/CookiesBanner.tsx @@ -104,7 +104,7 @@ export function CookiesBanner(props: IProps) { // targets script DOM by ids const $gTagManagerScript = document.getElementById("__gaTagManagerScript") const $gTagManagerDataLayerScript = document.getElementById( - "__gTagManagerDataLayerScript", + "__gTagManagerDataLayerScript" ) const $gTagManagerNoScript = document.getElementById("__gaTagManagerNoScript") diff --git a/apps/front/src/index.tsx b/apps/front/src/index.tsx index 75064d84..1f50dff6 100644 --- a/apps/front/src/index.tsx +++ b/apps/front/src/index.tsx @@ -44,7 +44,7 @@ const history = createBrowserHistory() const langService = new LangService({ showDefaultLangInUrl, languages, - base, + base }) /** diff --git a/apps/front/src/languages.ts b/apps/front/src/languages.ts index a42541e6..63e2cbc4 100644 --- a/apps/front/src/languages.ts +++ b/apps/front/src/languages.ts @@ -7,8 +7,8 @@ import { TLanguage } from "@cher-ami/router" export const languages: TLanguage[] = [ { key: "fr", - default: true, - }, + default: true + } // { // key: "en", // }, diff --git a/apps/front/src/libs/dom/MetaManager.ts b/apps/front/src/libs/dom/MetaManager.ts index d177aa71..b4340a90 100644 --- a/apps/front/src/libs/dom/MetaManager.ts +++ b/apps/front/src/libs/dom/MetaManager.ts @@ -99,7 +99,7 @@ export class MetasManager { values = null, tags = MetasManager.DEFAULT_META_TAGS, autoCreateMetaTag = true, - autoRemoveMetaTag = true, + autoRemoveMetaTag = true }: { values?: TMetaTags<string> tags?: TMetaTags<TTag[]> diff --git a/apps/front/src/libs/events/Beeper.ts b/apps/front/src/libs/events/Beeper.ts index fc1a521c..cc74ef14 100644 --- a/apps/front/src/libs/events/Beeper.ts +++ b/apps/front/src/libs/events/Beeper.ts @@ -56,6 +56,6 @@ export function Beeper<S = any>(initialState: S = null): TBeeper<S> { }, get initialState() { return _initialState - }, + } } } diff --git a/apps/front/src/libs/hooks/useMinWidth.ts b/apps/front/src/libs/hooks/useMinWidth.ts index 2c8b0bca..697706e9 100644 --- a/apps/front/src/libs/hooks/useMinWidth.ts +++ b/apps/front/src/libs/hooks/useMinWidth.ts @@ -1,6 +1,6 @@ import { getBreakpointCssVariable, - TBreakpoint, + TBreakpoint } from "~/libs/dom/getBreakpointCssVariable" import { browserOnly } from "@cher-ami/utils" import { useMatchMedia } from "~/libs/hooks/useMatchMedia" diff --git a/apps/front/src/libs/load/PreloadService.ts b/apps/front/src/libs/load/PreloadService.ts index 4d1c427e..e0a2b788 100644 --- a/apps/front/src/libs/load/PreloadService.ts +++ b/apps/front/src/libs/load/PreloadService.ts @@ -18,7 +18,7 @@ export class PreloadService { this.onPreloadSignal = Beeper<IPreloadSignal>({ complete: false, counter: 0, - percent: 0, + percent: 0 }) } @@ -35,7 +35,7 @@ export class PreloadService { this.onPreloadSignal.dispatch({ complete: true, percent: 100, - counter: 0, + counter: 0 }) return } @@ -84,7 +84,7 @@ export class PreloadService { const dispatchValue = { counter, percent, - complete, + complete } log("dispatchValue", dispatchValue) this.onPreloadSignal.dispatch(dispatchValue) diff --git a/apps/front/src/routes.ts b/apps/front/src/routes.ts index 0b9a1c16..8f1c5d7a 100644 --- a/apps/front/src/routes.ts +++ b/apps/front/src/routes.ts @@ -8,7 +8,7 @@ import NotFoundPage from "./pages/notFoundPage/NotFoundPage" export enum EPages { HOME = "home", WORK = "work", - NOT_FOUND = "not-found", + NOT_FOUND = "not-found" } export const routes: TRoute[] = [ @@ -22,10 +22,10 @@ export const routes: TRoute[] = [ const meta: TMetaTags = { title: "Home", description: "Home description", - imageUrl: "", + imageUrl: "" } return { time, meta } - }, + } }, { path: "/work/:slug?", @@ -35,10 +35,10 @@ export const routes: TRoute[] = [ const meta: TMetaTags = { title: `Work - ${props.params.slug}`, description: "Work description", - imageUrl: "", + imageUrl: "" } return { meta } - }, + } }, { path: "/:rest", @@ -48,9 +48,9 @@ export const routes: TRoute[] = [ const meta = { title: `404`, description: "Not found", - imageUrl: "", + imageUrl: "" } return { meta } - }, - }, + } + } ] diff --git a/apps/front/src/server/helpers/CherScripts.tsx b/apps/front/src/server/helpers/CherScripts.tsx index 46129354..5c339545 100644 --- a/apps/front/src/server/helpers/CherScripts.tsx +++ b/apps/front/src/server/helpers/CherScripts.tsx @@ -9,9 +9,5 @@ export const ScriptTag = ({ tag, attr }: TScript): JSX.Element => { } export const CherScripts = ({ scripts }: { scripts: TScript[] }): JSX.Element => ( - <> - {scripts?.map((script, i) => ( - <ScriptTag key={i} {...script} /> - ))} - </> + <>{scripts?.map((script, i) => <ScriptTag key={i} {...script} />)}</> ) diff --git a/apps/front/src/server/helpers/RawScript.tsx b/apps/front/src/server/helpers/RawScript.tsx index 49612f71..9a8e2601 100644 --- a/apps/front/src/server/helpers/RawScript.tsx +++ b/apps/front/src/server/helpers/RawScript.tsx @@ -11,7 +11,7 @@ export const RawScript = ({ name, data }) => { <script type="text/javascript" dangerouslySetInnerHTML={{ - __html: `window.${name}=${stringify(data)}`, + __html: `window.${name}=${stringify(data)}` }} /> ) diff --git a/apps/front/src/server/helpers/ViteDevScripts.tsx b/apps/front/src/server/helpers/ViteDevScripts.tsx index 91843be0..dfb46fc1 100644 --- a/apps/front/src/server/helpers/ViteDevScripts.tsx +++ b/apps/front/src/server/helpers/ViteDevScripts.tsx @@ -11,7 +11,7 @@ export const ViteDevScripts = () => { dangerouslySetInnerHTML={{ __html: ` import { inject } from "/@vite-plugin-checker-runtime"; - inject({ overlayConfig: {}, base: "${base}"});`, + inject({ overlayConfig: {}, base: "${base}"});` }} /> @@ -27,7 +27,7 @@ export const ViteDevScripts = () => { refresh.injectIntoGlobalHook(window) window.$RefreshReg$ = () => {} window.$RefreshSig$ = () => (type) => type - window.__vite_plugin_react_preamble_installed__ = true`, + window.__vite_plugin_react_preamble_installed__ = true` }} /> </> diff --git a/apps/front/src/styles/_utils.scss b/apps/front/src/styles/_utils.scss index 7cc90182..4d1fd16e 100644 --- a/apps/front/src/styles/_utils.scss +++ b/apps/front/src/styles/_utils.scss @@ -1,10 +1,10 @@ // Debug an element with an outline with custom size and color. -@mixin debug($size: 1px, $color: red) { +@mixin debug($size: 1px, $color: red) { outline: $size solid $color; } // Set bigger hit zone with :after. -@mixin hitZone($horizontalSize: 10px, $verticalSize: 10px, $color: transparent) { +@mixin hitZone($horizontalSize: 10px, $verticalSize: 10px, $color: transparent) { &:after { content: ""; background-color: $color; @@ -18,13 +18,13 @@ // Hide text only visually to preserve SEO check @mixin visuallyHidden() { - clip: rect(1px, 1px, 1px, 1px); + clip: rect(1px, 1px, 1px, 1px); clip-path: inset(50%); - height: 1px; - width: 1px; + height: 1px; + width: 1px; margin: -1px; overflow: hidden; - padding: 0; + padding: 0; position: absolute; } @@ -32,33 +32,33 @@ @mixin absoluteCenter($axis: yx) { @if $axis == yx { position: absolute; - top: 50%; - left: 50%; + top: 50%; + left: 50%; transform: translate(-50%, -50%); } @else if $axis == y { position: absolute; - top: 50%; + top: 50%; left: auto; transform: translateY(-50%); } @else if $axis == x { position: absolute; top: auto; - left: 50%; + left: 50%; transform: translateX(-50%); } } // Remove touch callout on Safari mobile @mixin disableTouchCallout() { - -webkit-tap-highlight-color: rgba(255, 255, 255, 0); + -webkit-tap-highlight-color: rgba(255, 255, 255, 0); } // Patch scrolling on iOS @mixin hideScrollBar() { overflow-scrolling: touch; &::-webkit-scrollbar { - width: 0 !important; - height: 0 !important; + width: 0 !important; + height: 0 !important; } } diff --git a/apps/front/vite.config.ts b/apps/front/vite.config.ts index 91ed70c8..01600e4a 100644 --- a/apps/front/vite.config.ts +++ b/apps/front/vite.config.ts @@ -40,7 +40,7 @@ export default defineConfig(({ command, mode }: ConfigEnv): UserConfig => { PROTOCOL: protocol, COMMAND: command, INPUT_FILES: config.input.join(","), - BUILD_DIRNAME: config.buildDirname, + BUILD_DIRNAME: config.buildDirname } return { @@ -50,13 +50,13 @@ export default defineConfig(({ command, mode }: ConfigEnv): UserConfig => { protocol, host: process.env.HOST, port: process.env.PORT, - base: process.env.VITE_APP_BASE, - }), + base: process.env.VITE_APP_BASE + }) } : {}), define: { - "process.env.VITE_APP_BASE": JSON.stringify(process.env.VITE_APP_BASE), + "process.env.VITE_APP_BASE": JSON.stringify(process.env.VITE_APP_BASE) }, // "base" refer to folder where assets are served base: process.env.VITE_APP_BASE, @@ -73,17 +73,17 @@ export default defineConfig(({ command, mode }: ConfigEnv): UserConfig => { origin: `${protocol}://${process.env.HOST}:${process.env.PORT}`, watch: { // do not watch .env files to avoid reloading when build-dotenv is processed - ignored: [...(config.buildDotenvOutDir.map((path) => `${path}/.env`) || [])], - }, + ignored: [...(config.buildDotenvOutDir.map((path) => `${path}/.env`) || [])] + } }, css: { modules: { - generateScopedName: "[name]__[local]__[hash:base64:5]", + generateScopedName: "[name]__[local]__[hash:base64:5]" }, postcss: { - plugins: [autoprefixer()], - }, + plugins: [autoprefixer()] + } }, build: { @@ -96,14 +96,14 @@ export default defineConfig(({ command, mode }: ConfigEnv): UserConfig => { rollupOptions: { ...(config.input?.length > 0 ? { input: config.input?.map((el) => resolve(el)) } - : {}), - }, + : {}) + } }, resolve: { alias: { - "~": resolve(__dirname, "src"), - }, + "~": resolve(__dirname, "src") + } }, plugins: [ @@ -123,8 +123,8 @@ export default defineConfig(({ command, mode }: ConfigEnv): UserConfig => { "COMMAND", "INPUT_FILES", "BUILD_DIRNAME", - "DOCKER_PORT", - ], + "DOCKER_PORT" + ] }), // Htaccess dist/ with password @@ -134,14 +134,14 @@ export default defineConfig(({ command, mode }: ConfigEnv): UserConfig => { user: process.env.HTACCESS_AUTH_USER, password: process.env.HTACCESS_AUTH_PASSWORD, htaccessTemplatePath: config.htaccessTemplateFilePath, - outputPath: process.env.HTACCESS_OUTPUT_PATH, + outputPath: process.env.HTACCESS_OUTPUT_PATH }), visualizer({ filename: "./build-stats.html", gzipSize: true, - title: "Generated bundle stats", - }), - ], + title: "Generated bundle stats" + }) + ] } }) diff --git a/apps/front/vite.scripts.config.ts b/apps/front/vite.scripts.config.ts index bb7d696f..57c631af 100644 --- a/apps/front/vite.scripts.config.ts +++ b/apps/front/vite.scripts.config.ts @@ -19,34 +19,34 @@ export default defineConfig(({ command, mode }) => { assetsInlineLimit: 0, ssr: true, define: { - "process.env.VITE_APP_BASE": JSON.stringify(process.env.VITE_APP_BASE), + "process.env.VITE_APP_BASE": JSON.stringify(process.env.VITE_APP_BASE) }, rollupOptions: { input: [ resolve("server.js"), resolve("prerender/prerender.ts"), resolve("prerender/exe-prerender-server.ts"), - resolve("prerender/exe-prerender.ts"), + resolve("prerender/exe-prerender.ts") ], output: { manualChunks: undefined, entryFileNames: `[name].js`, - chunkFileNames: `[name].js`, - }, - }, + chunkFileNames: `[name].js` + } + } }, css: { modules: { - generateScopedName: "[name]__[local]__[hash:base64:5]", + generateScopedName: "[name]__[local]__[hash:base64:5]" }, postcss: { - plugins: [autoprefixer()], - }, + plugins: [autoprefixer()] + } }, resolve: { alias: { - "~": resolve(__dirname, "src"), - }, - }, + "~": resolve(__dirname, "src") + } + } } }) diff --git a/cli/config.js b/cli/config.js index ae865809..ad678eba 100644 --- a/cli/config.js +++ b/cli/config.js @@ -14,5 +14,5 @@ export default { // setup taskSetupFolder: resolve("cli/tasks/setup"), installFile: resolve("cli/install"), - setupFakeMode: false, + setupFakeMode: false } diff --git a/cli/helpers/create-file.js b/cli/helpers/create-file.js index abd16141..875a8224 100644 --- a/cli/helpers/create-file.js +++ b/cli/helpers/create-file.js @@ -10,7 +10,7 @@ import logs from "./logger.js" const createFile = async ({ templateFilePath = "", destinationFilePath = "", - replaceExpressions = {}, + replaceExpressions = {} }) => { // Check if component already exists @@ -33,7 +33,7 @@ const createFile = async ({ } }) resolve(fileContent) - }), + }) }) } diff --git a/cli/helpers/logger.js b/cli/helpers/logger.js index 74ae3985..59c8c6ae 100644 --- a/cli/helpers/logger.js +++ b/cli/helpers/logger.js @@ -9,5 +9,5 @@ export default { start: (message = "") => console.log(`\n ${blue(message)}`), note: (message = "") => console.log(` ${grey(message)}`), done: (message = "Done.") => console.log(` ${green(message)}`), - error: (message = "") => console.log(` ${red(message)}`), + error: (message = "") => console.log(` ${red(message)}`) } diff --git a/cli/tasks/scaffold-component/scaffold-component.js b/cli/tasks/scaffold-component/scaffold-component.js index 36dac7b2..e852ee9f 100644 --- a/cli/tasks/scaffold-component/scaffold-component.js +++ b/cli/tasks/scaffold-component/scaffold-component.js @@ -14,7 +14,7 @@ const _askWhichComponentFolder = (componentCompatibleFolders) => { type: "list", name: "subFolder", message: "Which component folder?", - choices: componentCompatibleFolders, + choices: componentCompatibleFolders }) } @@ -22,7 +22,7 @@ const _askComponentName = () => { return Inquirer.prompt({ type: "input", message: "Component name?", - name: "componentName", + name: "componentName" }) } @@ -33,7 +33,7 @@ const _reactComponentBuilder = async ({ subFolder, componentPath, upperComponentName, - componentsTemplatesDir, + componentsTemplatesDir }) => { // choose between page and component type const componentType = subFolder === "pages" ? "page" : "component" @@ -41,13 +41,13 @@ const _reactComponentBuilder = async ({ await createFile({ templateFilePath: `${componentsTemplatesDir}/react/${componentType}.tsx.template`, destinationFilePath: `${componentPath}/${upperComponentName}.tsx`, - replaceExpressions: { upperComponentName }, + replaceExpressions: { upperComponentName } }) // scaffold scss module await createFile({ templateFilePath: `${componentsTemplatesDir}/react/component.scss.template`, destinationFilePath: `${componentPath}/${upperComponentName}.module.scss`, - replaceExpressions: { upperComponentName }, + replaceExpressions: { upperComponentName } }) } @@ -59,7 +59,7 @@ const _scaffoldComponent = ({ srcDir, componentCompatibleFolders, componentsTemplatesDir, - pComponentType, // react | ... + pComponentType // react | ... }) => { return new Promise(async (resolve) => { // Get sub-folder @@ -89,7 +89,7 @@ const _scaffoldComponent = ({ upperComponentName, componentPath, componentCompatibleFolders, - componentsTemplatesDir, + componentsTemplatesDir }) // final log @@ -100,13 +100,11 @@ const _scaffoldComponent = ({ // ----------------------------------------------------------------------------- PUBLIC -(async ()=> -{ +;(async () => { await _scaffoldComponent({ pComponentType: "react", componentCompatibleFolders: config.componentCompatibleFolders, componentsTemplatesDir: config.componentsTemplatesDir, - srcDir: config.frontSrcDir, + srcDir: config.frontSrcDir }) - })() diff --git a/cli/tasks/scaffold-wp/builders/block.js b/cli/tasks/scaffold-wp/builders/block.js index 1850ecb5..cc12d49c 100644 --- a/cli/tasks/scaffold-wp/builders/block.js +++ b/cli/tasks/scaffold-wp/builders/block.js @@ -10,13 +10,13 @@ const _askBlockName = () => { { type: "input", message: "Block name (dashed lower cased)?", - name: "blockName", + name: "blockName" }, { type: "input", message: "Block title? ", - name: "blockTitle", - }, + name: "blockTitle" + } ]) } @@ -41,15 +41,15 @@ const _blockBuilder = async ({ blockPath, blockName, blockTitle }) => { blockName, blockTitle, pascalCaseBlockName, - upperCaseBlockName, - }, + upperCaseBlockName + } }) // scaffold controller await createFile({ templateFilePath: `${config.wpTemplatesPath}/block/blockController.php.template`, destinationFilePath: `${blockPath}/${pascalCaseBlockName}Controller.php`, - replaceExpressions: { pascalCaseBlockName, camelCaseBlockName, upperCaseBlockName }, + replaceExpressions: { pascalCaseBlockName, camelCaseBlockName, upperCaseBlockName } }) } @@ -78,7 +78,7 @@ const buildBlock = async () => { await _blockBuilder({ blockPath, blockName, - blockTitle, + blockTitle }) } catch (e) { logs.error(e) @@ -139,7 +139,7 @@ const buildBlockType = async () => { return { name: changeCase.kebabCase(blockName), upperCaseBlockName: changeCase.constantCase(blockName), - pasclaCaseName: blockName, + pasclaCaseName: blockName } }) diff --git a/cli/tasks/scaffold-wp/builders/option-page.js b/cli/tasks/scaffold-wp/builders/option-page.js index 255e244d..efd0a143 100644 --- a/cli/tasks/scaffold-wp/builders/option-page.js +++ b/cli/tasks/scaffold-wp/builders/option-page.js @@ -9,13 +9,13 @@ const _askOptionName = () => { { type: "input", message: "Option page name (dashed lower cased)?", - name: "pageName", + name: "pageName" }, { type: "input", message: "Option page title? ", - name: "pageTitle", - }, + name: "pageTitle" + } ]) } @@ -33,21 +33,21 @@ const _optionPageBuilder = async ({ pagePath, pageName, pageTitle }) => { await createFile({ templateFilePath: `${config.wpTemplatesPath}/option-page/PageOption.php.template`, destinationFilePath: `${pagePath}/${pascalCasePageName}Option.php`, - replaceExpressions: { pageName, pageTitle }, + replaceExpressions: { pageName, pageTitle } }) // scaffold controller await createFile({ templateFilePath: `${config.wpTemplatesPath}/option-page/PageRestController.php.template`, destinationFilePath: `${pagePath}/${pascalCasePageName}RestController.php`, - replaceExpressions: { pageName, pascalCasePageName }, + replaceExpressions: { pageName, pascalCasePageName } }) // scaffold setup await createFile({ templateFilePath: `${config.wpTemplatesPath}/option-page/setup.php.template`, destinationFilePath: `${pagePath}/setup.php`, - replaceExpressions: { pascalCasePageName }, + replaceExpressions: { pascalCasePageName } }) } @@ -76,7 +76,7 @@ const buildOptionPage = () => { await _optionPageBuilder({ pagePath, pageName, - pageTitle, + pageTitle }) } catch (e) { console.log(e) diff --git a/cli/tasks/scaffold-wp/builders/page.js b/cli/tasks/scaffold-wp/builders/page.js index d7faa21c..e66132d4 100644 --- a/cli/tasks/scaffold-wp/builders/page.js +++ b/cli/tasks/scaffold-wp/builders/page.js @@ -9,8 +9,8 @@ const _askPageName = () => { { type: "input", message: "Page name (dashed lower cased) ?", - name: "pageName", - }, + name: "pageName" + } ]) } @@ -19,8 +19,8 @@ const _askIfTemplate = () => { { type: "confirm", message: "Create a template for this page ?", - name: "createTemplate", - }, + name: "createTemplate" + } ]) } @@ -40,22 +40,22 @@ const _pageBuilder = async ({ pagePath, pageName, createTemplate }) => { await createFile({ templateFilePath: `${config.wpTemplatesPath}/pages/PageRestController.php.template`, destinationFilePath: `${pagePath}/${pascalCasePageName}RestController.php`, - replaceExpressions: { pageName, pascalCasePageName }, + replaceExpressions: { pageName, pascalCasePageName } }) // scaffold setup await createFile({ templateFilePath: `${config.wpTemplatesPath}/pages/setup.php.template`, destinationFilePath: `${pagePath}/setup.php`, - replaceExpressions: { camelCasePageName, pascalCasePageName }, + replaceExpressions: { camelCasePageName, pascalCasePageName } }) - - if(createTemplate) { + + if (createTemplate) { // template setup await createFile({ templateFilePath: `${config.wpTemplatesPath}/pages/page-template.php.template`, destinationFilePath: `${config.wpTheme}/template-${pascalCasePageName}.php`, - replaceExpressions: { camelCasePageName, pascalCasePageName }, + replaceExpressions: { camelCasePageName, pascalCasePageName } }) } } @@ -67,7 +67,7 @@ const buildPage = () => { // Get page name let pageName = "" - let createTemplate; + let createTemplate await _askPageName().then((answer) => { pageName = changeCase.kebabCase(answer.pageName) @@ -99,7 +99,7 @@ const buildPage = () => { } // final log - createTemplate ? logs.done("Page and template created.") : logs.done("Page created.") + createTemplate ? logs.done("Page and template created.") : logs.done("Page created.") resolve() }) } diff --git a/cli/tasks/scaffold-wp/builders/post-type.js b/cli/tasks/scaffold-wp/builders/post-type.js index 073ec3f3..de1e5ecf 100644 --- a/cli/tasks/scaffold-wp/builders/post-type.js +++ b/cli/tasks/scaffold-wp/builders/post-type.js @@ -9,18 +9,18 @@ const _askPostTypeName = () => { { type: "input", message: "Post type? (dashed lower cased)", - name: "postTypeName", + name: "postTypeName" }, { type: "input", message: "Singular display name? ", - name: "upperSingularPostTypeName", + name: "upperSingularPostTypeName" }, { type: "input", message: "Plural display name? ", - name: "upperPluralPostTypeName", - }, + name: "upperPluralPostTypeName" + } ]) } @@ -37,7 +37,7 @@ const _postTypeBuilder = async ({ postTypePath, postTypeName, upperPluralPostTypeName, - upperSingularPostTypeName, + upperSingularPostTypeName }) => { // choose between page and postType type const camelCasePostTypeName = changeCase.camelCase(postTypeName), @@ -53,8 +53,8 @@ const _postTypeBuilder = async ({ camelCasePostTypeName, upperPluralPostTypeName, upperSingularPostTypeName, - upperCasePostTypeName, - }, + upperCasePostTypeName + } }) // scaffold controller await createFile({ @@ -64,8 +64,8 @@ const _postTypeBuilder = async ({ postTypeName, pascalCasePostType, camelCasePostTypeName, - upperCasePostTypeName, - }, + upperCasePostTypeName + } }) // scaffold setup @@ -76,8 +76,8 @@ const _postTypeBuilder = async ({ postTypeName, camelCasePostTypeName, pascalCasePostType, - upperCasePostTypeName, - }, + upperCasePostTypeName + } }) } @@ -112,7 +112,7 @@ const buildPostType = async () => { postTypePath, postTypeName, upperSingularPostTypeName, - upperPluralPostTypeName, + upperPluralPostTypeName }) } catch (e) { logs.error(e) diff --git a/cli/tasks/scaffold-wp/scaffold-wp.js b/cli/tasks/scaffold-wp/scaffold-wp.js index 4c802cb8..75325c44 100644 --- a/cli/tasks/scaffold-wp/scaffold-wp.js +++ b/cli/tasks/scaffold-wp/scaffold-wp.js @@ -12,20 +12,20 @@ import buildBlock from "./builders/block.js" const _scaffolders = [ { name: "Post Type", - exec: buildPostType, + exec: buildPostType }, { name: "Page", - exec: buildPage, + exec: buildPage }, { name: "Option Page", - exec: buildOptionPage, + exec: buildOptionPage }, { name: "Block", - exec: buildBlock, - }, + exec: buildBlock + } ] // ----------------------–----------------------–----------------------–-------- PUBLIC @@ -49,7 +49,7 @@ const wpScaffold = () => { name: "type", message: "What kind of component to create?", choices: scaffolderTypes, - pageSize: 20, + pageSize: 20 }).then(async (answer) => { // Get scaffolder index const scaffolderIndex = scaffolderTypes.indexOf(answer.type) diff --git a/cli/tasks/setup/modules/reset-git.js b/cli/tasks/setup/modules/reset-git.js index ec3c6504..2e51c1ae 100644 --- a/cli/tasks/setup/modules/reset-git.js +++ b/cli/tasks/setup/modules/reset-git.js @@ -13,7 +13,7 @@ export default async ({ gitDir, fakeMode } = {}) => const removeGitAnswer = await Inquirer.prompt({ type: "confirm", name: "removeGit", - message: "Do you want to reset the current .git and re-init it?", + message: "Do you want to reset the current .git and re-init it?" }) log("removeGitAnswer", removeGitAnswer["removeGit"]) diff --git a/cli/tasks/setup/modules/setup-package-json.js b/cli/tasks/setup/modules/setup-package-json.js index 8cd2b98c..b3e7c1ea 100644 --- a/cli/tasks/setup/modules/setup-package-json.js +++ b/cli/tasks/setup/modules/setup-package-json.js @@ -23,7 +23,7 @@ export default async ({ packageJson, defaultProjectName, fakeMode } = {}) => { projectVersion, projectName, projectAuthor, - projectDescription, + projectDescription }) // Get package infos if this is the first setup @@ -41,7 +41,7 @@ export default async ({ packageJson, defaultProjectName, fakeMode } = {}) => { await Inquirer.prompt({ type: "input", message: "What's the project name? (dash-case)", - name: "projectName", + name: "projectName" }).then((answer) => (projectName = changeCase.kebabCase(answer.projectName))) log("> new project name:", projectName) @@ -49,7 +49,7 @@ export default async ({ packageJson, defaultProjectName, fakeMode } = {}) => { await Inquirer.prompt({ type: "input", message: "What's the author name?", - name: "projectAuthor", + name: "projectAuthor" }).then((answer) => (projectAuthor = answer.projectAuthor)) log("> new project author:", projectAuthor) @@ -57,7 +57,7 @@ export default async ({ packageJson, defaultProjectName, fakeMode } = {}) => { await Inquirer.prompt({ type: "input", message: "What's the descripton?", - name: "projectDescription", + name: "projectDescription" }).then((answer) => (projectDescription = answer.projectDescription)) log("> new project description:", projectDescription) @@ -88,7 +88,7 @@ export default async ({ packageJson, defaultProjectName, fakeMode } = {}) => { log("Promise is resolve fn pass new package properties:", { projectName, projectAuthor, - projectDescription, + projectDescription }) resolve({ projectName, projectAuthor, projectDescription }) diff --git a/cli/tasks/setup/modules/setup-readme.js b/cli/tasks/setup/modules/setup-readme.js index 2428df32..b07af659 100644 --- a/cli/tasks/setup/modules/setup-readme.js +++ b/cli/tasks/setup/modules/setup-readme.js @@ -18,7 +18,7 @@ export default async ({ readmeFrameworkFileName = "README-framework.md", projectName = "[ PROJECT NAME ]", projectAuthor = "[ PROJECT AUTHOR ]", - projectDescription = "[ PROJECT DESCRIPTION ]", + projectDescription = "[ PROJECT DESCRIPTION ]" }) => { return new Promise(async (resolve) => { logs.start( @@ -73,7 +73,7 @@ export default async ({ ) }) resolve(fileContent) - }), + }) }) } else { log("FakeMode is activated, do nothing.") diff --git a/cli/tasks/setup/setup.js b/cli/tasks/setup/setup.js index b1361d4c..5b92bcf0 100644 --- a/cli/tasks/setup/setup.js +++ b/cli/tasks/setup/setup.js @@ -28,7 +28,7 @@ const setup = () => const { projectName, projectDescription, projectAuthor } = await setupPackageJson({ packageJson, defaultProjectName: "chersite", - fakeMode: config.setupFakeMode, + fakeMode: config.setupFakeMode }) // setup readme @@ -38,19 +38,19 @@ const setup = () => fakeMode: config.setupFakeMode, projectName, projectDescription, - projectAuthor, + projectAuthor }) // create install file await createInstallFile({ installFilePath: config.installFile, - fakeMode: config.setupFakeMode, + fakeMode: config.setupFakeMode }) // remove unused files and directories await resetGit({ gitDir: path.resolve(".git"), - fakeMode: config.setupFakeMode, + fakeMode: config.setupFakeMode }) console.log("")