diff --git a/.gitignore b/.gitignore index 6e2d104..0730c47 100644 --- a/.gitignore +++ b/.gitignore @@ -91,6 +91,7 @@ out # Nuxt.js build / generate output .nuxt dist +assets # Gatsby files .cache/ diff --git a/.release-it.json b/.release-it.json index 76e913f..c3a3e3c 100644 --- a/.release-it.json +++ b/.release-it.json @@ -56,17 +56,14 @@ "commitMessage": "chore: release ${version}", "requireCleanWorkingDir": false }, - "npm": { - "publishPath": "./dist/package", - "release": false - }, + "npm": false, "github": { "release": true, - "assets": ["dist/*.tgz"] + "assets": ["assets/*.tgz"] }, "hooks": { "before:bump": "npm run build", - "after:bump": "npm run release:prepare-toc-in-readme && npm run build-and-pack && git add .", + "after:bump": "npm run release:prepare-toc-in-readme && npm run prepare-publish && git add .", "after:release": "npm publish" } } diff --git a/package.json b/package.json index 7a66909..1caec97 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,9 @@ }, "scripts": { "init": "npm run clean && npm i", - "build": "rm -rf ./dist && mkdir ./dist && cp -r ./lib/* ./dist", - "pack": "npm run clean:tgz && npm pack --pack-destination=./dist", - "build-and-pack": "npm run build && sh scripts/pack.sh", + "build": "npm run clean:dist && npm run clean:assets && mkdir ./dist && cp -r ./lib/* ./dist", + "pack": "npm run clean:tgz && npm run clean:assets && npm pack --pack-destination=./dist", + "prepare-publish": "npm run pack && sh scripts/prepublish.sh", "lint": "npm-run-all \"lint:*\"", "lint:js": "eslint .", "lint:syncpack": "syncpack list-mismatches", @@ -43,9 +43,10 @@ "commit": "cz", "release": "dotenv release-it -- --ci -VV", "release:prepare-toc-in-readme": "sh scripts/prepareTOCinReadme.sh", - "clean": "npm run clean:node-modules && npm run clean:dist", + "clean": "npm run clean:node-modules && npm run clean:dist && npm run clean:assets", "clean:node-modules": "rm -rf node_modules", "clean:dist": "rm -rf dist", + "clean:assets": "rm -rf assets", "clean:tgz": "rm -rf dist/*.tgz", "prepare": "husky" }, diff --git a/scripts/pack.sh b/scripts/pack.sh deleted file mode 100644 index 662777e..0000000 --- a/scripts/pack.sh +++ /dev/null @@ -1,4 +0,0 @@ -npm pack --pack-destination ./dist - -cd ./dist || exit -tar -xzf ./*.tgz diff --git a/scripts/prepublish.sh b/scripts/prepublish.sh new file mode 100644 index 0000000..6bb5497 --- /dev/null +++ b/scripts/prepublish.sh @@ -0,0 +1,10 @@ +cd ./dist || exit +tar -xzf ./*.tgz + +mkdir ../assets +mv ./*.tgz ../assets/ + +find . -mindepth 1 ! -path './package' ! -path './package/*' -exec rm -rf {} + +mv ./package/* ./ +rm -rf ./package +