squash!

Author: NikolaRHristov

Source/dev-requirements.txt

@@ -1,3 +1,7 @@
 -r ./requirements.txt
+<<<<<<< HEAD
 black==19.10b0
+=======
+black==24.3.0
+>>>>>>> f71080983a35952feb8382140808e52bce2606bf
 pytest==5.0.1

Source/extension_utils/utils.ts

@@ -104,7 +104,11 @@ export function mkdirRecursivelySync(dirPath: string): void {
 export function directoryExistsSync(dirPath: string): boolean {
     try {
         return fs.statSync(dirPath).isDirectory();
+<<<<<<< HEAD
     } catch (e) {
+=======
+    } catch (_Error) {
+>>>>>>> f71080983a35952feb8382140808e52bce2606bf
         return false;
     }
 }

Source/requirements.txt

@@ -6,7 +6,11 @@ pywin32==227; platform_system == "Windows"
 PyObjC; platform_system == "darwin"
 uflash==1.3.0
 adafruit-circuitpython-fancyled==1.3.3
+<<<<<<< HEAD
 Pillow==8.1.1
+=======
+Pillow==10.3.0
+>>>>>>> f71080983a35952feb8382140808e52bce2606bf
 adafruit-circuitpython-bitmap_font==1.1.0
 adafruit-circuitpython-display-shapes==1.2.0
 adafruit-circuitpython-neopixel==5.0.0

Source/view/tsconfig.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "compilerOptions": {
     "module": "esnext",
     "moduleResolution": "node",
@@ -16,4 +17,32 @@
   },
   "exclude": ["node_modules"],
   "include": ["./index.tsx"]
+=======
+	"compilerOptions": {
+		"baseUrl": "./",
+		"experimentalDecorators": true,
+		"jsx": "react",
+		"lib": [
+			"es6",
+			"dom"
+		],
+		"module": "esnext",
+		"moduleResolution": "node",
+		"noFallthroughCasesInSwitch": true,
+		"noImplicitReturns": true,
+		"noUnusedLocals": true,
+		"outDir": "Target",
+		"rootDir": "Source",
+		"sourceMap": true,
+		"strict": true,
+		"target": "es6"
+	},
+	"exclude": [
+		"node_modules"
+	],
+	"extends": "@playform/build/tsconfig",
+	"include": [
+		"Source"
+	]
+>>>>>>> f71080983a35952feb8382140808e52bce2606bf
 }

