From b05b1076a1474bce0f1b1bd070ac93643c49a2ea Mon Sep 17 00:00:00 2001
From: Yann Thibodeau <y.thibodeau1@gmail.com>
Date: Mon, 11 Sep 2023 23:58:41 -0400
Subject: [PATCH] fix: netlify

---
 .github/workflows/publish-package.yml         |   2 +-
 benchmark/src/main.ts                         |   2 +-
 {apps/web-app => web-app}/.eslintrc.json      |   2 +-
 {apps/web-app => web-app}/jest.config.ts      |   4 ++--
 {apps/web-app => web-app}/project.json        |  18 +++++++++---------
 {apps/web-app => web-app}/rspack.config.js    |   0
 .../web-app => web-app}/src/assets/_redirects |   0
 .../src/assets/benchmarkResults.json          |   0
 .../src/assets/data-chunk-0.json              |   0
 .../src/assets/data-chunk-1.json              |   0
 .../src/assets/data-chunk-2.json              |   0
 .../src/assets/data-chunk-3.json              |   0
 .../src/assets/data-chunk-4.json              |   0
 .../src/assets/data-chunk-5.json              |   0
 .../src/assets/data-chunk-6.json              |   0
 .../src/assets/data-chunk-7.json              |   0
 .../src/assets/data-chunk-8.json              |   0
 .../src/assets/data-chunk-9.json              |   0
 .../web-app => web-app}/src/assets/index.html |   2 +-
 .../src/assets/manifest.json                  |   0
 .../web-app => web-app}/src/assets/robots.txt |   0
 .../src/components/app-layout.tsx             |   0
 .../src/components/app.tsx                    |   0
 .../src/components/backdrop-loader.tsx        |   0
 .../src/components/data-table.tsx             |   0
 {apps/web-app => web-app}/src/favicon.ico     | Bin
 {apps/web-app => web-app}/src/index.css       |   0
 {apps/web-app => web-app}/src/index.html      |   2 +-
 {apps/web-app => web-app}/src/main.tsx        |   0
 {apps/web-app => web-app}/src/models/data.ts  |   0
 .../src/pages/benchmark-page.tsx              |   2 +-
 .../src/pages/benchmark-version-page.tsx      |   0
 .../src/pages/demo-page.tsx                   |   2 +-
 .../src/react-app-env.d.ts                    |   0
 .../web-app => web-app}/src/serviceWorker.ts  |   0
 {apps/web-app => web-app}/src/setupTests.ts   |   0
 {apps/web-app => web-app}/src/styles.css      |   0
 {apps/web-app => web-app}/tsconfig.app.json   |   2 +-
 {apps/web-app => web-app}/tsconfig.json       |   2 +-
 {apps/web-app => web-app}/tsconfig.spec.json  |   2 +-
 40 files changed, 21 insertions(+), 21 deletions(-)
 rename {apps/web-app => web-app}/.eslintrc.json (81%)
 rename {apps/web-app => web-app}/jest.config.ts (76%)
 rename {apps/web-app => web-app}/project.json (71%)
 rename {apps/web-app => web-app}/rspack.config.js (100%)
 rename {apps/web-app => web-app}/src/assets/_redirects (100%)
 rename {apps/web-app => web-app}/src/assets/benchmarkResults.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-0.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-1.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-2.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-3.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-4.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-5.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-6.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-7.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-8.json (100%)
 rename {apps/web-app => web-app}/src/assets/data-chunk-9.json (100%)
 rename {apps/web-app => web-app}/src/assets/index.html (94%)
 rename {apps/web-app => web-app}/src/assets/manifest.json (100%)
 rename {apps/web-app => web-app}/src/assets/robots.txt (100%)
 rename {apps/web-app => web-app}/src/components/app-layout.tsx (100%)
 rename {apps/web-app => web-app}/src/components/app.tsx (100%)
 rename {apps/web-app => web-app}/src/components/backdrop-loader.tsx (100%)
 rename {apps/web-app => web-app}/src/components/data-table.tsx (100%)
 rename {apps/web-app => web-app}/src/favicon.ico (100%)
 rename {apps/web-app => web-app}/src/index.css (100%)
 rename {apps/web-app => web-app}/src/index.html (80%)
 rename {apps/web-app => web-app}/src/main.tsx (100%)
 rename {apps/web-app => web-app}/src/models/data.ts (100%)
 rename {apps/web-app => web-app}/src/pages/benchmark-page.tsx (100%)
 rename {apps/web-app => web-app}/src/pages/benchmark-version-page.tsx (100%)
 rename {apps/web-app => web-app}/src/pages/demo-page.tsx (100%)
 rename {apps/web-app => web-app}/src/react-app-env.d.ts (100%)
 rename {apps/web-app => web-app}/src/serviceWorker.ts (100%)
 rename {apps/web-app => web-app}/src/setupTests.ts (100%)
 rename {apps/web-app => web-app}/src/styles.css (100%)
 rename {apps/web-app => web-app}/tsconfig.app.json (92%)
 rename {apps/web-app => web-app}/tsconfig.json (88%)
 rename {apps/web-app => web-app}/tsconfig.spec.json (92%)

