Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: netlify
Browse files Browse the repository at this point in the history
yann510 committed Sep 12, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent e182dd1 commit b05b107
Showing 40 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-package.yml
Original file line number Diff line number Diff line change
@@ -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 }}
2 changes: 1 addition & 1 deletion benchmark/src/main.ts
Original file line number Diff line number Diff line change
@@ -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())
2 changes: 1 addition & 1 deletion apps/web-app/.eslintrc.json → web-app/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": ["plugin:@nx/react", "../../.eslintrc.json"],
"extends": ["plugin:@nx/react", "../.eslintrc.json"],
"ignorePatterns": ["!**/*"],
"overrides": [
{
4 changes: 2 additions & 2 deletions apps/web-app/jest.config.ts → web-app/jest.config.ts
Original file line number Diff line number Diff line change
@@ -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',
}
18 changes: 9 additions & 9 deletions apps/web-app/project.json → web-app/project.json
Original file line number Diff line number Diff line change
@@ -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": {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/web-app/src/index.html → web-app/src/index.html
Original file line number Diff line number Diff line change
@@ -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>
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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()

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -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": [
2 changes: 1 addition & 1 deletion apps/web-app/tsconfig.json → web-app/tsconfig.json
Original file line number Diff line number Diff line change
@@ -16,5 +16,5 @@
"path": "./tsconfig.spec.json"
}
],
"extends": "../../tsconfig.base.json"
"extends": "../tsconfig.base.json"
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../dist/out-tsc",
"outDir": "../dist/out-tsc",
"module": "commonjs",
"types": ["jest", "node"]
},

0 comments on commit b05b107

Please sign in to comment.