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

Upgrade JS deps #2153

Merged
merged 6 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/test-unit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Setup cache 2/2
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-smoke-${{ matrix.php }}-${{ matrix.type }}-${{ hashFiles('composer.json') }}
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Setup cache 2/2
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ matrix.php }}-${{ matrix.type }}-${{ hashFiles('composer.json') }}
Expand Down Expand Up @@ -288,7 +288,7 @@ jobs:
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT

- name: Setup cache 2/2
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-behat-${{ matrix.php }}-${{ matrix.type }}-${{ hashFiles('composer.json') }}
Expand Down
3 changes: 1 addition & 2 deletions js/.stylelintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@ module.exports = {
customSyntax: 'postcss-less',
rules: {
'at-rule-empty-line-before': null,
'at-rule-name-case': null,
'color-function-notation': 'legacy',
'max-line-length': null,
'media-query-no-invalid': null,
'no-descending-specificity': null,
'rule-empty-line-before': null,

Expand Down
2,603 changes: 1,391 additions & 1,212 deletions js/package-lock.json

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dev": "webpack --progress --watch --env development",
"profile": "webpack --env production --profile --json > profile/atkjs-bundle-profile.json",
"analyze-profile": "webpack-bundle-analyzer profile/atkjs-bundle-profile.json",
"lint": "eslint --ext .js,.vue . && stylelint \"../**/*.less\" && prettier --config .prettierrc.js --loglevel warn \"../**/*.less\" --check",
"lint-fix": "eslint --ext .js,.vue . --fix && stylelint \"../**/*.less\" --fix && prettier --config .prettierrc.js --loglevel warn \"../**/*.less\" --write"
"lint": "eslint --ext .js,.vue . && stylelint \"../public/**/*.less\" && prettier --config .prettierrc.js --log-level warn \"../public/**/*.less\" --check",
"lint-fix": "eslint --ext .js,.vue . --fix && stylelint \"../public/**/*.less\" --fix && prettier --config .prettierrc.js --log-level warn \"../public/**/*.less\" --write"
},
"repository": {
"type": "git",
Expand All @@ -29,7 +29,7 @@
"mitt": "^3.0.0",
"vue": "^3.3.4",
"vue-flatpickr-component": "^11.0.3",
"vue-fomantic-ui": "^0.13.0",
"vue-fomantic-ui": "^0.15.1",
"vue-query-builder": "github:TheAustinG/vue-query-builder#2f62fa09ea"
},
"devDependencies": {
Expand All @@ -42,17 +42,17 @@
"css-loader": "^6.8.1",
"eslint": "^8.41.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-import-resolver-webpack": "^0.13.2",
"eslint-import-resolver-webpack": "^0.13.8",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-jsdoc": "^45.0.0",
"eslint-plugin-unicorn": "^47.0.0",
"eslint-plugin-jsdoc": "^48.0.4",
"eslint-plugin-unicorn": "^50.0.1",
"eslint-plugin-vue": "^9.14.1",
"postcss-less": "^6.0.0",
"prettier": "^2.8.8",
"source-map-loader": "^4.0.1",
"prettier": "^3.2.4",
"source-map-loader": "^5.0.0",
"style-loader": "^3.3.3",
"stylelint": "^15.6.2",
"stylelint-config-standard": "^33.0.0",
"stylelint": "^16.2.0",
"stylelint-config-standard": "^36.0.0",
"terser-webpack-plugin": "^5.3.9",
"vue-loader": "^17.1.2",
"webpack": "^5.84.1",
Expand Down
7 changes: 4 additions & 3 deletions public/css/agileui.less
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@
}

.atk-sidenav-content {
overflow-x: hidden;
overflow-y: auto;
overflow: hidden auto;
}

/* A selected item in admin menu */
Expand Down Expand Up @@ -201,7 +200,9 @@ footer.atk-footer {
}

.atk-right-panel {
transition: box-shadow 0.2s, right 0.2s;
transition:
box-shadow 0.2s,
right 0.2s;
bottom: 0;
background-color: @atkSlidePanelColor;
box-shadow: 0 0 0 rgba(@black, 0%);
Expand Down
2 changes: 1 addition & 1 deletion public/css/agileui.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public/css/agileui.min.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading