diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index a0714171a..5a4f53674 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -136,13 +136,6 @@ jobs: snap: artifacts/ubuntu-latest-artifacts/insomnia/dist/Insomnia.Core-${{ env.RELEASE_VERSION }}.snap release: stable - - name: Publish npm packages - run: | - npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN} - npm run publish -- --pre-dist-tag ${{ contains(github.event.inputs.version, 'alpha') && 'alpha' || 'beta' }} --yes - env: - NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - - name: Upload .deb to pulp (stable only) if: ${{ env.IS_PRERELEASE == 'false' }} uses: docker://kong/release-script:latest diff --git a/.github/workflows/release-start.yml b/.github/workflows/release-start.yml index d49abaceb..4d1b22b46 100644 --- a/.github/workflows/release-start.yml +++ b/.github/workflows/release-start.yml @@ -18,11 +18,6 @@ on: required: false description: iteration of the release, used for non-stable releases (version-channel.iteration) (e.g. 0, 1, 2, 3 ...) default: '0' - major-npm: - required: false - type: boolean - description: increment the major version of the NPM packages - default: false env: RELEASE_VERSION: ${{ github.event.inputs.version }}${{ github.event.inputs.channel != 'stable' && format('-{0}.{1}', github.event.inputs.channel, github.event.inputs.iteration) || '' }} @@ -61,11 +56,11 @@ jobs: - name: Lerna version (stable) if: github.event.inputs.channel == 'stable' - run: npm run version -- --yes "${{ github.event.inputs.major-npm != 'true' && 'minor' || 'major' }}" + run: npm run version -- --yes 'minor' - name: Lerna version (alpha/beta) if: github.event.inputs.channel != 'stable' - run: npm run version -- --yes --preid "${{ github.event.inputs.channel }}" "${{ github.event.inputs.iteration == '0' && (github.event.inputs.major-npm != 'true' && 'preminor' || 'premajor') || 'prerelease' }}" + run: npm run version -- --yes --preid "${{ github.event.inputs.channel }}" "${{ github.event.inputs.iteration == '0' && 'preminor' || 'prerelease' }}" - name: Config version run: APP_VERSION="${{ env.RELEASE_VERSION }}" npm run app-bump-version diff --git a/lerna.json b/lerna.json index 8901ea9fe..145a87d08 100644 --- a/lerna.json +++ b/lerna.json @@ -1,19 +1,7 @@ { "version": "3.6.1-beta.2", - "includeMergedTags": true, "packages": [ "packages/*", "plugins/*" - ], - "command": { - "version": { - "exact": true, - "forcePublish": true, - "gitTagVersion": false, - "push": false - }, - "publish": { - "verifyAccess": false - } - } + ] } diff --git a/package.json b/package.json index 7c7d0c187..deaabb49e 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "lint:fix": "lerna run lint:fix --stream --no-bail", "bootstrap": "npm install && lerna bootstrap && lerna run --stream bootstrap", "version": "lerna version", - "publish": "lerna publish from-package", "clean": "lerna run clean --parallel --stream && lerna clean --yes && rimraf node_modules **/*.tsbuildinfo", "test": "lerna run --stream --parallel test", "inso-start": "npm start --prefix packages/insomnia-inso", diff --git a/packages/insomnia-common/package.json b/packages/insomnia-common/package.json index cd9e0a1bc..d6c186413 100644 --- a/packages/insomnia-common/package.json +++ b/packages/insomnia-common/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-common", "version": "3.6.1-beta.2", "homepage": "https://insomnia.rest", diff --git a/packages/insomnia-config/package.json b/packages/insomnia-config/package.json index 1629c0f8c..db30aa2b3 100644 --- a/packages/insomnia-config/package.json +++ b/packages/insomnia-config/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-config", "version": "3.6.1-beta.2", "homepage": "https://insomnia.rest", diff --git a/packages/insomnia-cookies/package.json b/packages/insomnia-cookies/package.json index 5622f6219..416924b98 100644 --- a/packages/insomnia-cookies/package.json +++ b/packages/insomnia-cookies/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-cookies", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/packages/insomnia-importers/package.json b/packages/insomnia-importers/package.json index ce8940390..96b85e9e0 100755 --- a/packages/insomnia-importers/package.json +++ b/packages/insomnia-importers/package.json @@ -1,4 +1,5 @@ { + "private": true, "name": "insomnia-importers", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/packages/insomnia-inso/.npmignore b/packages/insomnia-inso/.npmignore deleted file mode 100644 index b962347fa..000000000 --- a/packages/insomnia-inso/.npmignore +++ /dev/null @@ -1,7 +0,0 @@ -# Ignore everything by default -# NOTE: NPM publish will never ignore package.json, package-lock.json, README, LICENSE, CHANGELOG -# https://npm.github.io/publishing-pkgs-docs/publishing/the-npmignore-file.html -* - -# Don't ignore dist folder -!dist/** diff --git a/packages/insomnia-inso/package.json b/packages/insomnia-inso/package.json index 3e6c770bd..1b10a5e0f 100644 --- a/packages/insomnia-inso/package.json +++ b/packages/insomnia-inso/package.json @@ -1,4 +1,5 @@ { + "private": true, "name": "insomnia-inso", "version": "3.6.1-beta.2", "homepage": "https://insomnia.rest", @@ -38,8 +39,7 @@ "package": "esr src/scripts/pkg.ts", "pkg": "pkg .", "postpackage": "esr src/scripts/verify-pkg.ts", - "artifacts": "esr src/scripts/artifacts.ts", - "prepublishOnly": "npm run build:production" + "artifacts": "esr src/scripts/artifacts.ts" }, "devDependencies": { "@jest/globals": "^28.1.0", diff --git a/packages/insomnia-prettify/package.json b/packages/insomnia-prettify/package.json index 8d3cd1fd0..457b1ae78 100644 --- a/packages/insomnia-prettify/package.json +++ b/packages/insomnia-prettify/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-prettify", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/packages/insomnia-send-request/package.json b/packages/insomnia-send-request/package.json index f4bb2caa1..a3d938708 100644 --- a/packages/insomnia-send-request/package.json +++ b/packages/insomnia-send-request/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-send-request", "license": "Apache-2.0", "version": "3.6.1-beta.2", diff --git a/packages/insomnia-testing/.npmignore b/packages/insomnia-testing/.npmignore deleted file mode 100644 index b962347fa..000000000 --- a/packages/insomnia-testing/.npmignore +++ /dev/null @@ -1,7 +0,0 @@ -# Ignore everything by default -# NOTE: NPM publish will never ignore package.json, package-lock.json, README, LICENSE, CHANGELOG -# https://npm.github.io/publishing-pkgs-docs/publishing/the-npmignore-file.html -* - -# Don't ignore dist folder -!dist/** diff --git a/packages/insomnia-testing/package.json b/packages/insomnia-testing/package.json index 89dd46e65..10e007bb2 100644 --- a/packages/insomnia-testing/package.json +++ b/packages/insomnia-testing/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-testing", "license": "Apache-2.0", "version": "3.6.1-beta.2", @@ -22,8 +22,7 @@ "postclean": "rimraf dist", "test": "jest", "build": "tsc --build tsconfig.build.json", - "watch": "npm run build -- --watch", - "prepublish": "npm run build" + "watch": "npm run build -- --watch" }, "devDependencies": { "@jest/globals": "^28.1.0", diff --git a/packages/insomnia-url/package.json b/packages/insomnia-url/package.json index c26eaad2c..5d70c6952 100644 --- a/packages/insomnia-url/package.json +++ b/packages/insomnia-url/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-url", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/packages/insomnia-xpath/package.json b/packages/insomnia-xpath/package.json index 1de146c33..1221b83dd 100644 --- a/packages/insomnia-xpath/package.json +++ b/packages/insomnia-xpath/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-xpath", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/packages/openapi-2-kong/.npmignore b/packages/openapi-2-kong/.npmignore deleted file mode 100644 index b962347fa..000000000 --- a/packages/openapi-2-kong/.npmignore +++ /dev/null @@ -1,7 +0,0 @@ -# Ignore everything by default -# NOTE: NPM publish will never ignore package.json, package-lock.json, README, LICENSE, CHANGELOG -# https://npm.github.io/publishing-pkgs-docs/publishing/the-npmignore-file.html -* - -# Don't ignore dist folder -!dist/** diff --git a/packages/openapi-2-kong/package.json b/packages/openapi-2-kong/package.json index ef56c094b..ab79cc4ce 100644 --- a/packages/openapi-2-kong/package.json +++ b/packages/openapi-2-kong/package.json @@ -1,4 +1,5 @@ { + "private": true, "name": "openapi-2-kong", "license": "Apache-2.0", "version": "3.6.1-beta.2", @@ -12,8 +13,7 @@ "clean": "tsc --build tsconfig.build.json --clean", "postclean": "rimraf dist", "build": "tsc --build tsconfig.build.json", - "test": "jest", - "prepublish": "npm run build" + "test": "jest" }, "dependencies": { "openapi-types": "^8.0.0", diff --git a/plugins/insomnia-plugin-base64/package.json b/plugins/insomnia-plugin-base64/package.json index 44eaeee8c..e87ca117a 100644 --- a/plugins/insomnia-plugin-base64/package.json +++ b/plugins/insomnia-plugin-base64/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-base64", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-cookie-jar/package.json b/plugins/insomnia-plugin-cookie-jar/package.json index 24e771350..eab9788ce 100644 --- a/plugins/insomnia-plugin-cookie-jar/package.json +++ b/plugins/insomnia-plugin-cookie-jar/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-cookie-jar", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-core-themes/package.json b/plugins/insomnia-plugin-core-themes/package.json index fed0ba5b7..8cd8326de 100644 --- a/plugins/insomnia-plugin-core-themes/package.json +++ b/plugins/insomnia-plugin-core-themes/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-core-themes", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-default-headers/package.json b/plugins/insomnia-plugin-default-headers/package.json index 349a4f1e9..6fc2d9c2c 100644 --- a/plugins/insomnia-plugin-default-headers/package.json +++ b/plugins/insomnia-plugin-default-headers/package.json @@ -1,4 +1,5 @@ { + "private": true, "name": "insomnia-plugin-default-headers", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-file/package.json b/plugins/insomnia-plugin-file/package.json index 4b2421d54..f51972668 100644 --- a/plugins/insomnia-plugin-file/package.json +++ b/plugins/insomnia-plugin-file/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-file", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-hash/package.json b/plugins/insomnia-plugin-hash/package.json index af71d33ab..67b893c2b 100644 --- a/plugins/insomnia-plugin-hash/package.json +++ b/plugins/insomnia-plugin-hash/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-hash", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-jsonpath/package.json b/plugins/insomnia-plugin-jsonpath/package.json index bb8bfdb03..0c72e6ec0 100644 --- a/plugins/insomnia-plugin-jsonpath/package.json +++ b/plugins/insomnia-plugin-jsonpath/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-jsonpath", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-kong-portal/.npmignore b/plugins/insomnia-plugin-kong-portal/.npmignore deleted file mode 100644 index b962347fa..000000000 --- a/plugins/insomnia-plugin-kong-portal/.npmignore +++ /dev/null @@ -1,7 +0,0 @@ -# Ignore everything by default -# NOTE: NPM publish will never ignore package.json, package-lock.json, README, LICENSE, CHANGELOG -# https://npm.github.io/publishing-pkgs-docs/publishing/the-npmignore-file.html -* - -# Don't ignore dist folder -!dist/** diff --git a/plugins/insomnia-plugin-now/package.json b/plugins/insomnia-plugin-now/package.json index 582fa4659..e23680616 100644 --- a/plugins/insomnia-plugin-now/package.json +++ b/plugins/insomnia-plugin-now/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-now", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-os/package.json b/plugins/insomnia-plugin-os/package.json index 3f64afccf..0d2852550 100644 --- a/plugins/insomnia-plugin-os/package.json +++ b/plugins/insomnia-plugin-os/package.json @@ -1,4 +1,5 @@ { + "private": true, "name": "insomnia-plugin-os", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-prompt/package.json b/plugins/insomnia-plugin-prompt/package.json index 9f09d0851..45eaaea84 100644 --- a/plugins/insomnia-plugin-prompt/package.json +++ b/plugins/insomnia-plugin-prompt/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-prompt", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-request/package.json b/plugins/insomnia-plugin-request/package.json index d03b05aa2..8b9d340f4 100644 --- a/plugins/insomnia-plugin-request/package.json +++ b/plugins/insomnia-plugin-request/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-request", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-response/package.json b/plugins/insomnia-plugin-response/package.json index 2c02375c9..ddc6ec3fa 100644 --- a/plugins/insomnia-plugin-response/package.json +++ b/plugins/insomnia-plugin-response/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-response", "version": "3.6.1-beta.2", "author": "Kong ", diff --git a/plugins/insomnia-plugin-uuid/package.json b/plugins/insomnia-plugin-uuid/package.json index 4d2303336..57a40c280 100644 --- a/plugins/insomnia-plugin-uuid/package.json +++ b/plugins/insomnia-plugin-uuid/package.json @@ -1,5 +1,5 @@ { - "private": false, + "private": true, "name": "insomnia-plugin-uuid", "version": "3.6.1-beta.2", "author": "Kong ",