Skip to content

Commit c8625ff

Browse files
simplify install and maintaining dependencies (#3795)
I was always unhappy when maintaining dependency updates to have 3 `package.json` files. This PR moves all deps into the main `package.json` and removes the folders `fonts` and `vendor`. If accepted I will update the docs too. --------- Co-authored-by: Kristjan ESPERANTO <[email protected]>
1 parent e26aed9 commit c8625ff

18 files changed

+252
-367
lines changed

.github/dependabot.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,3 @@ updates:
1818
- "Skip Changelog"
1919
- "dependencies"
2020
- "javascript"
21-
22-
- package-ecosystem: "npm"
23-
directory: "/vendor"
24-
schedule:
25-
interval: "monthly"
26-
target-branch: "develop"
27-
labels:
28-
- "Skip Changelog"
29-
- "dependencies"
30-
- "javascript"
31-
32-
- package-ecosystem: "npm"
33-
directory: "/fonts"
34-
schedule:
35-
interval: "monthly"
36-
target-branch: "develop"
37-
labels:
38-
- "Skip Changelog"
39-
- "dependencies"
40-
- "javascript"

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ coverage
1010
.lock-wscript
1111
build/Release
1212
/node_modules/**/*
13-
fonts/node_modules/**/*
14-
vendor/node_modules/**/*
1513
!/tests/node_modules/**/*
1614
jspm_modules
1715
.npm
@@ -67,6 +65,8 @@ Temporary Items
6765
/css/*
6866
!/css/custom.css.sample
6967
!/css/main.css
68+
!/css/roboto.css
69+
!/css/font-awesome.css
7070

7171
# Ignore users config file but keep the sample.
7272
/config/*

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ planned for 2025-07-01
3131
- Switch Stylelint config to flat format and simplify Stylelint scripts
3232
- [workflow] Replace Node.js version v23 with v24 (#3770)
3333
- [refactor] Replace deprecated constants `fs.F_OK` and `fs.R_OK` (#3789)
34-
- [refactor] Replace `ansis` with built-in function `util.styleText`
34+
- [refactor] Replace `ansis` with built-in function `util.styleText` (#3793)
35+
- [core] Integrate stuff from `vendor` and `fonts` folders into main `package.json`, simplifies install and maintaining dependencies (#3795)
3536

3637
### Fixed
3738

cspell.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,6 @@
244244
"Ybbet",
245245
"yearmatchgroup"
246246
],
247-
"ignorePaths": ["node_modules/**", "modules/**", "vendor/node_modules/**", "translations/**", "tests/mocks/**", "tests/e2e/modules/clock_es_spec.js", "fonts/roboto.css"],
247+
"ignorePaths": ["node_modules/**", "modules/**", "translations/**", "tests/mocks/**", "tests/e2e/modules/clock_es_spec.js", "css/roboto.css"],
248248
"dictionaries": ["node"]
249249
}
File renamed without changes.

fonts/roboto.css renamed to css/roboto.css

Lines changed: 112 additions & 112 deletions
Large diffs are not rendered by default.

fonts/package-lock.json

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

fonts/package.json

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

index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
<link rel="icon" href="data:;base64,iVBORw0KGgo=" />
1414
<link rel="stylesheet" type="text/css" href="css/main.css" />
15-
<link rel="stylesheet" type="text/css" href="fonts/roboto.css" />
16-
<link rel="stylesheet" type="text/css" href="vendor/node_modules/animate.css/animate.min.css" />
15+
<link rel="stylesheet" type="text/css" href="css/roboto.css" />
16+
<link rel="stylesheet" type="text/css" href="node_modules/animate.css/animate.min.css" />
1717
<!-- custom.css is loaded by the loader.js to make sure it's loaded after the module css files. -->
1818

1919
<script type="text/javascript">
@@ -42,10 +42,10 @@
4242
</div>
4343
<div class="region fullscreen above"><div class="container"></div></div>
4444
<script type="text/javascript" src="socket.io/socket.io.js"></script>
45-
<script type="text/javascript" src="vendor/node_modules/nunjucks/browser/nunjucks.min.js"></script>
45+
<script type="text/javascript" src="node_modules/nunjucks/browser/nunjucks.min.js"></script>
4646
<script type="text/javascript" src="js/defaults.js"></script>
4747
<script type="text/javascript" src="#CONFIG_FILE#"></script>
48-
<script type="text/javascript" src="vendor/vendor.js"></script>
48+
<script type="text/javascript" src="js/vendor.js"></script>
4949
<script type="text/javascript" src="modules/default/defaultmodules.js"></script>
5050
<script type="text/javascript" src="modules/default/utils.js"></script>
5151
<script type="text/javascript" src="js/logger.js"></script>

js/loader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ const Loader = (function () {
260260
// This file is available in the vendor folder.
261261
// Load it from this vendor folder.
262262
loadedFiles.push(fileName.toLowerCase());
263-
return loadFile(`vendor/${vendor[fileName]}`);
263+
return loadFile(`${vendor[fileName]}`);
264264
}
265265

266266
// File not loaded yet.

0 commit comments

Comments
 (0)