From e9e4133b288bc6ea2691bbd969223af2a20632e4 Mon Sep 17 00:00:00 2001 From: Louis Chemineau Date: Mon, 22 Nov 2021 17:54:02 +0100 Subject: [PATCH] Use npm pack in npm-test workflow Signed-off-by: Louis Chemineau --- .github/workflows/npm-test.yml | 3 +++ package-lock.json | 10 +--------- tests/package-lock.json | 34 ++++------------------------------ tests/package.json | 4 +--- 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/.github/workflows/npm-test.yml b/.github/workflows/npm-test.yml index be01c02..2db077a 100644 --- a/.github/workflows/npm-test.yml +++ b/.github/workflows/npm-test.yml @@ -34,7 +34,10 @@ jobs: - name: Install dependencies & build run: | npm ci + npm pack cd tests npm ci + version=$(cat ../package.json | jq --raw-output .version) + npm install -D ../nextcloud-webpack-vue-config-$version.tgz npm run dev npm run build diff --git a/package-lock.json b/package-lock.json index ae6ef6b..cabb747 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,11 +23,7 @@ "vue-loader": "^15.9.6", "vue-template-compiler": "^2.6.12", "webpack": "~5.46.0", -<<<<<<< HEAD "webpack-cli": "^4.7.0", -======= - "webpack-cli": "^4.5.0", ->>>>>>> 853753a (Move stylelint to 14) "webpack-dev-server": "^4.0.0" }, "engines": { @@ -49,11 +45,7 @@ "vue-loader": "^15.9.6", "vue-template-compiler": "^2.6.12", "webpack": "~5.46.0", -<<<<<<< HEAD "webpack-cli": "^4.7.0", -======= - "webpack-cli": "^4.5.0", ->>>>>>> 853753a (Move stylelint to 14) "webpack-dev-server": "^4.0.0" } }, @@ -13277,4 +13269,4 @@ "dev": true } } -} \ No newline at end of file +} diff --git a/tests/package-lock.json b/tests/package-lock.json index 187255e..64c7806 100644 --- a/tests/package-lock.json +++ b/tests/package-lock.json @@ -15,14 +15,13 @@ "@nextcloud/babel-config": "^1.0.0", "@nextcloud/browserslist-config": "^2.2.0", "@nextcloud/eslint-config": "^6.1.0", - "@nextcloud/stylelint-config": "^2.0.1", - "@nextcloud/webpack-vue-config": "file:.." + "@nextcloud/stylelint-config": "^2.0.1" } }, "..": { "name": "@nextcloud/webpack-vue-config", "version": "4.1.4", - "dev": true, + "extraneous": true, "license": "AGPL-3.0-or-later", "devDependencies": { "@babel/core": "^7.13.10", @@ -39,7 +38,7 @@ "vue-loader": "^15.9.6", "vue-template-compiler": "^2.6.12", "webpack": "~5.46.0", - "webpack-cli": "^4.5.0", + "webpack-cli": "^4.7.0", "webpack-dev-server": "^4.0.0" }, "engines": { @@ -61,7 +60,7 @@ "vue-loader": "^15.9.6", "vue-template-compiler": "^2.6.12", "webpack": "~5.46.0", - "webpack-cli": "^4.5.0", + "webpack-cli": "^4.7.0", "webpack-dev-server": "^4.0.0" } }, @@ -1767,10 +1766,6 @@ "stylelint-scss": "^4.0.0" } }, - "node_modules/@nextcloud/webpack-vue-config": { - "resolved": "..", - "link": true - }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -7581,27 +7576,6 @@ "dev": true, "requires": {} }, - "@nextcloud/webpack-vue-config": { - "version": "file:..", - "requires": { - "@babel/core": "^7.13.10", - "babel-loader": "^8.2.2", - "css-loader": "^6.5.0", - "eslint": "^7.22.0", - "eslint-webpack-plugin": "^3.0.1", - "node-polyfill-webpack-plugin": "^1.1.0", - "sass": "^1.32.8", - "sass-loader": "^12.1.0", - "style-loader": "^3.3.1", - "stylelint": "^14.0.1", - "stylelint-webpack-plugin": "^3.1.0", - "vue-loader": "^15.9.6", - "vue-template-compiler": "^2.6.12", - "webpack": "~5.46.0", - "webpack-cli": "^4.5.0", - "webpack-dev-server": "^4.0.0" - } - }, "@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", diff --git a/tests/package.json b/tests/package.json index 9a47446..2220613 100644 --- a/tests/package.json +++ b/tests/package.json @@ -1,7 +1,6 @@ { "name": "webpack-vue-config-test", "version": "1.0.0", - "main": "js/webpack-vue-config-test-main.js", "description": "Testing package for the @nextcloud/webpack-vue-config library", "scripts": { "build": "NODE_ENV=production webpack --progress --config webpack.js", @@ -19,7 +18,6 @@ "@nextcloud/babel-config": "^1.0.0", "@nextcloud/browserslist-config": "^2.2.0", "@nextcloud/eslint-config": "^6.1.0", - "@nextcloud/stylelint-config": "^2.0.1", - "@nextcloud/webpack-vue-config": "file:.." + "@nextcloud/stylelint-config": "^2.0.1" } }