refactor: move apps/ to packages/

demvsystems · Jul 21, 2022 · ed59f82 · ed59f82
1 parent cd13a35
commit ed59f82
Show file tree

Hide file tree

Showing 34 changed files with 19 additions and 211 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,6 @@
 module.exports = {
   extends: [
-    './apps/base',
-    // './apps/typescript',
+    './packages/base'
   ],
   rules: {
     'unicorn/prefer-module': 'off',

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - main
     paths:
-      - 'apps/*'
+      - 'packages/*'
       - '.changeset/*.md'
   workflow_dispatch:
     inputs:

diff --git a/.gitignore b/.gitignore
@@ -22,7 +22,4 @@ yarn-error.log*
 .env.test.local
 .env.production.local
 
-# turbo
-.turbo
-
 .eslintcache
diff --git a/apps/typescript/tsconfig.json b/apps/typescript/tsconfig.json
diff --git a/package.json b/package.json
@@ -40,8 +40,7 @@
     "@commitlint/config-conventional": "17.0.3",
     "commitlint": "17.0.3",
     "eslint": "^8",
-    "husky": "8.0.1",
-    "turbo": "^1.3.1"
+    "husky": "8.0.1"
   },
   "packageManager": "[email protected]",
   "dependencies": {

diff --git a/apps/base/CHANGELOG.md → packages/base/CHANGELOG.md b/apps/base/CHANGELOG.md → packages/base/CHANGELOG.md
diff --git a/apps/base/LICENSE → packages/base/LICENSE b/apps/base/LICENSE → packages/base/LICENSE
diff --git a/packages/environment/index.js → packages/base/enviroment.js b/packages/environment/index.js → packages/base/enviroment.js
diff --git a/apps/base/index.js → packages/base/index.js b/apps/base/index.js → packages/base/index.js
@@ -1,4 +1,4 @@
-const env = require('environment');
+const environment = require('./enviroment');
 
 module.exports = {
   extends: [
@@ -15,5 +15,5 @@ module.exports = {
     // TODO: extract testing cfg
     './rules/jest',
   ],
-  env,
+  env: environment,
 };
diff --git a/apps/base/package.json → packages/base/package.json b/apps/base/package.json → packages/base/package.json
@@ -41,7 +41,6 @@
     "node": "^14 || >=16"
   },
   "dependencies": {
-    "environment": "workspace:*",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import": "^2.26.0",

diff --git a/apps/base/rules/base.js → packages/base/rules/base.js b/apps/base/rules/base.js → packages/base/rules/base.js
diff --git a/apps/base/rules/eslintComments.js → packages/base/rules/eslintComments.js b/apps/base/rules/eslintComments.js → packages/base/rules/eslintComments.js
diff --git a/apps/base/rules/import.js → packages/base/rules/import.js b/apps/base/rules/import.js → packages/base/rules/import.js
diff --git a/apps/base/rules/jest.js → packages/base/rules/jest.js b/apps/base/rules/jest.js → packages/base/rules/jest.js
diff --git a/apps/base/rules/json.js → packages/base/rules/json.js b/apps/base/rules/json.js → packages/base/rules/json.js
diff --git a/apps/base/rules/promise.js → packages/base/rules/promise.js b/apps/base/rules/promise.js → packages/base/rules/promise.js
diff --git a/apps/base/rules/simpleImportSort.js → packages/base/rules/simpleImportSort.js b/apps/base/rules/simpleImportSort.js → packages/base/rules/simpleImportSort.js
diff --git a/apps/base/rules/sonarjs.js → packages/base/rules/sonarjs.js b/apps/base/rules/sonarjs.js → packages/base/rules/sonarjs.js
diff --git a/apps/base/rules/unicorn.js → packages/base/rules/unicorn.js b/apps/base/rules/unicorn.js → packages/base/rules/unicorn.js
diff --git a/packages/environment/package.json b/packages/environment/package.json
diff --git a/packages/tsconfig/README.md b/packages/tsconfig/README.md
diff --git a/packages/tsconfig/package.json b/packages/tsconfig/package.json
diff --git a/apps/typescript/CHANGELOG.md → packages/typescript/CHANGELOG.md b/apps/typescript/CHANGELOG.md → packages/typescript/CHANGELOG.md
diff --git a/apps/typescript/LICENSE → packages/typescript/LICENSE b/apps/typescript/LICENSE → packages/typescript/LICENSE
diff --git a/packages/typescript/enviroment.js b/packages/typescript/enviroment.js
@@ -0,0 +1,7 @@
+module.exports = {
+  browser: true,
+  es6: true,
+  commonjs: true,
+  jest: true,
+  node: true,
+};
diff --git a/apps/typescript/index.js → packages/typescript/index.js b/apps/typescript/index.js → packages/typescript/index.js
@@ -1,12 +1,12 @@
-const env = require('environment');
+const environment = require('./enviroment');
 
 module.exports = {
   extends: [
     './rules/base',
     './rules/import',
     './rules/typescriptEslint',
   ],
-  env,
+  env: environment,
   parserOptions: {
     project: 'tsconfig/base.json',
   },

diff --git a/apps/typescript/package.json → packages/typescript/package.json b/apps/typescript/package.json → packages/typescript/package.json
@@ -43,10 +43,8 @@
   "dependencies": {
     "@typescript-eslint/eslint-plugin": "^5.13.0",
     "@typescript-eslint/parser": "^5.0.0",
-    "environment": "workspace:*",
     "eslint-config-airbnb-typescript": "^17.0.0",
     "eslint-import-resolver-typescript": "^2.7.1",
-    "eslint-plugin-import": "^2.26.0",
-    "tsconfig": "workspace:*"
+    "eslint-plugin-import": "^2.26.0"
   }
 }
diff --git a/apps/typescript/rules/base.js → packages/typescript/rules/base.js b/apps/typescript/rules/base.js → packages/typescript/rules/base.js
diff --git a/apps/typescript/rules/import.js → packages/typescript/rules/import.js b/apps/typescript/rules/import.js → packages/typescript/rules/import.js
diff --git a/apps/typescript/rules/typescriptEslint.js → ...ages/typescript/rules/typescriptEslint.js b/apps/typescript/rules/typescriptEslint.js → ...ages/typescript/rules/typescriptEslint.js
diff --git a/packages/tsconfig/base.json → packages/typescript/tsconfig.json b/packages/tsconfig/base.json → packages/typescript/tsconfig.json
@@ -17,4 +17,4 @@
     ]
   },
   "exclude": ["node_modules"]
-}
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -1,4 +1,3 @@
 packages:
-  - "apps/*"
   - "packages/*"
 
diff --git a/turbo.json b/turbo.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ @@
         ]
       },
       "exclude": ["node_modules"]
-    }
+    }