Version 2.0.0.

dennykorsukewitz · Feb 6, 2024 · 08aa066 · 08aa066
1 parent e6a24fd
commit 08aa066
Show file tree

Hide file tree

Showing 17 changed files with 242 additions and 264 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -1,25 +1,30 @@
 {
-    "env": {
-        "browser": false,
-        "commonjs": true,
-        "es6": true,
-        "node": true,
-        "mocha": true
-    },
+    "root": true,
+    "parser": "@typescript-eslint/parser",
     "parserOptions": {
-        "ecmaVersion": 2018,
-        "ecmaFeatures": {
-            "jsx": true
-        },
+        "ecmaVersion": 6,
         "sourceType": "module"
     },
+    "plugins": [
+        "@typescript-eslint"
+    ],
     "rules": {
-        "no-const-assign": "warn",
-        "no-this-before-super": "warn",
-        "no-undef": "warn",
-        "no-unreachable": "warn",
-        "no-unused-vars": "warn",
-        "constructor-super": "warn",
-        "valid-typeof": "warn"
-    }
-}
+        "@typescript-eslint/naming-convention": [
+            "warn",
+            {
+                "selector": "import",
+                "format": [ "camelCase", "PascalCase" ]
+            }
+        ],
+        "@typescript-eslint/semi": "warn",
+        "curly": "warn",
+        "eqeqeq": "warn",
+        "no-throw-literal": "warn",
+        "semi": "off"
+    },
+    "ignorePatterns": [
+        "out",
+        "dist",
+        "**/*.d.ts"
+    ]
+}
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,3 +9,5 @@ on:
 jobs:
   Lint:
     uses: dennykorsukewitz/dennykorsukewitz/.github/workflows/reusable.lint.yml@dev
+    with:
+      VALIDATE_TYPESCRIPT_STANDARD: false
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,12 @@
 .env
 coverage
 node_modules
-.vscode-test/**
+.vscode-test*
+out/
+dist/
 **/*.map
+**/*test.js
+**/*test.js.map
 package-lock.json
 .vscode/settings.json
 *.vsix

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -2,6 +2,7 @@
 // for the documentation about the extensions.json format
 {
     "recommendations": [
-        "dbaeumer.vscode-eslint"
+        "dbaeumer.vscode-eslint",
+        "ms-vscode.extension-test-runner"
     ]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,4 +1,4 @@
-// A launch configuration that launches the extension inside a new window
+// A launch configuration that compiles the extension and then opens it inside a new window
 // Use IntelliSense to learn about possible attributes.
 // Hover to view descriptions of existing attributes.
 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
@@ -11,16 +11,38 @@
             "request": "launch",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}"
-            ]
+            ],
+            "outFiles": [
+                "${workspaceFolder}/out/**/*.js"
+            ],
+            "preLaunchTask": "npm: compile"
         },
         {
-            "name": "Run Extension Tests",
+            "name": "Run Web Extension",
             "type": "extensionHost",
+            "debugWebWorkerHost": true,
             "request": "launch",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/test/suite/index"
-            ]
+                "--extensionDevelopmentKind=web"
+            ],
+            "outFiles": [
+                "${workspaceFolder}/out/web/**/*.js"
+            ],
+            "preLaunchTask": "npm: compile-web"
+        },
+        {
+            "name": "Run Tests",
+            "type": "node-terminal",
+            "request": "launch",
+            "command": "npm run test",
+        },
+        {
+            "name": "Debug Current Test File",
+            "type": "node-terminal",
+            "request": "launch",
+            "command": "npm run test -- ${fileBasenameNoExtension}",
+            "cwd": "${fileDirname}"
         }
     ]
-}
+}
diff --git a/.vscodeignore b/.vscodeignore
@@ -1,15 +1,18 @@
-.vscode/**
-.vscode-test/**
-test/**
-.gitignore
-.yarnrc
-vsc-extension-quickstart.md
-**/jsconfig.json
-**/*.map
-**/.eslintrc.json
-
 .env
+.github
+.vscode
+.vscode-test*
 coverage
+node_modules
+out/
+src/
+dist/test
+.gitignore
+.eslintrc.json
+**/*test.js
+**/*test.js.map
+tsconfig.json
+package-lock.json
 *.vsix
