Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Assets Build Tool (Assets Manager) #17262

Open
wants to merge 164 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
b4d57c8
Asset build tool
Skrypt Apr 4, 2024
0a226e7
Merge branch 'main' into skrypt/asset-build-tool
Skrypt Apr 12, 2024
e0d37a9
wip yarn build
Skrypt Apr 12, 2024
0c7f561
WIP Asset Build Tool
Skrypt Dec 19, 2024
4354f70
wip AdminMenu Assets.json
Skrypt Dec 19, 2024
979fcf1
Merge branch 'main' into skrypt/asset-build-tool
Skrypt Dec 19, 2024
7857435
wip Build Tool
Skrypt Dec 19, 2024
e045ae5
update SRI
Skrypt Dec 19, 2024
f475527
Use yarn for testing build assets
Skrypt Dec 19, 2024
18ba519
add corepack
Skrypt Dec 19, 2024
b424cde
yarn build instead of rebuild
Skrypt Dec 19, 2024
3314011
Rebuild all
Skrypt Dec 20, 2024
e476a06
Fix CI build
Skrypt Dec 20, 2024
c7325f3
CorePack
Skrypt Dec 20, 2024
e57bc54
Remove postinstall
Skrypt Dec 20, 2024
88510d2
build
Skrypt Dec 20, 2024
e5654ea
update yarn.lock
Skrypt Dec 20, 2024
ab69a7b
Adding gulp process as part of concurently
Skrypt Dec 20, 2024
0a3fc8f
remove gulp-rebuild
Skrypt Dec 20, 2024
3f75b7f
yarn build -g
Skrypt Dec 20, 2024
ab67333
Use gulp rebuild
Skrypt Dec 20, 2024
c3e10e3
Add command options
Skrypt Dec 20, 2024
d93a0cb
Update .scripts/assets-build-tool/Readme.md
Skrypt Dec 21, 2024
ed0c52a
Revert changes in OC.AdminMenu
Skrypt Dec 21, 2024
f854e18
Merge branch 'skrypt/asset-build-tool' of https://github.com/OrchardC…
Skrypt Dec 21, 2024
6bec184
Fix build under linux
Skrypt Jan 6, 2025
9e409c9
use old gulp rebuild
Skrypt Jan 6, 2025
5d63fbc
revert last commit
Skrypt Jan 6, 2025
1f5e8fa
revert
Skrypt Jan 6, 2025
7b97f88
keep npm install for gulp
Skrypt Jan 6, 2025
d5bc9f9
revert assets.json
Skrypt Jan 6, 2025
b225478
update pl
Skrypt Jan 6, 2025
5d6e58a
fix build
Skrypt Jan 6, 2025
96225f6
update yarn.lock
Skrypt Jan 6, 2025
e2ea2af
up pack.jso
Skrypt Jan 6, 2025
28a0c61
yarn cache clean
Skrypt Jan 6, 2025
e74955a
fix assets.json paths
Skrypt Jan 6, 2025
cb54b23
update assets paths
Skrypt Jan 6, 2025
99823ee
fix gulp rebuild
Skrypt Jan 6, 2025
a0dc560
use yarn build -gr
Skrypt Jan 6, 2025
c77e701
Merge branch 'main' into skrypt/asset-build-tool
Skrypt Jan 6, 2025
8d5517b
Use GulpAssets.json and Assets.json
Skrypt Jan 8, 2025
119913b
Add missing dependencies in package.json files
Skrypt Jan 8, 2025
4f71a9b
Add null check on Parcel Bundles
Skrypt Jan 8, 2025
52c1b2b
Add default destination path for sass.mjs
Skrypt Jan 8, 2025
2995718
Null check on asset group name
Skrypt Jan 8, 2025
e53a7ac
Remove root package-lock.json file
Skrypt Jan 8, 2025
68c8202
Merge branch 'main' into skrypt/asset-build-tool
Skrypt Jan 8, 2025
074da60
Upgrade build tool dependencies
Skrypt Jan 8, 2025
e3d4cbf
OrchardCore.Resources move to new Assets.json
Skrypt Jan 8, 2025
10187bb
Add retry logic to Concurrently
Skrypt Jan 8, 2025
fd7c476
update yarn.lock
Skrypt Jan 8, 2025
7b19fe8
Migrate OrchardCore.Resources assets
Skrypt Jan 8, 2025
0422ac6
Revert rename assets.json files
Skrypt Jan 9, 2025
3042b25
WIP Migrate to Assets2.json
Skrypt Jan 9, 2025
2fc2e86
Default to /wwwroot/Scripts
Skrypt Jan 9, 2025
10976af
Rename folder with Uppercase
Skrypt Jan 9, 2025
2f47d39
Update tags
Skrypt Jan 9, 2025
e7c1afc
Add \r\n on map EOF
Skrypt Jan 9, 2025
9048f64
test
Skrypt Jan 9, 2025
f78da9c
use \n
Skrypt Jan 9, 2025
142db4e
Remove folder
Skrypt Jan 9, 2025
4795c60
Add back folder
Skrypt Jan 9, 2025
ce09ff9
use \n in source map files
Skrypt Jan 9, 2025
c5a0eac
replace crlf with lf
Skrypt Jan 9, 2025
8ea0719
use gitattributes for eol
Skrypt Jan 9, 2025
ef59521
Update .gitattributes
Skrypt Jan 9, 2025
79a4125
update map files
Skrypt Jan 9, 2025
5192ddb
Merge branch 'skrypt/asset-build-tool' of https://github.com/OrchardC…
Skrypt Jan 9, 2025
23792df
update gitattributes
Skrypt Jan 9, 2025
9878aea
remove
Skrypt Jan 9, 2025
e8c9414
add back
Skrypt Jan 9, 2025
da4b149
add back gitatt
Skrypt Jan 9, 2025
cfa3af3
gitatt
Skrypt Jan 9, 2025
eaf8237
gitatt
Skrypt Jan 9, 2025
23650c7
rem
Skrypt Jan 9, 2025
627c918
add
Skrypt Jan 9, 2025
6ebac66
Migrate some themes
Skrypt Jan 10, 2025
743f9ba
Merge branch 'main' into skrypt/asset-build-tool
Skrypt Jan 10, 2025
5d4a1eb
Adding PostCSS-LTR
Skrypt Jan 10, 2025
86948be
fix
Skrypt Jan 10, 2025
3999163
Fix again
Skrypt Jan 10, 2025
782a8a2
fix js map
Skrypt Jan 10, 2025
6071ac5
update from linux
Skrypt Jan 11, 2025
7b3d8ea
Refactor OC.Setup with Typescript
Skrypt Jan 11, 2025
f4adea5
More migration to Asset2
Skrypt Jan 11, 2025
dbfe1a9
Format .cshtml
Skrypt Jan 11, 2025
42f5c7a
Update workspaces
Skrypt Jan 11, 2025
bdb9cfa
Add common frontend workspace
Skrypt Jan 11, 2025
9f5d234
Rename to password-strenght.ts
Skrypt Jan 11, 2025
8d56b55
Migrate OC.Themes
Skrypt Jan 11, 2025
0021d56
WIP migration
Skrypt Jan 17, 2025
803bf7e
WIP ts migration
Skrypt Jan 21, 2025
a86a5a8
Merge branch 'main' into skrypt/asset-build-tool
Skrypt Jan 21, 2025
578d1cb
Fix Media Gallery not displaying
Skrypt Jan 21, 2025
1c25005
Remove .map files
Skrypt Jan 21, 2025
9a5c043
.map only on development
Skrypt Jan 21, 2025
2e075c6
Remove
Skrypt Jan 21, 2025
cde492c
fix build
Skrypt Jan 21, 2025
2835695
Fix Media app
Skrypt Jan 21, 2025
6aacce9
Fix File App
Skrypt Jan 21, 2025
cad3e54
Migrate OrchardCore.Workflows
Skrypt Jan 21, 2025
6d8e081
Move package.json, remove lock
Skrypt Jan 21, 2025
7b09bce
Remove package-lock.json files
Skrypt Jan 21, 2025
7c13411
remove workspaces globs
Skrypt Jan 25, 2025
35a108e
Add watcher on sass action
Skrypt Jan 25, 2025
df9c4ab
use GulpAssets.json and Assets.json
Skrypt Jan 25, 2025
5685a43
Add Webpack action
Skrypt Feb 3, 2025
70dcfa6
Add Vite
Skrypt Feb 3, 2025
8c366a1
Add Vite Example in Media module
Skrypt Feb 3, 2025
cbe94c8
Vite watcher
Skrypt Feb 3, 2025
17cc0ed
Add host scripts for Vite
Skrypt Feb 3, 2025
7842aa4
Fix vite.config.ts example
Skrypt Feb 3, 2025
100bb49
Build on Linux
Skrypt Feb 3, 2025
b8b584a
Build all on linux
Skrypt Feb 3, 2025
956d8d8
Remove OrchardCore.Modules root folder workspace glob
Skrypt Feb 4, 2025
7dae9ad
AuditTrail Diffviewer migration
Skrypt Feb 4, 2025
dcf6f7c
Add host action to Parcel
Skrypt Feb 4, 2025
ab5bf65
Add Webpack watch and host
Skrypt Feb 5, 2025
dfa9ba7
Update yarn.lock
Skrypt Feb 5, 2025
01dbe67
Merge branch 'main' into skrypt/asset-build-tool
Skrypt Feb 5, 2025
1fa84be
Migrate TheAdmin
Skrypt Feb 5, 2025
cb4ed6a
Rename to Assets Manager
Skrypt Feb 5, 2025
afa14c9
update build.mjs
Skrypt Feb 5, 2025
2f4ddb4
Update Documentation and fix SASS watcher
Skrypt Feb 7, 2025
23199ad
fix sass watcher
Skrypt Feb 7, 2025
7b39fad
remove
Skrypt Feb 7, 2025
bdbacaa
rename
Skrypt Feb 7, 2025
71fc261
Update Documentation
Skrypt Feb 7, 2025
cad9345
Documentation
Skrypt Feb 7, 2025
f480902
Merge branch 'main' into skrypt/asset-build-tool
Skrypt Feb 7, 2025
7ce57ce
Document Vite example
Skrypt Feb 7, 2025
407fa32
Doc
Skrypt Feb 7, 2025
e617958
Vite Getting Started doc
Skrypt Feb 7, 2025
c40ea58
Parcel Bundling
Skrypt Feb 7, 2025
7a5449f
Adjust setup password popover styles
Skrypt Feb 12, 2025
c4e740e
full yarn build -gr
Skrypt Feb 12, 2025
58bce09
Fix admin menu icon picker
Skrypt Feb 12, 2025
716b0c9
fix build
Skrypt Feb 12, 2025
8d47e13
fix build
Skrypt Feb 12, 2025
5e4b9d3
Typos
Piedone Feb 13, 2025
fadd012
add eslint config
Skrypt Feb 13, 2025
1c34040
add yarn check (vue-tsc)
Skrypt Feb 13, 2025
c389b80
Update src/docs/guides/README.md
Skrypt Feb 13, 2025
d086276
Apply suggested changes
Skrypt Feb 13, 2025
0ee6aed
Merge branch 'skrypt/asset-build-tool' of https://github.com/OrchardC…
Skrypt Feb 13, 2025
358840e
typo
Skrypt Feb 13, 2025
24ed014
Remove unnecessary files
Skrypt Feb 13, 2025
fbf2644
Remove unnecessary files
Skrypt Feb 13, 2025
f760861
React to comments
Skrypt Feb 13, 2025
e094ad3
Upgrading with yarn upgrade-interactive
Skrypt Feb 13, 2025
32bb473
Update src/docs/releases/3.0.0.md
Skrypt Feb 15, 2025
2ad43ad
Fix admin-menu-icon-picker using min action
Skrypt Feb 15, 2025
f36b07a
Merge branch 'skrypt/asset-build-tool' of https://github.com/OrchardC…
Skrypt Feb 15, 2025
3d156e7
update yarn.lock
Skrypt Feb 15, 2025
69981e6
doc
Skrypt Feb 15, 2025
5106d07
doc
Skrypt Feb 15, 2025
3db894c
use OC.Resource jquery.nested...
Skrypt Feb 15, 2025
e8a3973
Do not allow watch all
Skrypt Feb 15, 2025
8788273
Create .esproj projects
Skrypt Feb 15, 2025
1c9970f
Remove esproj
Skrypt Feb 15, 2025
d140670
Clarifying docs
Piedone Feb 15, 2025
76cd7c9
Clarifying yarn install
Piedone Feb 15, 2025
edcfc56
Watch docs
Piedone Feb 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/assets_validation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:

