Skip to content

Commit c5a0129

Browse files
authored
Merge pull request littleredbutton#407 from arawa/chore/upgrade_packages
chore: upgrade lib and tools, some deprecated
2 parents 6b6ad44 + 77b86b5 commit c5a0129

49 files changed

Lines changed: 22868 additions & 8233 deletions

Some content is hidden

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

Makefile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,34 @@ install-composer-deps-dev: composer.phar
2121
php composer.phar install -o
2222

2323
js-init:
24-
yarn install
24+
npm install
2525

26-
yarn-update:
27-
yarn update
26+
npm-update:
27+
npm update
2828

2929
# Building
3030
build-js: js-init
31-
yarn run dev
31+
npm run dev
3232

3333
build-js-production: js-init
34-
yarn run build
34+
npm run build
3535

3636
watch-js: js-init
37-
yarn run watch
37+
npm run watch
3838

3939
# Linting
4040
lint: js-init
41-
yarn run lint
41+
npm run lint
4242

4343
lint-fix: js-init
44-
yarn run fix
44+
npm run fix
4545

4646
# Style linting
4747
stylelint: js-init
48-
yarn run lint:style
48+
npm run lint:style
4949

5050
stylelint-fix: js-init
51-
yarn run lint:fix:style
51+
npm run lint:fix:style
5252

5353
phplint:
5454
./vendor/bin/php-cs-fixer fix --dry-run

babel.config.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
module.exports = {
2-
plugins: [
3-
'@babel/plugin-syntax-dynamic-import',
4-
],
5-
presets: ['@babel/preset-env'],
6-
}
1+
const babelConfig = require('@nextcloud/babel-config')
2+
3+
module.exports = babelConfig

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"nextcloud/coding-standard": "^1.1.0",
1818
"phpstan/phpstan": "^2.1.16",
1919
"nextcloud/ocp": "^29.0 || ^30.0 || ^31.0",
20-
"vimeo/psalm": "5.9.0 || ^6.1.0",
20+
"vimeo/psalm": "^6.1.0",
2121
"psr/container": "^1.1.2 || ^1.1.4 || ^2.0.2"
2222
},
2323
"config": {

0 commit comments

Comments
 (0)