diff --git a/.github/workflows/publish-package.yml b/.github/workflows/publish-package.yml
index 6e1bf3e..e521165 100644
--- a/.github/workflows/publish-package.yml
+++ b/.github/workflows/publish-package.yml
@@ -61,7 +61,7 @@ jobs:
       - name: Deploy to netlify
         uses: netlify/actions/cli@master
         with:
-          args: deploy --dir=dist/apps/web-app --prod --site=ss-search --filter=dist/apps/web-app
+          args: deploy --dir=dist/web-app --prod
         env:
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
diff --git a/benchmark/src/main.ts b/benchmark/src/main.ts
index 372033e..ed1fd57 100644
--- a/benchmark/src/main.ts
+++ b/benchmark/src/main.ts
@@ -15,7 +15,7 @@ export interface BenchmarkResult {
   runsSampled: number
 }
 
-const benchmarkResultPath = `${__dirname}/../../../../apps/web-app/src/assets/benchmarkResults.json`
+const benchmarkResultPath = `${__dirname}/../../../../web-app/src/assets/benchmarkResults.json`
 
 async function main() {
   const packageVersions: string[] = JSON.parse(execSync('npm view ss-search versions --json').toString())
diff --git a/apps/web-app/.eslintrc.json b/web-app/.eslintrc.json
similarity index 81%
rename from apps/web-app/.eslintrc.json
rename to web-app/.eslintrc.json
index a39ac5d..c5bdb41 100644
--- a/apps/web-app/.eslintrc.json
+++ b/web-app/.eslintrc.json
@@ -1,5 +1,5 @@
 {
-  "extends": ["plugin:@nx/react", "../../.eslintrc.json"],
+  "extends": ["plugin:@nx/react", "../.eslintrc.json"],
   "ignorePatterns": ["!**/*"],
   "overrides": [
     {
diff --git a/apps/web-app/jest.config.ts b/web-app/jest.config.ts
similarity index 76%
rename from apps/web-app/jest.config.ts
rename to web-app/jest.config.ts
index d8dc9f8..ce53b8f 100644
--- a/apps/web-app/jest.config.ts
+++ b/web-app/jest.config.ts
@@ -1,11 +1,11 @@
 /* eslint-disable */
 export default {
   displayName: 'web-app',
-  preset: '../../jest.preset.js',
+  preset: '../jest.preset.js',
   transform: {
     '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
     '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
-  coverageDirectory: '../../coverage/apps/web-app',
+  coverageDirectory: '../coverage/web-app',
 }
diff --git a/apps/web-app/project.json b/web-app/project.json
similarity index 71%
rename from apps/web-app/project.json
rename to web-app/project.json
index cdaeda5..a699a7b 100644
--- a/apps/web-app/project.json
+++ b/web-app/project.json
@@ -1,7 +1,7 @@
 {
   "name": "web-app",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/web-app/src",
+  "$schema": "../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "web-app/src",
   "projectType": "application",
   "targets": {
     "build": {
@@ -10,11 +10,11 @@
       "defaultConfiguration": "production",
       "options": {
         "target": "web",
-        "outputPath": "dist/apps/web-app",
-        "main": "apps/web-app/src/main.tsx",
-        "tsConfig": "apps/web-app/tsconfig.app.json",
-        "rspackConfig": "apps/web-app/rspack.config.js",
-        "assets": ["apps/web-app/src/favicon.ico", "apps/web-app/src/assets"]
+        "outputPath": "dist/web-app",
+        "main": "web-app/src/main.tsx",
+        "tsConfig": "web-app/tsconfig.app.json",
+        "rspackConfig": "web-app/rspack.config.js",
+        "assets": ["web-app/src/favicon.ico", "web-app/src/assets"]
       },
       "configurations": {
         "development": {
@@ -43,14 +43,14 @@
       "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
-        "lintFilePatterns": ["apps/web-app/**/*.{ts,tsx,js,jsx}"]
+        "lintFilePatterns": ["web-app/**/*.{ts,tsx,js,jsx}"]
       }
     },
     "test": {
       "executor": "@nx/jest:jest",
       "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
       "options": {
-        "jestConfig": "apps/web-app/jest.config.ts",
+        "jestConfig": "web-app/jest.config.ts",
         "passWithNoTests": true
       },
       "configurations": {
diff --git a/apps/web-app/rspack.config.js b/web-app/rspack.config.js
similarity index 100%
rename from apps/web-app/rspack.config.js
rename to web-app/rspack.config.js
diff --git a/apps/web-app/src/assets/_redirects b/web-app/src/assets/_redirects
similarity index 100%
rename from apps/web-app/src/assets/_redirects
rename to web-app/src/assets/_redirects
diff --git a/apps/web-app/src/assets/benchmarkResults.json b/web-app/src/assets/benchmarkResults.json
similarity index 100%
rename from apps/web-app/src/assets/benchmarkResults.json
rename to web-app/src/assets/benchmarkResults.json
diff --git a/apps/web-app/src/assets/data-chunk-0.json b/web-app/src/assets/data-chunk-0.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-0.json
rename to web-app/src/assets/data-chunk-0.json
diff --git a/apps/web-app/src/assets/data-chunk-1.json b/web-app/src/assets/data-chunk-1.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-1.json
rename to web-app/src/assets/data-chunk-1.json
diff --git a/apps/web-app/src/assets/data-chunk-2.json b/web-app/src/assets/data-chunk-2.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-2.json
rename to web-app/src/assets/data-chunk-2.json
diff --git a/apps/web-app/src/assets/data-chunk-3.json b/web-app/src/assets/data-chunk-3.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-3.json
rename to web-app/src/assets/data-chunk-3.json
diff --git a/apps/web-app/src/assets/data-chunk-4.json b/web-app/src/assets/data-chunk-4.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-4.json
rename to web-app/src/assets/data-chunk-4.json
diff --git a/apps/web-app/src/assets/data-chunk-5.json b/web-app/src/assets/data-chunk-5.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-5.json
rename to web-app/src/assets/data-chunk-5.json
diff --git a/apps/web-app/src/assets/data-chunk-6.json b/web-app/src/assets/data-chunk-6.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-6.json
rename to web-app/src/assets/data-chunk-6.json
diff --git a/apps/web-app/src/assets/data-chunk-7.json b/web-app/src/assets/data-chunk-7.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-7.json
rename to web-app/src/assets/data-chunk-7.json
diff --git a/apps/web-app/src/assets/data-chunk-8.json b/web-app/src/assets/data-chunk-8.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-8.json
rename to web-app/src/assets/data-chunk-8.json
diff --git a/apps/web-app/src/assets/data-chunk-9.json b/web-app/src/assets/data-chunk-9.json
similarity index 100%
rename from apps/web-app/src/assets/data-chunk-9.json
rename to web-app/src/assets/data-chunk-9.json
diff --git a/apps/web-app/src/assets/index.html b/web-app/src/assets/index.html
similarity index 94%
rename from apps/web-app/src/assets/index.html
rename to web-app/src/assets/index.html
index b95648f..4be0663 100644
--- a/apps/web-app/src/assets/index.html
+++ b/web-app/src/assets/index.html
@@ -15,7 +15,7 @@
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/apps/web-app/src/assets/manifest.jsonsrc/assets/manifest.json" />
+    <link rel="manifest" href="%PUBLIC_URL%/web-app/src/assets/manifest.jsonsrc/assets/manifest.json" />
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/apps/web-app/src/assets/manifest.json b/web-app/src/assets/manifest.json
similarity index 100%
rename from apps/web-app/src/assets/manifest.json
rename to web-app/src/assets/manifest.json
diff --git a/apps/web-app/src/assets/robots.txt b/web-app/src/assets/robots.txt
similarity index 100%
rename from apps/web-app/src/assets/robots.txt
rename to web-app/src/assets/robots.txt
diff --git a/apps/web-app/src/components/app-layout.tsx b/web-app/src/components/app-layout.tsx
similarity index 100%
rename from apps/web-app/src/components/app-layout.tsx
rename to web-app/src/components/app-layout.tsx
diff --git a/apps/web-app/src/components/app.tsx b/web-app/src/components/app.tsx
similarity index 100%
rename from apps/web-app/src/components/app.tsx
rename to web-app/src/components/app.tsx
diff --git a/apps/web-app/src/components/backdrop-loader.tsx b/web-app/src/components/backdrop-loader.tsx
similarity index 100%
rename from apps/web-app/src/components/backdrop-loader.tsx
rename to web-app/src/components/backdrop-loader.tsx
diff --git a/apps/web-app/src/components/data-table.tsx b/web-app/src/components/data-table.tsx
similarity index 100%
rename from apps/web-app/src/components/data-table.tsx
rename to web-app/src/components/data-table.tsx
diff --git a/apps/web-app/src/favicon.ico b/web-app/src/favicon.ico
similarity index 100%
rename from apps/web-app/src/favicon.ico
rename to web-app/src/favicon.ico
diff --git a/apps/web-app/src/index.css b/web-app/src/index.css
similarity index 100%
rename from apps/web-app/src/index.css
rename to web-app/src/index.css
diff --git a/apps/web-app/src/index.html b/web-app/src/index.html
similarity index 80%
rename from apps/web-app/src/index.html
rename to web-app/src/index.html
index aced339..f30f876 100644
--- a/apps/web-app/src/index.html
+++ b/web-app/src/index.html
@@ -6,7 +6,7 @@
     <base href="/" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link rel="icon" type="image/x-icon" href="favicon.ico" />
+    <link rel="icon" type="image/x-icon" href='favicon.ico' />
   </head>
   <body>
     <div id="root"></div>
diff --git a/apps/web-app/src/main.tsx b/web-app/src/main.tsx
similarity index 100%
rename from apps/web-app/src/main.tsx
rename to web-app/src/main.tsx
diff --git a/apps/web-app/src/models/data.ts b/web-app/src/models/data.ts
similarity index 100%
rename from apps/web-app/src/models/data.ts
rename to web-app/src/models/data.ts
diff --git a/apps/web-app/src/pages/benchmark-page.tsx b/web-app/src/pages/benchmark-page.tsx
similarity index 100%
rename from apps/web-app/src/pages/benchmark-page.tsx
rename to web-app/src/pages/benchmark-page.tsx
index 3730fa5..8e7d938 100644
--- a/apps/web-app/src/pages/benchmark-page.tsx
+++ b/web-app/src/pages/benchmark-page.tsx
@@ -17,11 +17,11 @@ import { CircularProgress } from '@mui/material'
 import lunr from 'lunr'
 import * as JsSearch from 'js-search'
 import { BackdropProgress } from '../components/backdrop-loader'
-import { indexDocuments, search, tokenize } from '@yann510/ss-search'
 import { makeStyles } from 'tss-react/mui'
 
 import fuzzysort from 'fuzzysort'
 import Flexsearch from 'flexsearch'
+import { indexDocuments, search, tokenize } from '@yann510/ss-search'
 
 interface BenchmarkResult {
   libraryName: string
diff --git a/apps/web-app/src/pages/benchmark-version-page.tsx b/web-app/src/pages/benchmark-version-page.tsx
similarity index 100%
rename from apps/web-app/src/pages/benchmark-version-page.tsx
rename to web-app/src/pages/benchmark-version-page.tsx
diff --git a/apps/web-app/src/pages/demo-page.tsx b/web-app/src/pages/demo-page.tsx
similarity index 100%
rename from apps/web-app/src/pages/demo-page.tsx
rename to web-app/src/pages/demo-page.tsx
index 0cedaff..14e7958 100644
--- a/apps/web-app/src/pages/demo-page.tsx
+++ b/web-app/src/pages/demo-page.tsx
@@ -6,8 +6,8 @@ import React from 'react'
 import { debounce } from 'lodash'
 import { Data } from '../models/data'
 import DataTable from '../components/data-table'
-import { indexDocuments, search, tokenize } from '@yann510/ss-search'
 import { makeStyles } from 'tss-react/mui'
+import { indexDocuments, search, tokenize } from '@yann510/ss-search'
 
 let startTime = performance.now()
 
diff --git a/apps/web-app/src/react-app-env.d.ts b/web-app/src/react-app-env.d.ts
similarity index 100%
rename from apps/web-app/src/react-app-env.d.ts
rename to web-app/src/react-app-env.d.ts
diff --git a/apps/web-app/src/serviceWorker.ts b/web-app/src/serviceWorker.ts
similarity index 100%
rename from apps/web-app/src/serviceWorker.ts
rename to web-app/src/serviceWorker.ts
diff --git a/apps/web-app/src/setupTests.ts b/web-app/src/setupTests.ts
similarity index 100%
rename from apps/web-app/src/setupTests.ts
rename to web-app/src/setupTests.ts
diff --git a/apps/web-app/src/styles.css b/web-app/src/styles.css
similarity index 100%
rename from apps/web-app/src/styles.css
rename to web-app/src/styles.css
diff --git a/apps/web-app/tsconfig.app.json b/web-app/tsconfig.app.json
similarity index 92%
rename from apps/web-app/tsconfig.app.json
rename to web-app/tsconfig.app.json
index 07f1e6c..a8c1e84 100644
--- a/apps/web-app/tsconfig.app.json
+++ b/web-app/tsconfig.app.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../dist/out-tsc",
     "types": ["node", "@nx/react/typings/cssmodule.d.ts", "@nx/react/typings/image.d.ts"]
   },
   "exclude": [
diff --git a/apps/web-app/tsconfig.json b/web-app/tsconfig.json
similarity index 88%
rename from apps/web-app/tsconfig.json
rename to web-app/tsconfig.json
index f7f67e5..7289ec9 100644
--- a/apps/web-app/tsconfig.json
+++ b/web-app/tsconfig.json
@@ -16,5 +16,5 @@
       "path": "./tsconfig.spec.json"
     }
   ],
-  "extends": "../../tsconfig.base.json"
+  "extends": "../tsconfig.base.json"
 }
diff --git a/apps/web-app/tsconfig.spec.json b/web-app/tsconfig.spec.json
similarity index 92%
rename from apps/web-app/tsconfig.spec.json
rename to web-app/tsconfig.spec.json
index 6fc7288..f9ae859 100644
--- a/apps/web-app/tsconfig.spec.json
+++ b/web-app/tsconfig.spec.json
@@ -1,7 +1,7 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../dist/out-tsc",
+    "outDir": "../dist/out-tsc",
     "module": "commonjs",
     "types": ["jest", "node"]
   },