Upgrade to Deno 2 #17 from bridge-core/next/Deno2Upgrade

Upgrade to Deno 2

.github/workflows/build.yml

@@ -13,22 +13,21 @@ jobs:
               with:
                   persist-credentials: false
             - name: Install Deno 🦕
-              uses: denoland/setup-deno@v1
+              uses: denoland/setup-deno@v2
               with:
-                  deno-version: v1.x
+                  deno-version: v2.x
             - name: 'Build Executable'
               run: deno task build
             - name: Upload Executables as Artifacts
               if: github.ref_type == 'branch'
               uses: actions/upload-artifact@v4
               with:
-                name: ${{ format('dash-{0}-{1}-{2}', github.run_id, github.run_number, github.run_attempt) }}
-                path: 'executables/*'
+                  name: ${{ format('dash-{0}-{1}-{2}', github.run_id, github.run_number, github.run_attempt) }}
+                  path: 'executables/*'
             - name: Upload Executables as Release
               if: github.ref_type == 'tag'
               uses: AButler/upload-release-assets@v3.0
               with:
-                files: 'executables/*'
-                release-tag: ${{ github.ref_name }}
-                repo-token: ${{ secrets.GITHUB_TOKEN }}
-
+                  files: 'executables/*'
+                  release-tag: ${{ github.ref_name }}
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-	"deno.enable": true
+	"deno.enable": true,
+	"deno.lint": true
 }

README.md

@@ -26,7 +26,7 @@ Releases page](https://github.com/bridge-core/deno-dash-compiler/releases).
 Open your terminal and run:
 
 ```shell
-deno install -A -f --reload -n dash_compiler https://raw.githubusercontent.com/bridge-core/deno-dash-compiler/main/mod.ts
+deno install -A --global -f --reload -n dash_compiler https://raw.githubusercontent.com/bridge-core/deno-dash-compiler/main/mod.ts
 ```
 
 #### Via Deno's Task Runner

deno.json

@@ -1,29 +1,33 @@
 {
-	"importMap": "importMap.json",
+	"imports": {
+		"@bridge-editor/common-utils": "npm:@bridge-editor/common-utils@^0.3.3",
+		"@bridge-editor/mc-project-core": "npm:@bridge-editor/mc-project-core@^0.4.0",
+		"@std/async": "jsr:@std/async@^1.0.7",
+		"@std/path": "jsr:@std/path@^1.0.7",
+		"@std/semver": "jsr:@std/semver@^1.0.3",
+		"dash-compiler-local": "../dash-compiler/dist/dash-compiler.bundled.es.js"
+	},
+	"version": "1.0.0",
 	"tasks": {
-		"install": "deno install -A -f -n dash_compiler ./mod.ts",
-		"install:full": "deno install -A --reload -f -n dash_compiler ./mod.ts",
+		"install": "deno install --global -A -f -n dash_compiler ./mod.ts",
+		"install:full": "deno install --global -A --reload -f -n dash_compiler ./mod.ts",
 		"build": "deno task build:apple-x86 && deno task build:apple-aarch64 && deno task build:windows-x86",
 		"build:apple-x86": "deno compile --target x86_64-apple-darwin --output ./executables/dash-apple-x64 -A ./mod.ts",
 		"build:apple-aarch64": "deno compile --target aarch64-apple-darwin --output ./executables/dash-apple-aarch64 -A ./mod.ts",
 		"build:windows-x86": "deno compile --target x86_64-pc-windows-msvc  --output ./executables/dash.exe -A ./mod.ts"
 	},
 	"fmt": {
-		"files": {
-			"include": ["*.json", "*.ts", "*.tsx", "src/"]
-		},
-		"options": {
-			"useTabs": true,
-			"lineWidth": 80,
-			"indentWidth": 4,
-			"singleQuote": true
-		}
+		"include": ["*.json", "*.ts", "*.tsx", "src/"],
+		"exclude": ["dist/", ".vscode/", ".github/", "README.md", "deno.lock"],
+		"useTabs": true,
+		"lineWidth": 80,
+		"semiColons": false,
+		"indentWidth": 4,
+		"singleQuote": true
 	},
 	"lint": {
-		"files": {
-			"include": ["*.ts", "src/"],
-			"exclude": ["dist/", ".vscode/", ".github/"]
-		},
+		"include": ["*.ts", "src/"],
+		"exclude": ["dist/", ".vscode/", ".github/"],
 		"rules": {
 			"tags": ["recommended"],
 			"include": ["ban-untagged-todo"],

mod.ts

@@ -1,20 +1,12 @@
 // deno-lint-ignore-file no-explicit-any
 import { CLI } from './src/CLI.ts'
-import yargs from 'https://deno.land/x/yargs@v17.5.1-deno/deno.ts'
-import { parse as semverParse, compare as semverCompare } from "jsr:@std/semver";
+import yargs from 'https://deno.land/x/yargs@v17.7.2-deno/deno.ts'
+import { parse as semverParse, compare as semverCompare } from 'jsr:@std/semver'
 import { comMojangFolder } from './src/comMojangFolder.ts'
 import { initRuntimes, swcVersion } from './src/deps.ts'
 
-// @ts-ignore: Required by some of our dependencies
-window.global = window
-// @ts-ignore: Required by some of our dependencies
-window.process = {
-	cwd: () => '',
-	env: {},
-}
-
 type YargsInstance = ReturnType<typeof yargs>
-const CURRENT_VERSION = `0.4.7`
+const CURRENT_VERSION = `1.0.0`
 
 async function fetchLatestVersion(): Promise<string | null> {
     try {

src/FileSystem.ts

@@ -30,7 +30,7 @@ export class DenoFileSystem extends FileSystem {
 			await Deno.writeTextFile(this.resolvePath(filePath), content)
 		else return Deno.writeFile(this.resolvePath(filePath), content)
 	}
-	async readJson(filePath: string) {
+	override async readJson(filePath: string) {
 		const fileContent = await Deno.readTextFile(this.resolvePath(filePath))
 		return json5.parse(fileContent)
 	}
@@ -42,14 +42,14 @@ export class DenoFileSystem extends FileSystem {
 
 		for await (const entry of Deno.readDir(this.resolvePath(path))) {
 			entries.push(<const>{
-				name: entry.name,
-				kind: entry.isDirectory ? 'directory' : 'file',
+					name: entry.name,
+					kind: entry.isDirectory ? 'directory' : 'file',
 			})
 		}
 
 		return entries
 	}
-	async copyFile(from: string, to: string, destFs = this) {
+	override async copyFile(from: string, to: string, destFs = this) {
 		// Fallback to slow path if destination fs !== this
 		if (destFs !== this) return super.copyFile(from, to, destFs)
 

src/McProjectCore.ts

@@ -17,13 +17,13 @@ export class FileTypeImpl extends FileType<void> {
 		).then((resp) => resp.json())
 	}
 
-	addPluginFileType(fileDef: IFileType) {
+	override addPluginFileType(fileDef: IFileType) {
 		this._cache.clear()
 
 		return super.addPluginFileType(fileDef)
 	}
 
-	get(filePath?: string, searchFileType?: string, checkFileExtension = true) {
+	override get(filePath?: string, searchFileType?: string, checkFileExtension = true) {
 		if (!filePath || !checkFileExtension || searchFileType !== undefined) {
 			return super.get(filePath, searchFileType, checkFileExtension)
 		}