if ($changes)
{
Write-Output 'Please make sure to build the assets properly before pushing, see https://docs.orchardcore.net/en/latest/guides/gulp-pipeline/.'
Write-Output 'Please make sure to build the assets properly before pushing, see https://docs.orchardcore.net/en/latest/guides/assets-manager/.'
Write-Output 'The following files changed:'
Write-Output $changes
Write-Output 'You can also download the attached artifact to see the changes.'
Expand Down
2 changes: 1 addition & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"trailingComma": "all",
"tabWidth": 2,
"tabWidth": 4,
"semi": true,
"printWidth": 180
}
14 changes: 7 additions & 7 deletions .scripts/assets-manager/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,27 +22,27 @@
"@parcel/transformer-sass": "2.13.3",
"@parcel/transformer-vue": "2.13.3",
"@parcel/utils": "2.13.3",
"@swc/core": "1.10.4",
"@swc/core": "1.10.16",
"@vitejs/plugin-vue": "^5.2.1",
"chalk": "^5.2.0",
"chokidar": "^4.0.3",
"concurrently": "9.1.2",
"fs-extra": "^11.2.0",
"glob": "^11.0.0",
"fs-extra": "^11.3.0",
"glob": "^11.0.1",
"json5": "^2.2.3",
"lightningcss": "1.29.1",
"lodash": "^4.17.21",
"minimist": "^1.2.8",
"parcel": "2.13.3",
"parcel-config-vue2": "^0.1.3",
"parcel-transformer-vue2": "^0.1.7",
"postcss": "8.4.49",
"postcss": "8.5.2",
"postcss-rtlcss": "5.6.0",
"sass": "^1.83.1",
"vite": "^6.0.11",
"sass": "^1.84.0",
"vite": "^6.1.0",
"vue": "^3.5.13",
"vue-hot-reload-api": "^2.3.4",
"webpack": "^5.97.1",
"webpack": "^5.98.0",
"webpack-dev-server": "^5.2.0"
},
"eslintConfig": {
Expand Down
19 changes: 19 additions & 0 deletions OrchardCore.sln
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.UrlRewriting.Co
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OrchardCore.Roles.Abstractions", "src\OrchardCore\OrchardCore.Roles.Abstractions\OrchardCore.Roles.Abstractions.csproj", "{F5E7DCC3-12C2-4363-9702-639561A8101C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Assets Manager", "Assets Manager", "{55E466FD-7931-4816-9E3F-D7544E37E9FE}"
ProjectSection(SolutionItems) = preProject
.scripts\assets-manager\.gitignore = .scripts\assets-manager\.gitignore
.scripts\assets-manager\.parcelrc = .scripts\assets-manager\.parcelrc
.scripts\assets-manager\assetGroups.mjs = .scripts\assets-manager\assetGroups.mjs
.scripts\assets-manager\build.mjs = .scripts\assets-manager\build.mjs
.scripts\assets-manager\clean.mjs = .scripts\assets-manager\clean.mjs
.scripts\assets-manager\config.mjs = .scripts\assets-manager\config.mjs
.scripts\assets-manager\copy.mjs = .scripts\assets-manager\copy.mjs
.scripts\assets-manager\min.mjs = .scripts\assets-manager\min.mjs
.scripts\assets-manager\package.json = .scripts\assets-manager\package.json
.scripts\assets-manager\parcel.mjs = .scripts\assets-manager\parcel.mjs
.scripts\assets-manager\README.md = .scripts\assets-manager\README.md
.scripts\assets-manager\sass.mjs = .scripts\assets-manager\sass.mjs
.scripts\assets-manager\vite.mjs = .scripts\assets-manager\vite.mjs
.scripts\assets-manager\webpack.mjs = .scripts\assets-manager\webpack.mjs
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -1658,6 +1676,7 @@ Global
{675C8A76-C64F-47EC-B4F5-06D4F2D9662A} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
{7B18DD99-A7BB-4297-8679-D87289758756} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
{F5E7DCC3-12C2-4363-9702-639561A8101C} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
{55E466FD-7931-4816-9E3F-D7544E37E9FE} = {68F6113F-2F08-4412-B5E7-41B7164A0C7F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {46A1D25A-78D1-4476-9CBF-25B75E296341}
Expand Down
15 changes: 15 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import globals from "globals";
import pluginJs from "@eslint/js";
import tseslint from "typescript-eslint";
import pluginVue from "eslint-plugin-vue";


/** @type {import('eslint').Linter.Config[]} */
export default [
{files: ["**/*.{js,mjs,cjs,ts,vue}"]},
{languageOptions: { globals: globals.browser }},
pluginJs.configs.recommended,
...tseslint.configs.recommended,
...pluginVue.configs["flat/essential"],
{files: ["**/*.vue"], languageOptions: {parserOptions: {parser: tseslint.parser}}},
];
1 change: 1 addition & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ nav:
- Microsoft Entra ID (Azure AD) integration: guides/microsoft-entra-id-integration/README.md
- Create a Liquid Widget: guides/create-liquid-widget/README.md
- Query Content Items Based on Taxonomy: guides/query-content-items-based-on-taxonomy/README.md
- Assets manager: guides/assets-manager/README.md
- Gulp pipeline: guides/gulp-pipeline/README.md
- Key Topics:
- Manage your Content: topics/content-management/README.md
Expand Down
17 changes: 12 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"watch": "assets-manager watch",
"dry-run": "assets-manager dry-run",
"clean": "assets-manager clean",
"lint": "eslint ."
"lint": "eslint .",
"check": "vue-tsc --noEmit"
},
"workspaces": [
".scripts/assets-manager",
Expand All @@ -25,13 +26,17 @@
"@babel/core": "^7.22.11",
"@babel/preset-env": "^7.22.10",
"@babel/preset-flow": "7.22.5",
"@eslint/js": "^9.20.0",
"@orchardcore/assets-manager": "workspace:^",
"@popperjs/core": "2.11.8",
"all-contributors-cli": "^6.26.1",
"bootstrap": "5.3.3",
Skrypt marked this conversation as resolved.
Show resolved Hide resolved
"child_process": "^1.0.2",
"es6-promise": "4.2.8",
"glob": "^10.3.12",
"eslint": "^9.20.1",
"eslint-plugin-vue": "^9.32.0",
"glob": "^11.0.1",
"globals": "^15.15.0",
"graceful-fs": "4.2.11",
"gulp": "^4.0.2",
"gulp-babel": "8.0.0",
Expand All @@ -54,10 +59,12 @@
"merge-stream": "2.0.0",
"npm-run-all": "^4.1.5",
"path-posix": "1.0.0",
"postcss": "8.4.28",
"postcss": "8.5.2",
"postcss-rtl": "^2.0.0",
"rtlcss": "4.1.0",
"rtlcss": "4.3.0",
"source-map": "^0.7.4",
"typescript": "^5.2.2"
"typescript": "^5.7.3",
"typescript-eslint": "^8.24.0",
"vue-tsc": "^2.2.0"
}
}

Large diffs are not rendered by default.

Loading