Skip to content

Commit c6f1f19

Browse files
author
Simeon Castle
authored
Merge branch 'nginxinc:master' into master
2 parents 44c1273 + 7f5df74 commit c6f1f19

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+5246
-836
lines changed

.github/workflows/main.yml

Lines changed: 298 additions & 89 deletions
Large diffs are not rendered by default.

.gitignore

Lines changed: 305 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,58 @@
1-
# Created by https://www.toptal.com/developers/gitignore/api/intellij
2-
# Edit at https://www.toptal.com/developers/gitignore?templates=intellij
1+
# Created by https://www.toptal.com/developers/gitignore/api/intellij+all,node,vim,emacs,macos
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=intellij+all,node,vim,emacs,macos
33

4-
### Intellij ###
4+
### Emacs ###
5+
# -*- mode: gitignore; -*-
6+
*~
7+
\#*\#
8+
/.emacs.desktop
9+
/.emacs.desktop.lock
10+
*.elc
11+
auto-save-list
12+
tramp
13+
.\#*
14+
15+
# Org-mode
16+
.org-id-locations
17+
*_archive
18+
19+
# flymake-mode
20+
*_flymake.*
21+
22+
# eshell files
23+
/eshell/history
24+
/eshell/lastdir
25+
26+
# elpa packages
27+
/elpa/
28+
29+
# reftex files
30+
*.rel
31+
32+
# AUCTeX auto folder
33+
/auto/
34+
35+
# cask packages
36+
.cask/
37+
dist/
38+
39+
# Flycheck
40+
flycheck_*.el
41+
42+
# server auth directory
43+
/server/
44+
45+
# projectiles files
46+
.projectile
47+
48+
# directory configuration
49+
.dir-locals.el
50+
51+
# network security
52+
/network-security.data
53+
54+
55+
### Intellij+all ###
556
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
657
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
758

@@ -12,6 +63,9 @@
1263
.idea/**/dictionaries
1364
.idea/**/shelf
1465

66+
# AWS User-specific
67+
.idea/**/aws.xml
68+
1569
# Generated files
1670
.idea/**/contentModel.xml
1771

@@ -53,6 +107,12 @@ cmake-build-*/
53107
# IntelliJ
54108
out/
55109

110+
# jsdoc build directory
111+
reference/
112+
113+
# minio storage
114+
data/
115+
56116
# mpeltonen/sbt-idea plugin
57117
.idea_modules/
58118

@@ -62,6 +122,9 @@ atlassian-ide-plugin.xml
62122
# Cursive Clojure plugin
63123
.idea/replstate.xml
64124

125+
# SonarLint plugin
126+
.idea/sonarlint/
127+
65128
# Crashlytics plugin (for Android Studio and IntelliJ)
66129
com_crashlytics_export_strings.xml
67130
crashlytics.properties
@@ -74,39 +137,254 @@ fabric.properties
74137
# Android studio 3.1+ serialized cache file
75138
.idea/caches/build_file_checksums.ser
76139

77-
### Intellij Patch ###
78-
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
140+
### Intellij+all Patch ###
141+
# Ignore everything but code style settings and run configurations
142+
# that are supposed to be shared within teams.
143+
144+
.idea/*
145+
146+
!.idea/codeStyles
147+
!.idea/runConfigurations
148+
149+
### macOS ###
150+
# General
151+
.DS_Store
152+
.AppleDouble
153+
.LSOverride
154+
155+
# Icon must end with two \r
156+
Icon
157+
158+
159+
# Thumbnails
160+
._*
161+
162+
# Files that might appear in the root of a volume
163+
.DocumentRevisions-V100
164+
.fseventsd
165+
.Spotlight-V100
166+
.TemporaryItems
167+
.Trashes
168+
.VolumeIcon.icns
169+
.com.apple.timemachine.donotpresent
170+
171+
# Directories potentially created on remote AFP share
172+
.AppleDB
173+
.AppleDesktop
174+
Network Trash Folder
175+
Temporary Items
176+
.apdisk
177+
178+
### macOS Patch ###
179+
# iCloud generated files
180+
*.icloud
181+
182+
### Node ###
183+
# Logs
184+
logs
185+
*.log
186+
npm-debug.log*
187+
yarn-debug.log*
188+
yarn-error.log*
189+
lerna-debug.log*
190+
.pnpm-debug.log*
191+
192+
# Diagnostic reports (https://nodejs.org/api/report.html)
193+
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
194+
195+
# Runtime data
196+
pids
197+
*.pid
198+
*.seed
199+
*.pid.lock
200+
201+
# Directory for instrumented libs generated by jscoverage/JSCover
202+
lib-cov
203+
204+
# Coverage directory used by tools like istanbul
205+
coverage
206+
*.lcov
207+
208+
# nyc test coverage
209+
.nyc_output
210+
211+
# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
212+
.grunt
213+
214+
# Bower dependency directory (https://bower.io/)
215+
bower_components
216+
217+
# node-waf configuration
218+
.lock-wscript
79219

80-
*.iml
81-
modules.xml
82-
.idea/misc.xml
83-
*.ipr
220+
# Compiled binary addons (https://nodejs.org/api/addons.html)
221+
build/Release
84222

85-
# Sonarlint plugin
86-
# https://plugins.jetbrains.com/plugin/7973-sonarlint
87-
.idea/**/sonarlint/
223+
# Dependency directories
224+
node_modules/
225+
jspm_packages/
88226

