diff --git a/.eslintrc.yml b/.eslintrc.yml index e94131f4..2b2d2154 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -34,9 +34,9 @@ settings: alias: map: - - '~/components' - - './src/components' + - './apps/client/components' - - '~/pages' - - './src/pages' + - './apps/client/pages' - - '~/services' - - './src/services' + - './apps/client/services' extensions: ['.ts', '.js', '.jsx', '.ts', '.tsx', '.json'] diff --git a/.github/labeler.yml b/.github/labeler.yml index 7470e4ea..2212baad 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -8,16 +8,16 @@ repo: # Add 'test' label to any change to *.spec.js files within the source dir test: - - src/**/*.spec.js + - apps/**/*.spec.js # Add 'source' label to any change to src files within the source dir EXCEPT for the docs sub-folder source: - - any: ['src/**', '!src/docs/*'] + - any: ['apps/**', '!apps/docs/*'] # Add 'frontend` label to any change to *.js files as long as the `main.js` hasn't changed frontend: - - any: ['src/**/*.js'] - all: ['!src/main.js'] + - any: ['apps/client/**/*.ts', 'apps/client/**/*.tsx'] + all: ['!apps/client/index.tsx'] # Add the 'AnyChange' label to any changes within the entire repository if the 'dot' option is set to 'false' AnyChange: diff --git a/src/components/alert.tsx b/apps/client/components/alert.tsx similarity index 100% rename from src/components/alert.tsx rename to apps/client/components/alert.tsx diff --git a/src/components/app.tsx b/apps/client/components/app.tsx similarity index 100% rename from src/components/app.tsx rename to apps/client/components/app.tsx diff --git a/src/components/breadcrumbs.css.ts b/apps/client/components/breadcrumbs.css.ts similarity index 100% rename from src/components/breadcrumbs.css.ts rename to apps/client/components/breadcrumbs.css.ts diff --git a/src/components/breadcrumbs.tsx b/apps/client/components/breadcrumbs.tsx similarity index 100% rename from src/components/breadcrumbs.tsx rename to apps/client/components/breadcrumbs.tsx diff --git a/src/components/header.tsx b/apps/client/components/header.tsx similarity index 100% rename from src/components/header.tsx rename to apps/client/components/header.tsx diff --git a/src/components/input.stories.ts b/apps/client/components/input.stories.ts similarity index 100% rename from src/components/input.stories.ts rename to apps/client/components/input.stories.ts diff --git a/src/components/input.tsx b/apps/client/components/input.tsx similarity index 100% rename from src/components/input.tsx rename to apps/client/components/input.tsx diff --git a/src/components/post-form.stories.ts b/apps/client/components/post-form.stories.ts similarity index 100% rename from src/components/post-form.stories.ts rename to apps/client/components/post-form.stories.ts diff --git a/src/components/post-form.tsx b/apps/client/components/post-form.tsx similarity index 100% rename from src/components/post-form.tsx rename to apps/client/components/post-form.tsx diff --git a/src/components/post-preview.stories.ts b/apps/client/components/post-preview.stories.ts similarity index 100% rename from src/components/post-preview.stories.ts rename to apps/client/components/post-preview.stories.ts diff --git a/src/components/post-preview.tsx b/apps/client/components/post-preview.tsx similarity index 100% rename from src/components/post-preview.tsx rename to apps/client/components/post-preview.tsx diff --git a/src/components/search.tsx b/apps/client/components/search.tsx similarity index 100% rename from src/components/search.tsx rename to apps/client/components/search.tsx diff --git a/src/index.css b/apps/client/index.css similarity index 100% rename from src/index.css rename to apps/client/index.css diff --git a/src/index.tsx b/apps/client/index.tsx similarity index 100% rename from src/index.tsx rename to apps/client/index.tsx diff --git a/src/layouts/base-layout.tsx b/apps/client/layouts/base-layout.tsx similarity index 100% rename from src/layouts/base-layout.tsx rename to apps/client/layouts/base-layout.tsx diff --git a/src/mocks/authors.json b/apps/client/mocks/authors.json similarity index 100% rename from src/mocks/authors.json rename to apps/client/mocks/authors.json diff --git a/src/mocks/browser.ts b/apps/client/mocks/browser.ts similarity index 100% rename from src/mocks/browser.ts rename to apps/client/mocks/browser.ts diff --git a/src/mocks/handlers.ts b/apps/client/mocks/handlers.ts similarity index 100% rename from src/mocks/handlers.ts rename to apps/client/mocks/handlers.ts diff --git a/src/mocks/posts.json b/apps/client/mocks/posts.json similarity index 100% rename from src/mocks/posts.json rename to apps/client/mocks/posts.json diff --git a/src/news/amazon-scout.png b/apps/client/news/amazon-scout.png similarity index 100% rename from src/news/amazon-scout.png rename to apps/client/news/amazon-scout.png diff --git a/src/pages/[all].tsx b/apps/client/pages/[all].tsx similarity index 100% rename from src/pages/[all].tsx rename to apps/client/pages/[all].tsx diff --git a/src/pages/index.tsx b/apps/client/pages/index.tsx similarity index 100% rename from src/pages/index.tsx rename to apps/client/pages/index.tsx diff --git a/src/pages/posts/[postId]/edit.stories.ts b/apps/client/pages/posts/[postId]/edit.stories.ts similarity index 100% rename from src/pages/posts/[postId]/edit.stories.ts rename to apps/client/pages/posts/[postId]/edit.stories.ts diff --git a/src/pages/posts/[postId]/edit.tsx b/apps/client/pages/posts/[postId]/edit.tsx similarity index 100% rename from src/pages/posts/[postId]/edit.tsx rename to apps/client/pages/posts/[postId]/edit.tsx diff --git a/src/pages/posts/[postId]/index.tsx b/apps/client/pages/posts/[postId]/index.tsx similarity index 100% rename from src/pages/posts/[postId]/index.tsx rename to apps/client/pages/posts/[postId]/index.tsx diff --git a/src/pages/posts/new.tsx b/apps/client/pages/posts/new.tsx similarity index 100% rename from src/pages/posts/new.tsx rename to apps/client/pages/posts/new.tsx diff --git a/src/pages/users/[user-name].tsx b/apps/client/pages/users/[user-name].tsx similarity index 100% rename from src/pages/users/[user-name].tsx rename to apps/client/pages/users/[user-name].tsx diff --git a/src/services/db.ts b/apps/client/services/db.ts similarity index 100% rename from src/services/db.ts rename to apps/client/services/db.ts diff --git a/src/services/get-stories.ts b/apps/client/services/get-stories.ts similarity index 100% rename from src/services/get-stories.ts rename to apps/client/services/get-stories.ts diff --git a/src/services/timestamp-to-locale-string.test.ts b/apps/client/services/timestamp-to-locale-string.test.ts similarity index 100% rename from src/services/timestamp-to-locale-string.test.ts rename to apps/client/services/timestamp-to-locale-string.test.ts diff --git a/src/services/timestamp-to-locale-string.ts b/apps/client/services/timestamp-to-locale-string.ts similarity index 100% rename from src/services/timestamp-to-locale-string.ts rename to apps/client/services/timestamp-to-locale-string.ts diff --git a/src/stories/Introduction.mdx b/apps/client/stories/Introduction.mdx similarity index 100% rename from src/stories/Introduction.mdx rename to apps/client/stories/Introduction.mdx diff --git a/index.html b/index.html index 09dbf9c6..46f77b05 100644 --- a/index.html +++ b/index.html @@ -11,6 +11,6 @@
- + diff --git a/package.json b/package.json index d5a637da..5170b9ac 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "local-microblogging-client", "version": "2.12.1", "description": "Local Microblogging Frontend Client", - "main": "src/index.tsx", + "main": "apps/client/index.tsx", "homepage": "https://pure-js.github.io/local-microblogging-client/", "type": "module", "scripts": { @@ -16,7 +16,7 @@ "e2e": "playwright test", "deploy": "act -j publish", "release": "standard-version", - "lint": "eslint src/ --ext .tsx,.jsx,.js,.ts", + "lint": "eslint apps/client --ext .tsx,.jsx,.js,.ts", "storybook": "storybook dev -p 6006", "build-storybook": "storybook build", "format:check": "prettier --check .", diff --git a/tailwind.config.cjs b/tailwind.config.cjs index 98d5b6e2..3b49ce1d 100644 --- a/tailwind.config.cjs +++ b/tailwind.config.cjs @@ -1,7 +1,7 @@ /* eslint-disable import/no-extraneous-dependencies */ /* eslint-disable global-require */ module.exports = { - content: ['./src/**/*.{jsx,tsx}'], + content: ['./apps/**/*.{jsx,tsx}'], // theme: { // extend: {}, // }, diff --git a/tsconfig.json b/tsconfig.json index dda1df27..2c8b3b9a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,7 +8,7 @@ "rootDir": "./", "moduleResolution": "Node", "paths": { - "~/*": ["./src/*"] + "~/*": ["./apps/client/*"] }, "resolveJsonModule": true, "allowJs": false, @@ -22,5 +22,5 @@ "noImplicitAny": true, "skipLibCheck": true }, - "include": ["src", "vite-env.d.ts"] + "include": ["apps/client", "vite-env.d.ts"] } diff --git a/vite.config.ts b/vite.config.ts index 1918263f..f9dff98d 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -46,7 +46,7 @@ export default defineConfig({ alias: [ { find: '~/', - replacement: '/src/', + replacement: '/apps/client/', }, ], },