package.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
 	"activationEvents": [
 		"onCommand:deviceSimulatorExpress.common.installDependencies",
 		"onCommand:deviceSimulatorExpress.common.openSerialMonitor",
@@ -18,6 +19,53 @@
 	"bugs": {
 		"url": "HTTPS://GitHub.Com/CodeEditorLand/LandPythonDeviceSimulator/issues"
 	},
+=======
+	"name": "__EXTENSIONNAME__",
+	"displayName": "__DISPLAYNAME__",
+	"version": "0.0.1",
+	"private": false,
+	"description": "__DESCRIPTION__",
+	"keywords": [
+		"land"
+	],
+	"homepage": "HTTPS://GitHub.Com/CodeEditorLand/LandPythonDeviceSimulator#readme",
+	"bugs": {
+		"url": "HTTPS://GitHub.Com/CodeEditorLand/LandPythonDeviceSimulator/issues"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+HTTPS://github.com/CodeEditorLand/LandPythonDeviceSimulator.git"
+	},
+	"license": "SEE LICENSE IN LICENSE",
+	"author": {
+		"name": "Land",
+		"email": "Land@Playform.Cloud",
+		"url": "HTTPS://Land.Playform.Cloud"
+	},
+	"type": "module",
+	"main": "./out/extension.js",
+	"scripts": {
+		"Document": "Document 'Source/**/*.ts'",
+		"build": "gulp build",
+		"check:python": "black src --check",
+		"check:ts": "prettier --config .prettierrc.yaml --check src/**/*.{css,ts,tsx}",
+		"clean": "gulp clean",
+		"compile": "npm-run-all compile:*",
+		"compile:extension": "gulp compile",
+		"compile:views": "webpack --mode development",
+		"format:python": "black src",
+		"format:ts": "prettier --config .prettierrc.yaml --write src/**/*.{css,ts,tsx}",
+		"lint:python": "pylint src",
+		"lint:ts": "tslint -c tslint.json src/**/*.{ts,tsx}",
+		"prepublishOnly": "Build 'Source/**/*.ts'",
+		"start": "webpack-dev-server",
+		"test:api-tests": "pytest src",
+		"test:extension-tests": "node ./out/test/runTest.js",
+		"test:ts": "jest",
+		"watch:extension": "tsc --watch",
+		"watch:views": "webpack --watch --mode development"
+	},
+>>>>>>> f71080983a35952feb8382140808e52bce2606bf
 	"contributes": {
 		"breakpoints": [
 			{
@@ -202,6 +250,7 @@
 			}
 		]
 	},
+<<<<<<< HEAD
 	"dependencies": {
 		"@types/open": "^6.1.0",
 		"@types/socket.io": "^3.0.1",
@@ -276,4 +325,54 @@
 	},
 	"type": "module",
 	"version": "0.0.1"
+=======
+	"activationEvents": [
+		"onCommand:deviceSimulatorExpress.common.installDependencies",
+		"onCommand:deviceSimulatorExpress.common.openSerialMonitor",
+		"onCommand:deviceSimulatorExpress.common.runSimulator",
+		"onCommand:deviceSimulatorExpress.common.selectSerialPort",
+		"onCommand:deviceSimulatorExpress.common.gettingStarted",
+		"onCommand:deviceSimulatorExpress.common.deployToDevice",
+		"onCommand:deviceSimulatorExpress.common.newFile",
+		"onCommand:deviceSimulatorExpress.common.openSimulator",
+		"onDebug"
+	],
+	"dependencies": {
+		"@types/open": "6.1.0",
+		"@types/socket.io": "3.0.1",
+		"compare-versions": "6.1.0",
+		"eventemitter2": "6.4.9",
+		"glob": "10.3.12",
+		"open": "10.1.0",
+		"os": "0.1.2",
+		"socket.io": "4.7.5",
+		"usb-native": "6.0.0",
+		"util": "0.12.5"
+	},
+	"devDependencies": {
+		"@playform/build": "0.0.7",
+		"@playform/document": "0.0.6",
+		"@types/glob": "8.1.0",
+		"@types/node": "20.12.7",
+		"css-loader": "7.1.1",
+		"del": "7.1.0",
+		"event-stream": "4.0.1",
+		"less": "4.2.0",
+		"less-loader": "12.2.0",
+		"npm-run-all": "4.1.5",
+		"style-loader": "4.0.0",
+		"ts-import-plugin": "3.0.0",
+		"ts-loader": "9.5.1",
+		"version-from-git": "1.1.1"
+	},
+	"extensionDependencies": [
+		"ms-python.python"
+	],
+	"publishConfig": {
+		"access": "public"
+	},
+	"icon": "assets/icon.png",
+	"preview": true,
+	"instrumentationKey": "__AIKEY__"
+>>>>>>> f71080983a35952feb8382140808e52bce2606bf
 }

tsconfig.json

@@ -1,13 +1,24 @@
 {
-  "compilerOptions": {
-    "module": "commonjs",
-    "target": "es6",
-    "outDir": "out",
-    "lib": ["es6", "dom"],
-    "sourceMap": true,
-    "rootDir": "src",
-    "jsx": "react",
-    "alwaysStrict": true
-  },
-  "exclude": ["node_modules", ".vscode-test"]
+	"compilerOptions": {
+		"alwaysStrict": true,
+		"baseUrl": "./",
+		"jsx": "react",
+		"lib": [
+			"es6",
+			"dom"
+		],
+		"module": "commonjs",
+		"outDir": "Target",
+		"rootDir": "Source",
+		"sourceMap": true,
+		"target": "es6"
+	},
+	"exclude": [
+		"node_modules",
+		".vscode-test"
+	],
+	"extends": "@playform/build/tsconfig",
+	"include": [
+		"Source"
+	]
 }