89-
# SonarQube Plugin
90-
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
91-
.idea/**/sonarIssues.xml
227+
# Snowpack dependency directory (https://snowpack.dev/)
228+
web_modules/
92229

93-
# Markdown Navigator plugin
94-
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
95-
.idea/**/markdown-navigator.xml
96-
.idea/**/markdown-navigator-enh.xml
97-
.idea/**/markdown-navigator/
230+
# TypeScript cache
231+
*.tsbuildinfo
98232

99-
# Cache file creation bug
100-
# See https://youtrack.jetbrains.com/issue/JBR-2257
101-
.idea/$CACHE_FILE$
233+
# Optional npm cache directory
234+
.npm
102235

103-
# CodeStream plugin
104-
# https://plugins.jetbrains.com/plugin/12206-codestream
105-
.idea/codestream.xml
236+
# Optional eslint cache
237+
.eslintcache
106238

107-
# End of https://www.toptal.com/developers/gitignore/api/intellij
239+
# Optional stylelint cache
240+
.stylelintcache
241+
242+
# Microbundle cache
243+
.rpt2_cache/
244+
.rts2_cache_cjs/
245+
.rts2_cache_es/
246+
.rts2_cache_umd/
247+
248+
# Optional REPL history
249+
.node_repl_history
250+
251+
# Output of 'npm pack'
252+
*.tgz
253+
254+
# Yarn Integrity file
255+
.yarn-integrity
256+
257+
# dotenv environment variable files
258+
.env
259+
.env.development.local
260+
.env.test.local
261+
.env.production.local
262+
.env.local
263+
264+
# parcel-bundler cache (https://parceljs.org/)
265+
.cache
266+
.parcel-cache
267+
268+
# Next.js build output
269+
.next
270+
out
271+
272+
# Nuxt.js build / generate output
273+
.nuxt
274+
dist
275+
276+
# Gatsby files
277+
.cache/
278+
# Comment in the public line in if your project uses Gatsby and not Next.js
279+
# https://nextjs.org/blog/next-9-1#public-directory-support
280+
# public
281+
282+
# vuepress build output
283+
.vuepress/dist
284+
285+
# vuepress v2.x temp and cache directory
286+
.temp
287+
288+
# Docusaurus cache and generated files
289+
.docusaurus
290+
291+
# Serverless directories
292+
.serverless/
293+
294+
# FuseBox cache
295+
.fusebox/
296+
297+
# DynamoDB Local files
298+
.dynamodb/
299+
300+
# TernJS port file
301+
.tern-port
302+
303+
# Stores VSCode versions used for testing VSCode extensions
304+
.vscode-test
305+
306+
# yarn v2
307+
.yarn/cache
308+
.yarn/unplugged
309+
.yarn/build-state.yml
310+
.yarn/install-state.gz
311+
.pnp.*
312+
313+
### Node Patch ###
314+
# Serverless Webpack directories
315+
.webpack/
316+
317+
# Optional stylelint cache
318+
319+
# SvelteKit build / generate output
320+
.svelte-kit
321+
322+
### Vim ###
323+
# Swap
324+
[._]*.s[a-v][a-z]
325+
!*.svg # comment out if you don't need vector files
326+
[._]*.sw[a-p]
327+
[._]s[a-rt-v][a-z]
328+
[._]ss[a-gi-z]
329+
[._]sw[a-p]
330+
331+
# Session
332+
Session.vim
333+
Sessionx.vim
334+
335+
# Temporary
336+
.netrwhist
337+
# Auto-generated tag files
338+
tags
339+
# Persistent undo
340+
[._]*.un~
341+
342+
# End of https://www.toptal.com/developers/gitignore/api/intellij+all,node,vim,emacs,macos
108343

109344
# Test data files
110345
test-settings.*
111346
s3-requests.http
112347
httpRequests/
348+
349+
.bin/
350+
351+
# Created by https://www.toptal.com/developers/gitignore/api/terraform
352+
# Edit at https://www.toptal.com/developers/gitignore?templates=terraform
353+
354+
### Terraform ###
355+
# Local .terraform directories
356+
**/.terraform/*
357+
358+
# .tfstate files
359+
*.tfstate
360+
*.tfstate.*
361+
362+
# Crash log files
363+
crash.log
364+
crash.*.log
365+
366+
# Exclude all .tfvars files, which are likely to contain sensitive data, such as
367+
# password, private keys, and other secrets. These should not be part of version
368+
# control as they are data points which are potentially sensitive and subject
369+
# to change depending on the environment.
370+
*.tfvars
371+
*.tfvars.json
372+
373+
# Ignore override files as they are usually used to override resources locally and so
374+
# are not checked in
375+
override.tf
376+
override.tf.json
377+
*_override.tf
378+
*_override.tf.json
379+
380+
# Include override files you do wish to add to version control using negated pattern
381+
# !example_override.tf
382+
383+
# Include tfplan files to ignore the plan output of command: terraform plan -out=tfplan
384+
# example: *tfplan*
385+
386+
# Ignore CLI configuration files
387+
.terraformrc
388+
terraform.rc
389+
.tfplan
390+
# End of https://www.toptal.com/developers/gitignore/api/terraform

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nodejs 20.8.0

0 commit comments

Comments
 (0)