Skip to content

Commit

Permalink
Reorganize warehouse and apps (#993)
Browse files Browse the repository at this point in the history
* move frontend files

* move hasura files

* move cloudquery

* move dbt

* remove indexer

* move oso python root package files

* Add warehouse common

* update root dir files

* move docs

* update

* update eslint

* update hasura dbt directory

* fix eslints

* fix eslint

* Update gitignore ref
  • Loading branch information
ravenac95 committed Mar 8, 2024
1 parent 6cff388 commit 912cdf4
Show file tree
Hide file tree
Showing 632 changed files with 543 additions and 43,359 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ jobs:
# Temporarily include this separately. Eventually this should all be part of lint
- name: Lint SQL
run: |
poetry run sqlfluff lint --dialect bigquery ./dbt/models
poetry run sqlfluff lint --dialect bigquery ./warehouse/dbt/models
if: always()

- name: Test
Expand Down
7 changes: 7 additions & 0 deletions apps/docs/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"root": false,
"extends": ["../../.eslintrc.js"],
"parserOptions": {
"project": ["./apps/docs/tsconfig.json"]
}
}
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.
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.
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.
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.
4 changes: 2 additions & 2 deletions docs/package.json → apps/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"write-translations": "docusaurus write-translations",
"write-heading-ids": "docusaurus write-heading-ids",
"lint": "pnpm lint:eslint && pnpm lint:prettier",
"lint:eslint": "eslint --ignore-path ../.gitignore --ignore-path .gitignore --max-warnings 0 .",
"lint:prettier": "prettier --ignore-path ../.gitignore --ignore-path .gitignore --log-level warn --check **/*.{js,jsx,ts,tsx,sol,md,json}"
"lint:eslint": "eslint --ignore-path ../../.gitignore --ignore-path .gitignore --max-warnings 0 .",
"lint:prettier": "prettier --ignore-path ../../.gitignore --ignore-path .gitignore --log-level warn --check **/*.{js,jsx,ts,tsx,sol,md,json}"
},
"dependencies": {
"@docusaurus/core": "3.1.0",
Expand Down
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.
File renamed without changes.
4 changes: 2 additions & 2 deletions frontend/.eslintrc.json → apps/frontend/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"root": false,
"extends": ["../.eslintrc.js", "next/core-web-vitals"],
"extends": ["../../.eslintrc.js", "next/core-web-vitals"],
"parser": "@typescript-eslint/parser",
"parserOptions": {
"project": ["./frontend/tsconfig.json"]
"project": ["./apps/frontend/tsconfig.json"]
},
"rules": {
"react-hooks/exhaustive-deps": "off",
Expand Down
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.
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.
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.
4 changes: 2 additions & 2 deletions frontend/package.json → apps/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"graphql:compile": "graphql-codegen",
"graphql:watch": "graphql-codegen -w",
"lint": "tsc --noEmit && next lint && pnpm lint:eslint && pnpm lint:prettier",
"lint:eslint": "eslint --ignore-path ../.gitignore --ignore-path .gitignore --max-warnings 0 .",
"lint:prettier": "prettier --ignore-path ../.gitignore --ignore-path .gitignore --log-level warn --check **/*.{js,jsx,ts,tsx,sol,md,json}",
"lint:eslint": "eslint --ignore-path ../../.gitignore --ignore-path .gitignore --max-warnings 0 .",
"lint:prettier": "prettier --ignore-path ../../.gitignore --ignore-path .gitignore --log-level warn --check **/*.{js,jsx,ts,tsx,sol,md,json}",
"start": "next start",
"supabase:gentypes": "supabase gen types typescript --project-id 'dfjsvzdlhmtnsqbfmcpm' --schema public > lib/types/supabase.ts",
"test": "jest --ci --passWithNoTests",
Expand Down
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.
7 changes: 7 additions & 0 deletions apps/hasura/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"extends": ["../../.eslintrc.js"],
"root": false,
"parserOptions": {
"project": ["./apps/hasura/tsconfig.json"]
}
}
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.
4 changes: 2 additions & 2 deletions hasura/package.json → apps/hasura/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"scripts": {
"build": "tsc && pnpm metadata:genTables",
"lint": "tsc --noEmit && pnpm lint:eslint && pnpm lint:prettier",
"lint:eslint": "eslint --ignore-path ../.gitignore --max-warnings 0 .",
"lint:prettier": "prettier --ignore-path ../.gitignore --log-level warn --check **/*.{js,jsx,ts,tsx,sol,md,json}",
"lint:eslint": "eslint --ignore-path ../../.gitignore --max-warnings 0 .",
"lint:prettier": "prettier --ignore-path ../../.gitignore --log-level warn --check **/*.{js,jsx,ts,tsx,sol,md,json}",
"metadata:genTables": "node --loader ts-node/esm src/genTables.ts",
"metadata:pull": "hasura metadata export",
"metadata:reload": "hasura metadata reload",
Expand Down
5 changes: 4 additions & 1 deletion hasura/src/genTables.ts → apps/hasura/src/genTables.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ const __dirname = path.dirname(__filename);
// YAML file extension
const EXTENSION = ".yaml";
// Recursively scan this directory for database tables
const modelDir = path.resolve(__dirname, "../../dbt/models/marts/");
const modelDir = path.resolve(
__dirname,
"../../../warehouse/dbt/models/marts/",
);
// Where to store all table configs
const tablesDir = path.resolve(
__dirname,
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion cloudquery/README.md

This file was deleted.

12 changes: 6 additions & 6 deletions dbt_project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ profile: 'opensource_observer'
# These configurations specify where dbt should look for different types of files.
# The `model-paths` config, for example, states that models in this project can be
# found in the "models/" directory. You probably won't need to change these!
model-paths: ["dbt/models"]
analysis-paths: ["dbt/analyses"]
test-paths: ["dbt/tests"]
seed-paths: ["dbt/seeds"]
macro-paths: ["dbt/macros"]
snapshot-paths: ["dbt/snapshots"]
model-paths: ["warehouse/dbt/models"]
analysis-paths: ["warehouse/dbt/analyses"]
test-paths: ["warehouse/dbt/tests"]
seed-paths: ["warehouse/dbt/seeds"]
macro-paths: ["warehouse/dbt/macros"]
snapshot-paths: ["warehouse/dbt/snapshots"]

clean-targets: # directories to be removed by `dbt clean`
- "target"
Expand Down
7 changes: 0 additions & 7 deletions docs/.eslintrc.json

This file was deleted.

7 changes: 0 additions & 7 deletions hasura/.eslintrc.json

This file was deleted.

20 changes: 0 additions & 20 deletions indexer/.env.example

This file was deleted.

Loading

0 comments on commit 912cdf4

Please sign in to comment.