Skip to content

Commit 0ded8b9

Browse files
committed
fix(theme): remove copyfiles dependency to resolve old glob warnings
Use a cp commpand to prevent more js packages
1 parent eedd17d commit 0ded8b9

3 files changed

Lines changed: 21 additions & 209 deletions

File tree

theme/package.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818
"lint:css": "stylelint ${EB_THEME:=openconext}/stylesheets/**/*.*ss",
1919
"clean": "rimraf ../public/images/* ../public/javascripts/* ../public/stylesheets/* ../public/fonts/*",
2020
"build": "node scripts/build.js",
21-
"buildtheme": "yarn build:clean && yarn build:js && yarn build:css && yarn build:copy:base && yarn build:copy:theme",
21+
"buildtheme": "yarn build:clean && yarn build:js && yarn build:css && bash scripts/copy-assets.sh",
2222
"build:clean": "rimraf ../public/javascripts/* ../public/stylesheets/*",
2323
"build:js": "mkdir -p ../public/javascripts && EB_THEME=${EB_THEME:=openconext} webpack --config webpack.config.js --mode production",
2424
"build:js:debug": "mkdir -p ../public/javascripts && EB_THEME=${EB_THEME:=openconext} webpack --config webpack.config.js --mode development",
2525
"build:css": "mkdir -p ../public/stylesheets && yarn build:css:sass && yarn build:css:postcss",
2626
"build:css:sass": "sass ${EB_THEME:=openconext}/stylesheets:../public/stylesheets/",
2727
"build:css:postcss": "BROWSERSLIST_CONFIG=.browserslistrc postcss ../public/stylesheets/*.css --use autoprefixer --use cssnano --no-map --dir ../public/stylesheets",
28-
"build:copy:base": "mkdir -p ../public/images && copyfiles --up 2 base/images/* ../public/images/ && mkdir -p ../public/fonts && copyfiles --up 2 -e base/stylesheets/fonts/*.txt -f base/stylesheets/fonts/* ../public/fonts",
29-
"build:copy:theme": "copyfiles --up 2 ${EB_THEME:=openconext}/images/* ../public/images/ && copyfiles --up 2 -e {EB_THEME:=openconext}/stylesheets/fonts/*.txt -f ${EB_THEME:=openconext}/stylesheets/fonts/* ../public/fonts",
3028
"create-theme": "node scripts/create-theme.js",
3129
"watch": "node scripts/watch.js",
3230
"watch:js": "mkdir -p ../public/javascripts && EB_THEME=${EB_THEME:=openconext} webpack --config webpack.config.js --mode development --watch",
@@ -40,7 +38,6 @@
4038
"@eslint/js": "^10.0.1",
4139
"autoprefixer": "^10.4",
4240
"babel-loader": "^9.0",
43-
"copyfiles": "^2.4",
4441
"core-js": "^3.32",
4542
"cssnano": "^7.1.1",
4643
"eslint": "^10.0.3",

theme/scripts/copy-assets.sh

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/usr/bin/env bash
2+
set -euo pipefail
3+
4+
THEME=${EB_THEME:-openconext}
5+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
6+
ROOT="$SCRIPT_DIR/.."
7+
8+
mkdir -p "$ROOT/../public/images" "$ROOT/../public/fonts"
9+
10+
# Copy base assets
11+
cp "$ROOT/base/images/"* "$ROOT/../public/images/"
12+
find "$ROOT/base/stylesheets/fonts/" -maxdepth 1 -type f ! -name '*.txt' -exec cp {} "$ROOT/../public/fonts/" \;
13+
14+
# Copy theme assets
15+
cp "$ROOT/$THEME/images/"* "$ROOT/../public/images/"
16+
if [ -d "$ROOT/$THEME/stylesheets/fonts" ]; then
17+
find "$ROOT/$THEME/stylesheets/fonts/" -maxdepth 1 -type f ! -name '*.txt' -exec cp {} "$ROOT/../public/fonts/" \;
18+
fi

0 commit comments

Comments
 (0)