-TODO.md
-snippets/_Test_/**
+*.ts
+TODO.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,15 @@
 
 All notable changes to the "AddFolderToWorkspace" extension will be documented in this file.
 
+## [2.0.0]
+
+### Refactoring
+
+- Changed source language to TypeScript.
+- Added esbuild to get Browser Editor support.
+- Refactored code.
+- Added addFolderToWorkspace.position: If position is 'Top', the new folder will be added at the beginning of the current workspace. If position is 'Bottom', the new folder will be added at the end of the current workspace.
+
 ## [1.2.1]
 
 ### Maintenance

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@
 
 | Status |
  | ------ |
-| [![GitHub commits since tagged version](https://img.shields.io/github/commits-since/dennykorsukewitz/VSCode-AddFolderToWorkspace/1.2.1/dev)](https://github.com/dennykorsukewitz/VSCode-AddFolderToWorkspace/compare/1.2.1...dev) ![GitHub Workflow Lint](https://github.com/dennykorsukewitz/VSCode-AddFolderToWorkspace/actions/workflows/lint.yml/badge.svg?branch=dev&style=flat&label=Lint) ![GitHub Workflow Pages](https://github.com/dennykorsukewitz/VSCode-AddFolderToWorkspace/actions/workflows/pages.yml/badge.svg?branch=dev&style=flat&label=GitHub%20Pages) |
+| [![GitHub commits since tagged version](https://img.shields.io/github/commits-since/dennykorsukewitz/VSCode-AddFolderToWorkspace/2.0.0/dev)](https://github.com/dennykorsukewitz/VSCode-AddFolderToWorkspace/compare/2.0.0...dev) ![GitHub Workflow Lint](https://github.com/dennykorsukewitz/VSCode-AddFolderToWorkspace/actions/workflows/lint.yml/badge.svg?branch=dev&style=flat&label=Lint) ![GitHub Workflow Pages](https://github.com/dennykorsukewitz/VSCode-AddFolderToWorkspace/actions/workflows/pages.yml/badge.svg?branch=dev&style=flat&label=GitHub%20Pages) |
 
 ## Feature
 
@@ -47,6 +47,7 @@ This Function provides a searchable list of folders (Workspaces) that can be rem
 
 | Name | Description | Default Value |
 | - | - | - |
+| addFolderToWorkspace.position | If position is 'Top', the new folder will be added at the beginning of the current workspace. If position is 'Bottom', the new folder will be added at the end of the current workspace. | Bottom |
 | addFolderToWorkspace.workspaces | Provides a list of folders (Workspaces) that can be added to the current VSC Workspace. | /Users/ |
 | addFolderToWorkspace.recursiveWorkspaces | Provides a searchable (only first level) list of folders  (Workspaces) that can be added to the current VSC Workspace. | /Users/ |
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -1,10 +1,8 @@
-# [1.2.1]
+# [2.0.0]
 
-## Maintenance
+## Refactoring
 
-- Added additional check if vscode.workspace.workspaceFolders exists.
-- Saves the new manually entered directory globally.
-
-## Recursive Workspaces (only first level)
-
-- Added new setting `addFolderToWorkspace.recursiveWorkspaces` to use recursive Workspaces (only first level).
+- Changed source language to TypeScript.
+- Added esbuild to get Browser Editor support.
+- Refactored code.
+- Added addFolderToWorkspace.position: If position is 'Top', the new folder will be added at the beginning of the current workspace. If position is 'Bottom', the new folder will be added at the end of the current workspace.
diff --git a/jsconfig.json b/jsconfig.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "AddFolderToWorkspace",
   "displayName": "Add Folder To Workspace",
   "description": "This extension adds / removes the selected folder (multiple) to / from the workspace (VSC Workspace).",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "publisher": "dennykorsukewitz",
   "icon": "doc/images/icon.png",
   "license": "SEE LICENSE IN LICENSE",
@@ -23,39 +23,49 @@
     "add",
     "folder",
     "workflow",
-    "workspace"
+    "workspace",
+    "helper"
   ],
   "categories": [
     "Other"
   ],
   "engines": {
-    "vscode": "^1.74.0"
+    "vscode": "^1.85.0"
   },
-  "activationEvents": [
-    "onCommand:addFolderToWorkspace",
-    "onCommand:removeFolderFromWorkspace"
-  ],
-  "main": "./src/extension",
+  "activationEvents": [],
+  "main": "./dist/extension.js",
+  "browser": "./dist/extension.js",
   "scripts": {
-    "lint": "eslint .",
-    "lint-fix": "eslint . --fix",
-    "test": "node ./test/runTest.js"
+    "vscode:prepublish": "npm run esbuild-base -- --minify",
+    "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=dist/extension.js --external:vscode --format=cjs --platform=node",
+    "esbuild": "npm run esbuild-base -- --sourcemap",
+    "esbuild-watch": "npm run esbuild-base -- --sourcemap --watch",
+    "watch": "tsc -watch -p ./",
+    "compile": "tsc -p ./",
+    "compile-web": "npm run esbuild-base -- --sourcemap",
+    "lint": "eslint src --ext ts",
+    "lint-fix": "eslint src --ext ts --fix",
+    "pretest": "rm -Rf .vscode-test && npm run compile && npm run lint",
+    "test": "node ./dist/test/runTest.js",
+    "open-in-browser": "npm run compile-web && npx @vscode/test-web --extensionDevelopmentPath=."
   },
   "devDependencies": {
+    "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.1",
-    "@types/node": "16.x",
-    "@types/vscode": "^1.74.0",
-    "@vscode/test-electron": "^2.2.0",
-    "eslint": "^8.28.0",
-    "mocha": "^10.1.0",
-    "typescript": "^4.9.3"
-  },
-  "dependencies": {
-    "glob": "^8.1.0",
-    "path": "^0.12.7"
+    "@types/node": "^18.19.14",
+    "@types/vscode": "^1.85.0",
+    "@typescript-eslint/eslint-plugin": "^6.15.0",
+    "@typescript-eslint/parser": "^6.20.0",
+    "@vscode/test-electron": "^2.3.9",
+    "esbuild": "^0.20.0",
+    "eslint": "^8.56.0",
+    "mocha": "^10.2.0",
+    "typescript": "^5.3.3",
+    "vscode-test": "^1.6.1"
   },
-  "vsce": {
-    "dependencies": true
+  "overrides": {
+    "minimatch": "5.1.2",
+    "glob": "8.1.0"
   },
   "contributes": {
     "commands": [
@@ -88,6 +98,19 @@
       "type": "object",
       "title": "Add Folder To Workspace",
       "properties": {
+        "addFolderToWorkspace.position": {
+          "type": "string",
+          "description": "",
+          "default": "Bottom",
+          "enum": [
+            "Top",
+            "Bottom"
+          ],
+          "enumDescriptions": [
+            "If position is 'Top', the new folder will be added at the beginning of the current workspace.",
+            "If position is 'Bottom', the new folder will be added at the end of the current workspace."
+          ]
+        },
         "addFolderToWorkspace.workspaces": {
           "type": "array",
           "items": {
@@ -111,4 +134,4 @@
       }
     }
   }
-}
+}