gabehf/sqm-dashboards
1
0
Fork 0
mirror of https://github.com/edcommonwealth/sqm-dashboards.git synced 2026-03-07 21:48:16 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change bundling script to use yarn.

Browse source
This commit is contained in:
rebuilt 2021-10-23 20:14:26 +02:00
parent 12c1a3b7fc
commit afbbb0fc75
5 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -14,7 +14,6 @@ gem 'pg'
# Use Puma as the app server # Use Puma as the app server
gem "puma", ">= 5.5.2" gem "puma", ">= 5.5.2"
# Use SCSS for stylesheets
# Use Uglifier as compressor for JavaScript assets # Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0' gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes # See https://github.com/rails/execjs#readme for more supported runtimes

7
Gemfile.lock
View file

@ -150,8 +150,6 @@ GEM
nested_scaffold (1.1.0) nested_scaffold (1.1.0)
newrelic_rpm (8.0.0) newrelic_rpm (8.0.0)
nio4r (2.5.8) nio4r (2.5.8)
nokogiri (1.12.5-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.12.5-x86_64-linux) nokogiri (1.12.5-x86_64-linux)
racc (~> 1.4) racc (~> 1.4)
omniauth (2.0.4) omniauth (2.0.4)
@ -163,7 +161,7 @@ GEM
public_suffix (4.0.6) public_suffix (4.0.6)
puma (5.5.2) puma (5.5.2)
nio4r (~> 2.0) nio4r (~> 2.0)
racc (1.5.2) racc (1.6.0)
rack (2.2.3) rack (2.2.3)
rack-protection (2.1.0) rack-protection (2.1.0)
rack rack
@ -265,10 +263,9 @@ GEM
websocket-extensions (0.1.5) websocket-extensions (0.1.5)
xpath (3.2.0) xpath (3.2.0)
nokogiri (~> 1.8) nokogiri (~> 1.8)
zeitwerk (2.4.2) zeitwerk (2.5.1)
PLATFORMS PLATFORMS
x86_64-darwin-20
x86_64-linux x86_64-linux
DEPENDENCIES DEPENDENCIES

1
app/assets/config/manifest.js
View file

@ -1,4 +1,3 @@
//= link_tree ../images //= link_tree ../images
//= link_directory ../javascripts .js //= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
//= link_tree ../builds //= link_tree ../builds

2
package.json
View file

@ -16,7 +16,7 @@
"scripts": { "scripts": {
"build": "esbuild app/javascript/*.* --bundle --outdir=app/assets/builds", "build": "esbuild app/javascript/*.* --bundle --outdir=app/assets/builds",
"test": "jest", "test": "jest",
"build:css": "sass ./app/assets/stylesheets/application.bootstrap.scss ./app/assets/builds/application.css --no-source-map --load-path=node_modules --watch & sass ./app/assets/stylesheets/sqm_application.scss ./app/assets/builds/sqm_application.css --no-source-map --load-path=node_modules --watch & sass ./app/assets/stylesheets/welcome.scss ./app/assets/builds/welcome.css --no-source-map --load-path=node_modules" "build:css": "sass ./app/assets/stylesheets/application.bootstrap.scss ./app/assets/builds/application.css --no-source-map --load-path=node_modules & sass ./app/assets/stylesheets/sqm_application.scss ./app/assets/builds/sqm_application.css --no-source-map --load-path=node_modules & sass ./app/assets/stylesheets/welcome.scss ./app/assets/builds/welcome.css --no-source-map --load-path=node_modules"
}, },
"devDependencies": { "devDependencies": {
"jest": "^27.2.5" "jest": "^27.2.5"

2
scripts/bundling.sh
View file

@ -2,4 +2,4 @@
set -eux set -eux
yarn build --watch & yarn build:css --watch yarn sass ./app/assets/stylesheets/application.bootstrap.scss ./app/assets/builds/application.css --no-source-map --load-path=node_modules --watch & yarn sass ./app/assets/stylesheets/sqm_application.scss ./app/assets/builds/sqm_application.css --no-source-map --load-path=node_modules --watch & npx sass ./app/assets/stylesheets/welcome.scss ./app/assets/builds/welcome.css --no-source-map --load-path=node_modules --watch & yarn build --watch