Merge pull request #50 from basics/feature/config-extend

fix(config): update
basics · Sep 19, 2024 · 0592a5c · 0592a5c
2 parents e17b4c1 + 94101a4
commit 0592a5c
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 53 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,51 @@
+{
+  "breadcrumbs.enabled": true,
+  "editor.bracketPairColorization.enabled": true,
+  "editor.cursorBlinking": "phase",
+  "editor.formatOnPaste": true,
+  "editor.minimap.renderCharacters": false,
+  "editor.minimap.maxColumn": 200,
+  "editor.minimap.showSlider": "always",
+  "editor.smoothScrolling": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": "explicit"
+  },
+  "editor.formatOnSave": true,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "vue",
+    "html"
+  ],
+  "files.exclude": {
+    "docs/": true,
+    ".scannerwork/": true,
+    "node_modules/": false,
+    "**/.idea": true,
+    "**/*.iml": true,
+    "**/out": true,
+    "**/gen": true,
+    "**/logs": true,
+    "**/*.log": true,
+    "**/.DS_Store": true,
+    ".*": false
+  },
+  "files.associations": {
+    ".branchlintrc": "json",
+    ".huskyrc": "json",
+    ".lintstagedrc": "json",
+    ".postcssrc": "json",
+    ".releaserc": "json",
+    ".*ignore": "ignore",
+    "*.js.tmpl": "javascript",
+    "*.html.tmpl": "html"
+  },
+  "javascript.format.enable": false,
+  "javascript.suggest.paths": false,
+  "path-intellisense.mappings": {
+    "@operators/*": "${workspaceRoot}/packages/operators/src"
+  },
+  "window.title": "${dirty} ${activeEditorMedium}${separator}${rootName}",
+  "workbench.settings.enableNaturalLanguageSearch": false,
+  "task.autoDetect": "off"
+}
diff --git a/packages/observables/package.json b/packages/observables/package.json
@@ -15,6 +15,7 @@
     "release": "npx semantic-release"
   },
   "dependencies": {
+    "@rxjs-collection/operators": "*",
     "rxjs": "7.8.1"
   }
 }
diff --git a/packages/operators/package.json b/packages/operators/package.json
@@ -15,6 +15,7 @@
     "release": "npx semantic-release"
   },
   "dependencies": {
+    "@rxjs-collection/observables": "*",
     "rxjs": "7.8.1"
   }
 }
diff --git a/rxjs-collection.code-workspace b/rxjs-collection.code-workspace
@@ -3,56 +3,5 @@
     {
       "path": "."
     }
-  ],
-  "settings": {
-    "breadcrumbs.enabled": true,
-    "editor.bracketPairColorization.enabled": true,
-    "editor.cursorBlinking": "phase",
-    "editor.formatOnPaste": true,
-    "editor.minimap.renderCharacters": false,
-    "editor.minimap.maxColumn": 200,
-    "editor.minimap.showSlider": "always",
-    "editor.smoothScrolling": true,
-    "editor.codeActionsOnSave": {
-      "source.fixAll.eslint": "explicit"
-    },
-    "editor.formatOnSave": true,
-    "eslint.validate": [
-      "javascript",
-      "javascriptreact",
-      "vue",
-      "html"
-    ],
-    "files.exclude": {
-      "docs/": true,
-      ".scannerwork/": true,
-      "node_modules/": false,
-      "**/.idea": true,
-      "**/*.iml": true,
-      "**/out": true,
-      "**/gen": true,
-      "**/logs": true,
-      "**/*.log": true,
-      "**/.DS_Store": true,
-      ".*": false
-    },
-    "files.associations": {
-      ".branchlintrc": "json",
-      ".huskyrc": "json",
-      ".lintstagedrc": "json",
-      ".postcssrc": "json",
-      ".releaserc": "json",
-      ".*ignore": "ignore",
-      "*.js.tmpl": "javascript",
-      "*.html.tmpl": "html"
-    },
-    "javascript.format.enable": false,
-    "javascript.suggest.paths": false,
-    "path-intellisense.mappings": {
-      "@operators/*": "${workspaceRoot}/packages/operators/src"
-    },
-    "window.title": "${dirty} ${activeEditorMedium}${separator}${rootName}",
-    "workbench.settings.enableNaturalLanguageSearch": false,
-    "task.autoDetect": "off"
-  }
-}
+  ]
+}