feat: Merge bash package into shell

Merge the legacy bash dictionary package into the shell package.
streetsidesoftware · Jan 7, 2025 · a8c9af6 · a8c9af6
1 parent fa63eb3
commit a8c9af6
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 249 deletions.
diff --git a/dictionaries/bash/cspell-ext.json b/dictionaries/bash/cspell-ext.json
@@ -2,15 +2,7 @@
     "id": "bash",
     "name": "bash",
     "description": "Bash dictionary.",
-    "readonly": true,
-    "dictionaryDefinitions": [
-        {
-            "name": "bash",
-            "path": "./dict/bash-words.txt",
-            "description": "Bash dictionary."
-        }
-    ],
-    "dictionaries": [],
+    "import": ["@cspell/dict-shell"],
     "languageSettings": [
         {
             "languageId": "shellscript",

diff --git a/dictionaries/bash/cspell-tools.config.yaml b/dictionaries/bash/cspell-tools.config.yaml
diff --git a/dictionaries/bash/dict/README.md b/dictionaries/bash/dict/README.md
diff --git a/dictionaries/bash/dict/bash-words.txt b/dictionaries/bash/dict/bash-words.txt
diff --git a/dictionaries/bash/package.json b/dictionaries/bash/package.json
@@ -12,8 +12,8 @@
     "./cspell-ext.json": "./cspell-ext.json"
   },
   "scripts": {
-    "build": "cspell-tools-cli build",
-    "test": "shx cat src/bash-words.txt | cspell -c ./cspell-ext.json \"--locale=*\" \"--languageId=shellscript\" stdin",
+    "build": "echo ok",
+    "test": "shx cat samples/bash-words.txt | cspell -c ./cspell-ext.json \"--locale=*\" \"--languageId=shellscript\" stdin",
     "prepublishOnly": "echo pre-publish",
     "prepare:dictionary": "pnpm run build"
   },
@@ -38,5 +38,8 @@
   "files": [
     "dict/*",
     "cspell-ext.json"
-  ]
+  ],
+  "dependencies": {
+    "@cspell/dict-shell": "workspace:*"
+  }
 }
diff --git a/dictionaries/bash/src/bash-words.txt → dictionaries/bash/samples/bash-words.txt b/dictionaries/bash/src/bash-words.txt → dictionaries/bash/samples/bash-words.txt
diff --git a/dictionaries/bash/src/README.md b/dictionaries/bash/src/README.md
diff --git a/dictionaries/shell/cspell-tools.config.yaml b/dictionaries/shell/cspell-tools.config.yaml
@@ -5,7 +5,6 @@ targets:
     sources:
       - listFile: ./common-source-files.txt
       - ./src/shell-bash-words.txt
-      - ../bash/src/bash-words.txt
     format: plaintext
     targetDirectory: './dict'
     generateNonStrict: false

diff --git a/dictionaries/shell/dict/shell-all-words.txt b/dictionaries/shell/dict/shell-all-words.txt