diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /package.json | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'package.json')
-rw-r--r-- | package.json | 69 |
1 files changed, 41 insertions, 28 deletions
diff --git a/package.json b/package.json index 66fc0668431..978b9079aaa 100644 --- a/package.json +++ b/package.json @@ -5,13 +5,13 @@ "block-dependencies": "node scripts/frontend/block_dependencies.js", "clean": "rm -rf public/assets tmp/cache/*-loader", "dev-server": "NODE_OPTIONS=\"--max-old-space-size=3584\" node scripts/frontend/webpack_dev_server.js", - "eslint": "eslint --cache --max-warnings 0 --report-unused-disable-directives --ext .js,.vue .", - "eslint-fix": "eslint --cache --max-warnings 0 --report-unused-disable-directives --ext .js,.vue --fix .", - "eslint-staged": "git diff --diff-filter=d --cached --name-only | grep -E \"(.*)\\.(js|vue)$\" | xargs eslint --cache --max-warnings 0 --report-unused-disable-directives", - "eslint-staged-fix": "git diff --diff-filter=d --cached --name-only | grep -E \"(.*)\\.(js|vue)$\" | xargs eslint --cache --max-warnings 0 --report-unused-disable-directives --fix", - "eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .", + "eslint-fix": "echo 'Please use `yarn lint:eslint:all:fix` instead' && exit 1", + "eslint-staged": "echo 'Please use `yarn lint:eslint:staged` instead' && exit 1", + "eslint-staged-fix": "echo 'Please use `yarn lint:eslint:staged:fix` instead' && exit 1", + "eslint-report": "echo 'Please use `yarn lint:eslint:report` instead' && exit 1", "file-coverage": "scripts/frontend/file_test_coverage.js", "lint-docs": "scripts/lint-doc.sh", + "internal:eslint": "eslint --cache --max-warnings 0 --report-unused-disable-directives --ext .js,.vue", "prejest": "yarn check-dependencies", "jest": "jest --config jest.config.js", "jest-debug": "node --inspect-brk node_modules/.bin/jest --runInBand", @@ -21,14 +21,27 @@ "karma": "BABEL_ENV=${BABEL_ENV:=karma} karma start --single-run true config/karma.config.js", "karma-coverage": "BABEL_ENV=coverage karma start --single-run true config/karma.config.js", "karma-start": "BABEL_ENV=karma karma start config/karma.config.js", + "lint:eslint": "yarn run internal:eslint", + "lint:eslint:fix": "yarn run internal:eslint --fix", + "lint:eslint:all": "yarn run internal:eslint .", + "lint:eslint:all:fix": "yarn run lint:eslint:all --fix", + "lint:eslint:report": "yarn run internal:eslint --format html --output-file ./eslint-report.html --no-inline-config .", + "lint:eslint:staged": "scripts/frontend/execute-on-staged-files.sh internal:eslint '(js|vue)'", + "lint:eslint:staged:fix": "yarn run lint:eslint:staged --fix", + "lint:prettier": "yarn run prettier --check '**/*.{graphql,js,vue}'", + "lint:prettier:fix": "yarn run prettier --write '**/*.{graphql,js,vue}'", + "lint:prettier:staged": "scripts/frontend/execute-on-staged-files.sh prettier '(graphql|js|vue)' --check", + "lint:prettier:staged:fix": "scripts/frontend/execute-on-staged-files.sh prettier '(graphql|js|vue)' --write", + "lint:stylelint": "stylelint -q '{ee/,}app/assets/stylesheets/**/*.{css,scss}'", + "lint:stylelint:fix": "yarn run lint:stylelint --fix", + "lint:stylelint:staged": "scripts/frontend/execute-on-staged-files.sh stylelint '(css|scss)' -q", + "lint:stylelint:staged:fix": "yarn run lint:stylelint:staged --fix", "markdownlint": "markdownlint --config .markdownlint.json", "postinstall": "node ./scripts/frontend/postinstall.js", - "prettier-staged": "node ./scripts/frontend/prettier.js check", - "prettier-staged-save": "node ./scripts/frontend/prettier.js save", - "prettier-all": "node ./scripts/frontend/prettier.js check-all", - "prettier-all-save": "node ./scripts/frontend/prettier.js save-all", - "stylelint": "yarn stylelint-file 'app/assets/stylesheets/**/*.*' 'ee/app/assets/stylesheets/**/*.*' '!app/assets/stylesheets/startup/startup-*.scss' '!**/vendors/**'", - "stylelint-file": "BROWSERSLIST_IGNORE_OLD_DATA=true node node_modules/stylelint/bin/stylelint.js", + "prettier-all": "echo 'Please use `yarn lint:prettier` instead' && exit 1", + "prettier-all-save": "echo 'Please use `yarn lint:prettier:fix` instead' && exit 1", + "prettier-staged": "echo 'Please use `yarn lint:prettier:staged` instead' && exit 1", + "prettier-staged-save": "echo 'Please use `yarn lint:prettier:staged:fix` instead' && exit 1", "stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js", "webpack": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.config.js", "webpack-vendor": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.vendor.config.js", @@ -43,12 +56,13 @@ "@babel/preset-env": "^7.10.1", "@gitlab/at.js": "1.5.7", "@gitlab/favicon-overlay": "2.0.0", - "@gitlab/svgs": "1.182.0", + "@gitlab/svgs": "1.185.0", "@gitlab/tributejs": "1.0.0", - "@gitlab/ui": "27.4.6", + "@gitlab/ui": "28.9.1", "@gitlab/visual-review-tools": "1.6.1", "@rails/actioncable": "^6.0.3-4", "@rails/ujs": "^6.0.3-4", + "@sentry/browser": "^5.22.3", "@sourcegraph/code-host-integration": "0.0.52", "@toast-ui/editor": "^2.5.1", "@toast-ui/vue-editor": "^2.5.1", @@ -56,6 +70,7 @@ "apollo-client": "^2.6.10", "apollo-link": "^1.2.14", "apollo-link-batch-http": "^1.2.14", + "apollo-link-http": "^1.5.17", "apollo-upload-client": "^13.0.0", "autosize": "^4.0.2", "aws-sdk": "^2.637.0", @@ -69,7 +84,7 @@ "codesandbox-api": "0.0.23", "compression-webpack-plugin": "^5.0.2", "copy-webpack-plugin": "^5.1.2", - "core-js": "^3.8.3", + "core-js": "^3.9.1", "cron-validator": "^1.1.1", "cropper": "^2.3.0", "css-loader": "^2.1.1", @@ -81,7 +96,7 @@ "deckar01-task_list": "^2.3.1", "diff": "^3.4.0", "document-register-element": "1.14.3", - "dompurify": "^2.2.6", + "dompurify": "^2.2.7", "dropzone": "^4.2.0", "editorconfig": "^0.15.3", "emoji-regex": "^7.0.3", @@ -116,8 +131,8 @@ "pikaday": "^1.8.0", "popper.js": "^1.16.1", "prismjs": "^1.21.0", - "prosemirror-markdown": "^1.3.0", - "prosemirror-model": "^1.6.4", + "prosemirror-markdown": "^1.5.1", + "prosemirror-model": "^1.13.3", "raphael": "^2.2.7", "raw-loader": "^4.0.2", "select2": "3.5.2-browserify", @@ -126,14 +141,14 @@ "sql.js": "^0.4.0", "string-hash": "1.1.3", "style-loader": "^1.3.0", - "swagger-ui-dist": "^3.43.0", + "swagger-ui-dist": "^3.44.1", "three": "^0.84.0", "three-orbit-controls": "^82.1.0", "three-stl-loader": "^1.0.4", "timeago.js": "^4.0.2", - "tiptap": "^1.8.0", - "tiptap-commands": "^1.4.0", - "tiptap-extensions": "^1.8.0", + "tiptap": "^1.32.1", + "tiptap-commands": "^1.17.1", + "tiptap-extensions": "^1.35.1", "url-loader": "^3.0.0", "uuid": "8.1.0", "visibilityjs": "^1.2.4", @@ -155,7 +170,8 @@ }, "devDependencies": { "@babel/plugin-transform-modules-commonjs": "^7.10.1", - "@gitlab/eslint-plugin": "8.0.0", + "@gitlab/eslint-plugin": "8.1.0", + "@gitlab/stylelint-config": "2.3.0", "@testing-library/dom": "^7.16.2", "@vue/test-utils": "1.1.2", "acorn": "^6.3.0", @@ -167,17 +183,17 @@ "commander": "^2.18.0", "custom-jquery-matchers": "^2.1.0", "docdash": "^1.0.2", - "eslint": "7.19.0", + "eslint": "7.21.0", "eslint-import-resolver-jest": "3.0.0", "eslint-import-resolver-webpack": "0.13.0", "eslint-plugin-jasmine": "4.1.2", "eslint-plugin-no-jquery": "2.5.0", "gettext-extractor": "^3.5.3", "gettext-extractor-vue": "^5.0.0", + "glob": "^7.1.6", "istanbul-lib-coverage": "^3.0.0", "istanbul-lib-report": "^3.0.0", "istanbul-reports": "^3.0.0", - "glob": "^7.1.6", "jasmine-core": "^2.9.0", "jasmine-diff": "^0.1.3", "jasmine-jquery": "^2.1.1", @@ -207,11 +223,8 @@ "postcss": "^7.0.14", "prettier": "2.2.1", "readdir-enhanced": "^2.2.4", - "stylelint": "^10.1.0", - "stylelint-config-recommended": "^2.2.0", - "stylelint-scss": "^3.9.2", "timezone-mock": "^1.0.8", - "vue-jest": "4.0.0-rc.0", + "vue-jest": "4.0.1", "webpack-dev-server": "^3.11.2", "xhr-mock": "^2.5.1", "yarn-check-webpack-plugin": "^1.2.0", |