mirror of
				https://github.com/SquidDev-CC/CC-Tweaked
				synced 2025-10-31 05:33:00 +00:00 
			
		
		
		
	Switch from path to parentPath
I've been putting this off for a while, as I had issues in the past with people using old Node versions (e.g. #1806), but it no long works on my machine, so time to make the switch. Also do a bit of a package update. Hit a rollup bug while doing this (https://github.com/rollup/plugins/issues/1877), so holding that update back for now.
This commit is contained in:
		| @@ -68,7 +68,7 @@ ideaExt = "1.1.7" | |||||||
| illuaminate = "0.1.0-83-g1131f68" | illuaminate = "0.1.0-83-g1131f68" | ||||||
| lwjgl = "3.3.3" | lwjgl = "3.3.3" | ||||||
| minotaur = "2.8.7" | minotaur = "2.8.7" | ||||||
| modDevGradle = "2.0.78" | modDevGradle = "2.0.95" | ||||||
| nullAway = "0.12.7" | nullAway = "0.12.7" | ||||||
| shadow = "8.3.1" | shadow = "8.3.1" | ||||||
| spotless = "7.0.2" | spotless = "7.0.2" | ||||||
|   | |||||||
							
								
								
									
										676
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										676
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -13,10 +13,10 @@ | |||||||
|   }, |   }, | ||||||
|   "devDependencies": { |   "devDependencies": { | ||||||
|     "@rollup/plugin-node-resolve": "^16.0.0", |     "@rollup/plugin-node-resolve": "^16.0.0", | ||||||
|     "@rollup/plugin-typescript": "^12.0.0", |     "@rollup/plugin-typescript": "^12.0.0 && <12.1.3", | ||||||
|     "@rollup/plugin-url": "^8.0.1", |     "@rollup/plugin-url": "^8.0.1", | ||||||
|     "@swc/core": "^1.3.92", |     "@swc/core": "^1.3.92", | ||||||
|     "@types/node": "^22.0.0", |     "@types/node": "^24.0.0", | ||||||
|     "lightningcss": "^1.22.0", |     "lightningcss": "^1.22.0", | ||||||
|     "preact-render-to-string": "^6.2.1", |     "preact-render-to-string": "^6.2.1", | ||||||
|     "rehype": "^13.0.0", |     "rehype": "^13.0.0", | ||||||
|   | |||||||
| @@ -70,18 +70,33 @@ We expected a closing delimiter (]=]) somewhere after this comment was started. | |||||||
| 1:1-1:5 COMMENT --[=[ | 1:1-1:5 COMMENT --[=[ | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
|  | But incomplete opening `[`s are treated as a line comment: | ||||||
|  | 
 | ||||||
|  | ```lua | ||||||
|  | --[ | ||||||
|  | --[= | ||||||
|  | return | ||||||
|  | ``` | ||||||
|  | 
 | ||||||
|  | ```txt | ||||||
|  | 1:1-1:3 COMMENT --[ | ||||||
|  | 2:1-2:4 COMMENT --[= | ||||||
|  | 3:1-3:6 RETURN return | ||||||
|  | ``` | ||||||
|  | 
 | ||||||
| Nested comments are rejected, just as Lua 5.1 does: | Nested comments are rejected, just as Lua 5.1 does: | ||||||
| 
 | 
 | ||||||
| ```lua | ```lua | ||||||
| --[[ [[ ]] | --[[ [[ ]] return | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| ```txt | ```txt | ||||||
| [[ cannot be nested inside another [[ ... ]] | [[ cannot be nested inside another [[ ... ]] | ||||||
|    | |    | | ||||||
|  1 | --[[ [[ ]] |  1 | --[[ [[ ]] return | ||||||
|    |      ^^ |    |      ^^ | ||||||
| 1:1-1:10 COMMENT --[[ [[ ]] | 1:1-1:10 COMMENT --[[ [[ ]] | ||||||
|  | 1:12-1:17 RETURN return | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
| # Strings | # Strings | ||||||
|   | |||||||
| @@ -56,7 +56,7 @@ import { type DataExport, WithExport } from "./components/WithExport"; | |||||||
|     for (const file of await fs.readdir(sourceDir, { withFileTypes: true, recursive: true })) { |     for (const file of await fs.readdir(sourceDir, { withFileTypes: true, recursive: true })) { | ||||||
|         if(!file.isFile() || !file.name.endsWith(".html")) continue; |         if(!file.isFile() || !file.name.endsWith(".html")) continue; | ||||||
|  |  | ||||||
|         const sourcePath = path.join(file.path, file.name); |         const sourcePath = path.join(file.parentPath, file.name); | ||||||
|         const contents = await fs.readFile(sourcePath, "utf-8"); |         const contents = await fs.readFile(sourcePath, "utf-8"); | ||||||
|  |  | ||||||
|         const { result } = await processor.process(contents); |         const { result } = await processor.process(contents); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Jonathan Coates
					Jonathan Coates