Skip to content

Commit

Permalink
Merge pull request #1155 from userfrosting/feature-assets-improvement…
Browse files Browse the repository at this point in the history 
…s-forever

Misc. improvements to assets pipeline
  • Loading branch information
@lcharette
lcharette authored Jul 12, 2021
2 parents 4d2ea53 + 736b665 commit 9a8ca3d
Show file tree
Hide file tree
Showing 16 changed files with 198 additions and 329 deletions.
32 changes: 26 additions & 6 deletions .github/workflows/Build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: 14
node-version: ^14.0.0

- name: Setup Redis-server
uses: supercharge/[email protected]
Expand Down Expand Up @@ -135,7 +135,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: 14
node-version: ^14.0.0

- name: Setup Redis-server
uses: supercharge/[email protected]
Expand Down Expand Up @@ -217,7 +217,7 @@ jobs:

- uses: actions/setup-node@v2
with:
node-version: 14
node-version: ^14.0.0

- name: Setup Redis-server
uses: supercharge/[email protected]
Expand Down Expand Up @@ -321,8 +321,8 @@ jobs:
strategy:
fail-fast: false
matrix:
php_versions: ['8.0']
node_versions: ['12.17.0', '14', '15']
php_versions: [ '8.0' ]
node_versions: [ ^12.17.0, ^14, ^15 ]
os: [ubuntu-latest, windows-latest]

runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -350,4 +350,24 @@ jobs:
run: composer install --prefer-dist --no-progress

- name: Execute build
run: php bakery build-assets
run: php bakery build-assets

Asset-Build-Inspect:

name: Assets Build Inspection
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v2
with:
node-version: ^14.0.0

- name: Install Dependencies
working-directory: build
run: npm i

- name: Type Validation
working-directory: build
run: node_modules/.bin/tsc -p ./tsconfig.json
54 changes: 6 additions & 48 deletions app/sprinkles/account/asset-bundles.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,77 +3,35 @@
"js/pages/account-settings": {
"scripts": [
"userfrosting/js/pages/account-settings.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/forgot-password": {
"scripts": [
"userfrosting/js/pages/forgot-password.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/resend-verification": {
"scripts": [
"userfrosting/js/pages/resend-verification.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/set-or-reset-password": {
"scripts": [
"userfrosting/js/pages/set-or-reset-password.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/register": {
"scripts": [
"vendor/speakingurl/speakingurl.min.js",
"userfrosting/js/uf-captcha.js",
"userfrosting/js/pages/register.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/sign-in": {
"scripts": [
"vendor/urijs/src/URI.js",
"userfrosting/js/pages/sign-in.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
}
}
}
108 changes: 12 additions & 96 deletions app/sprinkles/admin/asset-bundles.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,144 +12,67 @@
"vendor/tablesorter/dist/js/widgets/widget-pager.min.js",
"userfrosting/js/query-string.js",
"userfrosting/js/uf-table.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/activities": {
"scripts": [
"userfrosting/js/pages/activities.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/dashboard": {
"scripts": [
"userfrosting/js/widgets/users.js",
"userfrosting/js/pages/dashboard.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/group": {
"scripts": [
"userfrosting/js/widgets/users.js",
"userfrosting/js/widgets/groups.js",
"userfrosting/js/pages/group.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/permission": {
"scripts": [
"userfrosting/js/widgets/users.js",
"userfrosting/js/pages/permission.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/role": {
"scripts": [
"userfrosting/js/widgets/users.js",
"userfrosting/js/widgets/roles.js",
"userfrosting/js/pages/role.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/user": {
"scripts": [
"userfrosting/js/widgets/users.js",
"userfrosting/js/pages/user.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/users": {
"scripts": [
"userfrosting/js/widgets/users.js",
"userfrosting/js/pages/users.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/groups": {
"scripts": [
"userfrosting/js/widgets/groups.js",
"userfrosting/js/pages/groups.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/permissions": {
"scripts": [
"userfrosting/js/pages/permissions.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/pages/roles": {
"scripts": [
"userfrosting/js/widgets/roles.js",
"userfrosting/js/pages/roles.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"css/admin": {
"styles": [
Expand All @@ -158,14 +81,7 @@
"vendor/tablesorter/dist/css/jquery.tablesorter.pager.min.css",
"userfrosting/css/tablesorter-reflow.css",
"userfrosting/css/tablesorter-custom.css"
],
"options": {
"result": {
"type": {
"styles": "plain"
}
}
}
]
}
}
}
36 changes: 4 additions & 32 deletions app/sprinkles/core/asset-bundles.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,28 +21,14 @@
"userfrosting/js/uf-modal.js",
"userfrosting/js/uf-copy.js",
"userfrosting/js/uf-init.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"js/form-widgets": {
"scripts": [
"vendor/speakingurl/speakingurl.min.js",
"userfrosting/js/uf-collection.js",
"vendor/fontawesome-iconpicker/dist/js/fontawesome-iconpicker.js"
],
"options": {
"result": {
"type": {
"scripts": "plain"
}
}
}
]
},
"css/main": {
"styles": [
Expand All @@ -57,26 +43,12 @@
"userfrosting/css/AdminLTE.css",
"userfrosting/css/AdminLTE-skins-all.css",
"userfrosting/css/userfrosting.css"
],
"options": {
"result": {
"type": {
"styles": "plain"
}
}
}
]
},
"css/form-widgets": {
"styles": [
"userfrosting/css/uf-collection.css"
],
"options": {
"result": {
"type": {
"styles": "plain"
}
}
}
]
}
}
}
4 changes: 2 additions & 2 deletions app/sprinkles/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"jquery": "^3.2.1",
"jquery-slimscroll": "~1.3.8",
"jquery-ui": "^1.12.0",
"jquery-validation": "~1.14.0",
"jquery-validation": "~1.19.3",
"moment": "^2.17.1",
"select2": "^4.0.5",
"speakingurl": "^11.0.0",
"tablesorter": "^2.28.5",
"urijs": "^1.18.4"
"urijs": "^1.19.6"
}
}
Loading

0 comments on commit 9a8ca3d

Please sign in to comment.