From 192e9b5b02fe2d08f6a0e046f5fb9d4181a67867 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Thu, 5 Aug 2021 18:29:34 -0300 Subject: [PATCH 1/4] Skip blocked dependencies. --- .github/dependabot.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 47655304e1b..f7884926cdd 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -27,6 +27,9 @@ updates: ignore: # Must match @angular-devkit/build-webpack dependency https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/build_webpack/package.json#L16 - dependency-name: 'webpack' + # https://github.com/ng-bootstrap/ng-bootstrap/issues/3899 + - dependency-name: 'bootstrap' + versions: ['>=5'] - package-ecosystem: 'npm' directory: '/generators/common/templates/' @@ -56,6 +59,10 @@ updates: labels: - 'theme: react' - 'theme: dependencies' + ignore: + # https://github.com/reactstrap/reactstrap/issues/1748 + - dependency-name: 'bootstrap' + versions: ['>=5'] - package-ecosystem: 'npm' directory: '/generators/client/templates/vue/' @@ -66,6 +73,13 @@ updates: labels: - 'theme: vue' - 'theme: dependencies' + ignore: + # vue-cli peer-deps https://github.com/vuejs/vue-cli/issues/6374 + - dependency-name: 'eslint' + versions: ['>=7'] + # https://github.com/bootstrap-vue/bootstrap-vue/issues/5507 + - dependency-name: 'bootstrap' + versions: ['>=5'] - package-ecosystem: 'github-actions' directory: '/' From 02b6ba964f6a845b541df42c9180d9cd143255fa Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 31 Aug 2021 17:00:51 -0300 Subject: [PATCH 2/4] Use vue version for vue-template-compiler --- generators/client/templates/vue/package.json | 1 - generators/client/templates/vue/package.json.ejs | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/generators/client/templates/vue/package.json b/generators/client/templates/vue/package.json index 4d05a6fe2dd..f496b03d672 100644 --- a/generators/client/templates/vue/package.json +++ b/generators/client/templates/vue/package.json @@ -77,7 +77,6 @@ "webpack-merge": "5.8.0", "workbox-webpack-plugin": "6.2.4", "vue-jest": "3.0.7", - "vue-template-compiler": "2.6.12", "vue-loader": "15.9.8" } } diff --git a/generators/client/templates/vue/package.json.ejs b/generators/client/templates/vue/package.json.ejs index 7160b3cdd9b..0fe07c73974 100644 --- a/generators/client/templates/vue/package.json.ejs +++ b/generators/client/templates/vue/package.json.ejs @@ -134,7 +134,7 @@ "url-loader": "<%= dependabotPackageJson.devDependencies['url-loader'] %>", "vue-jest": "<%= dependabotPackageJson.devDependencies['vue-jest'] %>", "vue-loader": "<%= dependabotPackageJson.devDependencies['vue-loader'] %>", - "vue-template-compiler": "<%= dependabotPackageJson.devDependencies['vue-template-compiler'] %>", + "vue-template-compiler": "<%= dependabotPackageJson.devDependencies['vue'] %>", "webpack": "<%= dependabotPackageJson.devDependencies['webpack'] %>", "webpack-bundle-analyzer": "<%= dependabotPackageJson.devDependencies['webpack-bundle-analyzer'] %>", "webpack-cli": "<%= dependabotPackageJson.devDependencies['webpack-cli'] %>", From 89497345389dd01617169df583b6b5d191e5ee43 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Tue, 31 Aug 2021 17:03:39 -0300 Subject: [PATCH 3/4] Remove ora and find-up dependencies --- package-lock.json | 192 ---------------------------------------------- package.json | 2 - 2 files changed, 194 deletions(-) diff --git a/package-lock.json b/package-lock.json index de3d11a9be9..207c4e4f4ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,6 @@ "didyoumean": "1.2.2", "ejs": "3.1.6", "faker": "5.5.3", - "find-up": "5.0.0", "glob": "7.1.7", "gulp-filter": "7.0.0", "insight": "0.11.1", @@ -28,7 +27,6 @@ "mem-fs-editor": "9.3.0", "minimatch": "3.0.4", "normalize-path": "3.0.0", - "ora": "5.4.1", "os-locale": "5.0.0", "p-queue": "6.6.2", "parse-gitignore": "1.0.1", @@ -1307,25 +1305,6 @@ "url": "https://bevry.me/fund" } }, - "node_modules/bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "dependencies": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bl/node_modules/buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - }, "node_modules/bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -1699,14 +1678,6 @@ "node": ">=4" } }, - "node_modules/cli-spinners": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz", - "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==", - "engines": { - "node": ">=6" - } - }, "node_modules/cli-table": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz", @@ -2167,22 +2138,6 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, - "node_modules/defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "dependencies": { - "clone": "^1.0.2" - } - }, - "node_modules/defaults/node_modules/clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "engines": { - "node": ">=0.8" - } - }, "node_modules/define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -4677,14 +4632,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "engines": { - "node": ">=8" - } - }, "node_modules/is-lambda": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", @@ -6749,48 +6696,6 @@ "node": ">= 0.8.0" } }, - "node_modules/ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "dependencies": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/ora/node_modules/cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "dependencies": { - "restore-cursor": "^3.1.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/ora/node_modules/restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "dependencies": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/os-locale": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz", @@ -9727,14 +9632,6 @@ "makeerror": "1.0.x" } }, - "node_modules/wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "dependencies": { - "defaults": "^1.0.3" - } - }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -11654,27 +11551,6 @@ "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-4.18.0.tgz", "integrity": "sha512-PQu3Kyv9dM4FnwB7XGj1+HucW+ShvJzJqjuw1JkKVs1mWdwOKVcRjOi+pV9X52A0tNvrPCsPkbFFQb+wE1EAXw==" }, - "bl": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "requires": { - "buffer": "^5.5.0", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - }, - "dependencies": { - "buffer": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.1.13" - } - } - } - }, "bluebird": { "version": "3.7.2", "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", @@ -11983,11 +11859,6 @@ "restore-cursor": "^2.0.0" } }, - "cli-spinners": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz", - "integrity": "sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==" - }, "cli-table": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/cli-table/-/cli-table-0.3.6.tgz", @@ -12369,21 +12240,6 @@ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", "dev": true }, - "defaults": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", - "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", - "requires": { - "clone": "^1.0.2" - }, - "dependencies": { - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=" - } - } - }, "define-properties": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", @@ -14385,11 +14241,6 @@ "is-extglob": "^2.1.1" } }, - "is-interactive": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==" - }, "is-lambda": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", @@ -16047,41 +15898,6 @@ "word-wrap": "^1.2.3" } }, - "ora": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", - "requires": { - "bl": "^4.1.0", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.5.0", - "is-interactive": "^1.0.0", - "is-unicode-supported": "^0.1.0", - "log-symbols": "^4.1.0", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "dependencies": { - "cli-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "requires": { - "restore-cursor": "^3.1.0" - } - }, - "restore-cursor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "requires": { - "onetime": "^5.1.0", - "signal-exit": "^3.0.2" - } - } - } - }, "os-locale": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz", @@ -18446,14 +18262,6 @@ "makeerror": "1.0.x" } }, - "wcwidth": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=", - "requires": { - "defaults": "^1.0.3" - } - }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index edd9e8a763b..12a43b94165 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,6 @@ "didyoumean": "1.2.2", "ejs": "3.1.6", "faker": "5.5.3", - "find-up": "5.0.0", "glob": "7.1.7", "gulp-filter": "7.0.0", "insight": "0.11.1", @@ -98,7 +97,6 @@ "mem-fs-editor": "9.3.0", "minimatch": "3.0.4", "normalize-path": "3.0.0", - "ora": "5.4.1", "os-locale": "5.0.0", "p-queue": "6.6.2", "parse-gitignore": "1.0.1", From a6e097287d056095a30a79e1a426dff317f12204 Mon Sep 17 00:00:00 2001 From: Marcelo Shima Date: Sat, 4 Sep 2021 10:47:35 -0300 Subject: [PATCH 4/4] Update package.json.ejs --- generators/client/templates/vue/package.json.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/vue/package.json.ejs b/generators/client/templates/vue/package.json.ejs index 0fe07c73974..d3047ee8a92 100644 --- a/generators/client/templates/vue/package.json.ejs +++ b/generators/client/templates/vue/package.json.ejs @@ -134,7 +134,7 @@ "url-loader": "<%= dependabotPackageJson.devDependencies['url-loader'] %>", "vue-jest": "<%= dependabotPackageJson.devDependencies['vue-jest'] %>", "vue-loader": "<%= dependabotPackageJson.devDependencies['vue-loader'] %>", - "vue-template-compiler": "<%= dependabotPackageJson.devDependencies['vue'] %>", + "vue-template-compiler": "<%= dependabotPackageJson.dependencies['vue'] %>", "webpack": "<%= dependabotPackageJson.devDependencies['webpack'] %>", "webpack-bundle-analyzer": "<%= dependabotPackageJson.devDependencies['webpack-bundle-analyzer'] %>", "webpack-cli": "<%= dependabotPackageJson.devDependencies['webpack-cli'] %>",