Skip to content

Commit 00ffb3c

Browse files
authored
Refactor vite script compilation (#2887)
* Refactor vite script compilation Converts the bundling of scripts to generate an IIFE (standard browser compatible) style script instead of a module with a legacy version. This better supports the jquery external dependency that other site scripts rely on. * update CI workflow minification test
1 parent befbd76 commit 00ffb3c

14 files changed

Lines changed: 74 additions & 180 deletions

.github/workflows/ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ jobs:
119119
run : |
120120
find dt-assets/ -iname "*.min.js" -or -iname "*.map" -or -iname "*.min.css" -delete && rm -rf build/
121121
vite build
122+
vite build --config vite.config.scripts.js
122123
git diff --exit-code -- . ':(exclude)package-lock.json'
123124
124125
- name: Install Subversion

dt-assets/build/css/style.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dt-assets/build/js/polyfills-legacy.min.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

dt-assets/build/js/polyfills-legacy.min.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dt-assets/build/js/scripts-legacy.min.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

dt-assets/build/js/scripts-legacy.min.js.map

Lines changed: 0 additions & 1 deletion
This file was deleted.

dt-assets/build/js/scripts.min.js

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dt-assets/build/js/scripts.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dt-assets/build/manifest.json

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,4 @@
11
{
2-
"dt-assets/js/main-legacy.js": {
3-
"file": "js/scripts-legacy.min.js",
4-
"name": "scripts",
5-
"src": "dt-assets/js/main-legacy.js",
6-
"isEntry": true
7-
},
8-
"dt-assets/js/main.js": {
9-
"file": "js/scripts.min.js",
10-
"name": "scripts",
11-
"src": "dt-assets/js/main.js",
12-
"isEntry": true
13-
},
142
"dt-assets/scss/login.scss": {
153
"file": "css/login.min.css",
164
"src": "dt-assets/scss/login.scss",
@@ -55,11 +43,5 @@
5543
"names": [
5644
"light.css"
5745
]
58-
},
59-
"vite/legacy-polyfills-legacy": {
60-
"file": "js/polyfills-legacy.min.js",
61-
"name": "polyfills",
62-
"src": "vite/legacy-polyfills-legacy",
63-
"isEntry": true
6446
}
6547
}

dt-assets/functions/enqueue-scripts.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,7 @@ function dt_site_scripts() {
7878
wp_enqueue_script( 'jquery-ui' );
7979

8080
// Register site scripts
81-
// Although WP has wp_enqueue_script_module to be able to load scripts.min.js directly as a js module,
82-
// WP doesn't let module scripts depend on classic scripts (scripts.min.js depending on jquery) or
83-
// vice versa (modular-list.js depending on scripts.min.js). So at least for now, we need to depend on
84-
// the legacy scripts that many wp scripts depend on via the 'site-js' handle.
85-
dt_theme_enqueue_script( 'site-polyfills', 'dt-assets/build/js/polyfills-legacy.min.js', array( 'jquery' ), true );
86-
dt_theme_enqueue_script( 'site-js', 'dt-assets/build/js/scripts-legacy.min.js', array( 'jquery', 'site-polyfills' ), true );
81+
dt_theme_enqueue_script( 'site-js', 'dt-assets/build/js/scripts.min.js', array( 'jquery' ), true );
8782

8883
// Register main stylesheet. Enable HMR by loading from vite if possible
8984
$vite_dev_server_running = false;

0 commit comments

Comments
 (0)