Skip to content

Commit 166b7a1

Browse files
Merge pull request #19712 from MauricioFauth/js-vendor-bundle
Import OpenLayers and Bootstrap directly using Webpack
2 parents 5ec8a81 + 3eb9ac9 commit 166b7a1

119 files changed

Lines changed: 217 additions & 252 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
js/vendor/
2-
js/dist/
31
public/js/
42
tmp/
53
vendor/

bin/internal/check-release-excludes.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ validateExtension() {
5252
foundFileExt
5353
fi
5454
;;
55-
public/js/dist/*)
55+
public/js/*)
5656
if [ "${extension}" != "js" ] && [ "${extension}" != "map" ]; then
5757
foundFileExt
5858
fi
5959
;;
60-
resources/js/src/*)
61-
if [ "${extension}" != "ts" ] && [ "${extension}" != "mjs" ]; then
60+
resources/js/*)
61+
if [ "${extension}" != "ts" ]; then
6262
foundFileExt
6363
fi
6464
;;

docs/faq.rst

Lines changed: 1 addition & 2 deletions

jest.config.cjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module.exports = {
44
extensionsToTreatAsEsm: ['.ts'],
55
coverageDirectory: '<rootDir>/build/javascript/',
6-
collectCoverageFrom: ['<rootDir>/resources/js/src/**/*.ts'],
6+
collectCoverageFrom: ['<rootDir>/resources/js/**/*.ts'],
77
projects: [
88
{
99
coveragePathIgnorePatterns: [
@@ -14,7 +14,7 @@ module.exports = {
1414
testMatch: ['<rootDir>/tests/javascript/**/*.ts'],
1515
transform: { '\\.[jt]sx?$': 'babel-jest' },
1616
moduleNameMapper: {
17-
'^phpmyadmin/(.*)$': '<rootDir>/resources/js/src/$1',
17+
'^phpmyadmin/(.*)$': '<rootDir>/resources/js/$1',
1818
'^@vendor/(.*)$': '<rootDir>/public/js/vendor/$1',
1919
},
2020
testEnvironment: 'jsdom',

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@zxcvbn-ts/core": "^3.0.4",
2828
"autoprefixer": "^10.4.21",
2929
"babel-loader": "^9.1.2",
30-
"bootstrap": "5.3.5",
30+
"bootstrap": "^5.3.5",
3131
"chart.js": "^4.4.3",
3232
"chartjs-adapter-date-fns": "^3.0.0",
3333
"chartjs-plugin-zoom": "^2.0.1",
@@ -79,7 +79,7 @@
7979
"postinstall": "yarn run build",
8080
"build": "webpack",
8181
"css-lint": "stylelint \"public/themes/**/scss/*.scss\" \"public/setup/scss/*.scss\"",
82-
"js-lint": "eslint resources/js/src tests/javascript jest.config.cjs",
82+
"js-lint": "eslint resources/js tests/javascript jest.config.cjs",
8383
"test": "yarn node --experimental-vm-modules $(yarn bin jest)"
8484
},
8585
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"

public/js/vendor/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)