mirror of
				https://github.com/crypto-pro-web/crypto-pro-js.git
				synced 2025-10-31 06:13:22 +03:00 
			
		
		
		
	Merge remote-tracking branch 'origin/master' into dependabot/npm_and_yarn/json5-1.0.2
# Conflicts: # package-lock.json
This commit is contained in:
		
						commit
						0ddddbb1de
					
				
							
								
								
									
										12
									
								
								examples/script-tag/package-lock.json
									
									
									
										generated
									
									
									
										
										
										Executable file → Normal file
									
								
							
							
						
						
									
										12
									
								
								examples/script-tag/package-lock.json
									
									
									
										generated
									
									
									
										
										
										Executable file → Normal file
									
								
							| @ -145,9 +145,9 @@ | ||||
|       } | ||||
|     }, | ||||
|     "node_modules/minimatch": { | ||||
|       "version": "3.0.4", | ||||
|       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", | ||||
|       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", | ||||
|       "version": "3.1.2", | ||||
|       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", | ||||
|       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", | ||||
|       "dev": true, | ||||
|       "dependencies": { | ||||
|         "brace-expansion": "^1.1.7" | ||||
| @ -382,9 +382,9 @@ | ||||
|       "dev": true | ||||
|     }, | ||||
|     "minimatch": { | ||||
|       "version": "3.0.4", | ||||
|       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", | ||||
|       "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", | ||||
|       "version": "3.1.2", | ||||
|       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", | ||||
|       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", | ||||
|       "dev": true, | ||||
|       "requires": { | ||||
|         "brace-expansion": "^1.1.7" | ||||
|  | ||||
							
								
								
									
										5969
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										5969
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @ -79,10 +79,10 @@ | ||||
| 		"sinon": "9.0.1", | ||||
| 		"tar": "6.1.9", | ||||
| 		"ts-jest": "^25.5.1", | ||||
| 		"ts-loader": "^6.2.2", | ||||
| 		"ts-loader": "^9.4.2", | ||||
| 		"typescript": "^3.9.10", | ||||
| 		"webpack": "^4.46.0", | ||||
| 		"webpack-cli": "^3.3.12" | ||||
| 		"webpack": "^5.75.0", | ||||
| 		"webpack-cli": "^5.0.1" | ||||
| 	}, | ||||
| 	"engines": { | ||||
| 		"node": "~16" | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user