Skip to content

Commit

Permalink
Merge pull request #85 from hmrc/DL-9447a
Browse files Browse the repository at this point in the history 
[DL-9447] Upgraded the dependencies for the VAT (MTD) End-to-End Serv…
  • Loading branch information
@abutters
abutters authored May 3, 2023
2 parents 2339377 + b6a2014 commit dea264b
Show file tree
Hide file tree
Showing 21 changed files with 1,006 additions and 233 deletions.
53 changes: 25 additions & 28 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile ~/.gitignore_global

# Ignore bundler config
/.bundle

# Ignore the build directory
/build

# Ignore cache
/.sass-cache
/.cache

# Ignore .DS_store file
.DS_Store

Staticfile.auth

/vendor
/public
/target
/project/project
/project/target
logs
project/project
project/target
target
lib_managed
public/
tmp
.history
dist
/.idea
/*.iml
/*.ipr
/out
/.idea_modules
/.classpath
/.project
/logs
.idea
/.bsp
/RUNNING_PID
/.settings
*.iws
node_modules/
npm-debug.log
yarn-debug.log
yarn-error.log
/vendor
/.batect
/.bsp
1 change: 1 addition & 0 deletions .node-version
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
16.11.0
2 changes: 1 addition & 1 deletion .ruby-version
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.3
3.1.2
17 changes: 17 additions & 0 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
FROM noonat/rbenv-nodenv

# Update list of Ruby versions in rbenv
RUN cd ~/.rbenv/plugins/ruby-build && git pull
# Install version of Ruby that we want
COPY .ruby-version /tmp
RUN cd /tmp && rbenv install

# Update list of Node versions in nodenv
RUN cd ~/.nodenv/plugins/node-build && git pull
# Install version of Node that we want
COPY .node-version /tmp
RUN cd /tmp && nodenv install

# Make root accessible to other users, this is because the batect tasks run as the current user
# but need access to rbenv and nodenv
RUN chmod +x /root
4 changes: 0 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,4 @@ gem 'tzinfo-data', platforms: [:mswin, :mingw, :jruby]
# Include the tech docs gem
gem 'govuk_tech_docs'

# Overrride middleman-search with our fork.
# See: https://github.com/manastech/middleman-search/pull/24
# gem 'middleman-search', git: 'https://github.com/alphagov/middleman-search'

gem 'thin', '~> 1.7.0'
171 changes: 86 additions & 85 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,23 @@
GEM
remote: https://rubygems.org/
specs:
activesupport (5.2.4.5)
activesupport (7.0.4.3)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
autoprefixer-rails (9.8.6.5)
execjs
backports (3.20.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
addressable (2.8.4)
public_suffix (>= 2.0.2, < 6.0)
autoprefixer-rails (10.4.13.0)
execjs (~> 2)
backports (3.24.1)
chronic (0.10.2)
chunky_png (1.4.0)
coderay (1.1.3)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
commonmarker (0.21.2)
ruby-enum (~> 0.5)
commonmarker (0.23.9)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
Expand All @@ -32,21 +30,21 @@ GEM
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
concurrent-ruby (1.1.8)
contracts (0.13.0)
daemons (1.3.1)
dotenv (2.7.6)
em-websocket (0.5.2)
concurrent-ruby (1.2.2)
contracts (0.17)
daemons (1.4.1)
dotenv (2.8.1)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
http_parser.rb (~> 0)
erubis (2.7.0)
eventmachine (1.2.7)
execjs (2.7.0)
fast_blank (1.0.0)
fastimage (2.2.2)
ffi (1.14.2)
govuk_tech_docs (2.1.0)
activesupport
execjs (2.8.1)
fast_blank (1.0.1)
fastimage (2.2.6)
ffi (1.15.5)
govuk_tech_docs (3.3.1)
autoprefixer-rails (~> 10.2)
chronic (~> 0.10.2)
middleman (~> 4.0)
middleman-autoprefixer (~> 2.10.0)
Expand All @@ -56,69 +54,67 @@ GEM
middleman-sprockets (~> 4.0.0)
middleman-syntax (~> 3.2.0)
nokogiri
openapi3_parser (~> 0.5.0)
pry
redcarpet (~> 3.5.0)
sass
sprockets (~> 4.0.0)
haml (5.2.1)
openapi3_parser (~> 0.9.0)
redcarpet (~> 3.5.1)
haml (5.2.2)
temple (>= 0.8.0)
tilt
hamster (3.0.0)
concurrent-ruby (~> 1.0)
hashie (3.6.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
http_parser.rb (0.8.0)
i18n (1.6.0)
concurrent-ruby (~> 1.0)
kramdown (2.3.0)
kramdown (2.4.0)
rexml
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
memoist (0.16.2)
method_source (1.0.0)
middleman (4.3.11)
middleman (4.4.3)
coffee-script (~> 2.2)
haml (>= 4.0.5)
haml (>= 4.0.5, < 6.0)
kramdown (>= 2.3.0)
middleman-cli (= 4.3.11)
middleman-core (= 4.3.11)
middleman-autoprefixer (2.10.1)
autoprefixer-rails (~> 9.1)
middleman-cli (= 4.4.3)
middleman-core (= 4.4.3)
middleman-autoprefixer (2.10.0)
autoprefixer-rails (>= 9.1.4)
middleman-core (>= 3.3.3)
middleman-cli (4.3.11)
middleman-cli (4.4.3)
thor (>= 0.17.0, < 2.0)
middleman-compass (4.0.1)
compass (>= 1.0.0, < 2.0.0)
middleman-core (>= 4.0.0)
middleman-core (4.3.11)
activesupport (>= 4.2, < 6.0)
addressable (~> 2.3)
middleman-core (4.4.3)
activesupport (>= 6.1, < 7.1)
addressable (~> 2.4)
backports (~> 3.6)
bundler
contracts (~> 0.13.0)
bundler (~> 2.0)
contracts (~> 0.13)
dotenv
erubis
execjs (~> 2.0)
fast_blank
fastimage (~> 2.0)
hamster (~> 3.0)
hashie (~> 3.4)
i18n (~> 0.9.0)
listen (~> 3.0.0)
i18n (~> 1.6.0)
listen (~> 3.0)
memoist (~> 0.14)
padrino-helpers (~> 0.13.0)
padrino-helpers (~> 0.15.0)
parallel
rack (>= 1.4.5, < 3)
sassc (~> 2.0)
servolux
tilt (~> 2.0.9)
toml
uglifier (~> 3.0)
middleman-livereload (3.4.6)
webrick
middleman-livereload (3.4.7)
em-websocket (~> 0.5.1)
middleman-core (>= 3.3)
rack-livereload (~> 0.3.15)
middleman-search-gds (0.11.1)
middleman-search-gds (0.11.2)
execjs (~> 2.6)
middleman-core (>= 3.2)
nokogiri (~> 1.6)
Expand All @@ -128,59 +124,64 @@ GEM
middleman-syntax (3.2.0)
middleman-core (>= 3.2)
rouge (~> 3.2)
mini_portile2 (2.5.0)
minitest (5.14.3)
mini_portile2 (2.8.1)
minitest (5.18.0)
multi_json (1.15.0)
nokogiri (1.11.1)
mini_portile2 (~> 2.5.0)
nokogiri (1.14.3)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
nokogiri (1.14.3-arm64-darwin)
racc (~> 1.4)
nokogiri (1.14.3-x86_64-darwin)
racc (~> 1.4)
openapi3_parser (0.5.2)
nokogiri (1.14.3-x86_64-linux)
racc (~> 1.4)
openapi3_parser (0.9.2)
commonmarker (~> 0.17)
padrino-helpers (0.13.3.4)
i18n (~> 0.6, >= 0.6.7)
padrino-support (= 0.13.3.4)
padrino-helpers (0.15.3)
i18n (>= 0.6.7, < 2)
padrino-support (= 0.15.3)
tilt (>= 1.4.1, < 3)
padrino-support (0.13.3.4)
activesupport (>= 3.1)
parallel (1.20.1)
pry (0.14.0)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (4.0.6)
racc (1.5.2)
rack (2.2.3)
padrino-support (0.15.3)
parallel (1.23.0)
parslet (2.0.0)
public_suffix (5.0.1)
racc (1.6.2)
rack (2.2.6.4)
rack-livereload (0.3.17)
rack
rb-fsevent (0.10.4)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
redcarpet (3.5.1)
rexml (3.2.4)
rouge (3.26.0)
ruby-enum (0.9.0)
i18n
rexml (3.2.5)
rouge (3.30.0)
sass (3.4.25)
sassc (2.4.0)
ffi (~> 1.9)
servolux (0.13.0)
sprockets (4.0.2)
sprockets (4.2.0)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
temple (0.8.2)
rack (>= 2.2.4, < 4)
temple (0.10.0)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
rack (>= 1, < 3)
thor (1.1.0)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.9)
thread_safe (~> 0.1)
thor (1.2.1)
tilt (2.0.11)
toml (0.3.0)
parslet (>= 1.8.0, < 3.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
webrick (1.8.1)

PLATFORMS
ruby
universal-darwin-19
x86_64-linux

DEPENDENCIES
govuk_tech_docs
Expand All @@ -189,4 +190,4 @@ DEPENDENCIES
wdm (~> 0.1.0)

BUNDLED WITH
1.16.6
2.3.7
Loading

0 comments on commit dea264b

Please sign in to comment.