From a074b84b1391cea0b806cc34b82c6e888a70de09 Mon Sep 17 00:00:00 2001 From: Rodolphe Stoclin Date: Fri, 9 Dec 2022 12:30:20 +0100 Subject: [PATCH] feat(typescript): fix yui jar file --- .github/workflows/test.yml | 2 +- .npmrc | 1 + package.json | 19 ++++---- packages/babel-minify/package.json | 4 +- packages/clean-css/package.json | 4 +- packages/cli/package.json | 4 +- packages/core/package.json | 4 +- packages/crass/package.json | 4 +- packages/cssnano/package.json | 4 +- packages/csso/package.json | 4 +- packages/google-closure-compiler/package.json | 4 +- packages/html-minifier/package.json | 4 +- packages/jsonminify/package.json | 4 +- packages/no-compress/package.json | 4 +- packages/run/package.json | 4 +- packages/sqwish/package.json | 4 +- packages/terser/package.json | 4 +- packages/uglify-es/package.json | 4 +- packages/uglify-js/package.json | 4 +- packages/utils/package.json | 4 +- packages/yui/package.json | 5 ++- pnpm-lock.yaml | 44 +++++++++++++++++++ 22 files changed, 93 insertions(+), 46 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e53a72ebf..6d3de43a5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -48,7 +48,7 @@ jobs: run: pnpm install --no-frozen-lockfile - name: Run tests - run: pnpm build && pnpm coverage + run: pnpm coverage env: CI: true diff --git a/.npmrc b/.npmrc index 6961a07fc..8999a0568 100644 --- a/.npmrc +++ b/.npmrc @@ -4,3 +4,4 @@ tag-version-prefix="" strict-peer-dependencies = false auto-install-peers = true lockfile = true +enable-pre-post-scripts = true diff --git a/package.json b/package.json index c984e91de..c0100ac5f 100644 --- a/package.json +++ b/package.json @@ -19,16 +19,16 @@ "packageManager": "pnpm@7.18.0", "scripts": { "build": "lerna run build", - "clean": "pnpm clean:build; pnpm clean:packages", - "clean:build": "pnpm dlx rimraf packages/*/dist docs/.next", - "clean:packages": "pnpm lerna clean -y", - "clean:test": "pnpm dlx rimraf tests/tmp/*.{js,js.map,css,html}", - "coverage": "vitest run --coverage", - "eslint": "eslint --ignore-path .gitignore packages", + "clean": "npm clean:build; npm clean:packages", + "clean:build": "npm run rimraf packages/*/dist docs/.next", + "clean:packages": "npm lerna clean -y", + "clean:test": "npm run rimraf tests/tmp/*.{js,js.map,css,html}", + "coverage": "npm run build; npm run eslint; vitest run --coverage", + "eslint": "eslint", "lerna": "lerna", - "lint": "pnpm eslint || true", - "postcoverage": "pnpm clean:test", - "pretest": "pnpm build; pnpm eslint", + "lint": "npm eslint || true", + "postcoverage": "npm clean:test", + "pretest": "npm build; npm eslint", "publish-latest": "NPM_CONFIG_OTP=xxx pnpm lerna publish --tag-version-prefix ''", "publish-next": "NPM_CONFIG_OTP=xxx pnpm lerna publish --tag-version-prefix '' --preid beta --npm-tag next", "prettier-project": "prettier --write './packages/**/{bin,src,__tests__}/**/*.js'", @@ -57,6 +57,7 @@ "@node-minify/yui": "workspace:*", "@types/node": "18.11.10", "@vitest/coverage-c8": "0.25.3", + "copyfiles": "2.4.1", "eslint": "8.29.0", "eslint-config-prettier": "8.5.0", "eslint-plugin-prettier": "4.2.1", diff --git a/packages/babel-minify/package.json b/packages/babel-minify/package.json index 1075abc96..5e2ee16ca 100644 --- a/packages/babel-minify/package.json +++ b/packages/babel-minify/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/clean-css/package.json b/packages/clean-css/package.json index 183aa1075..94442a50a 100644 --- a/packages/clean-css/package.json +++ b/packages/clean-css/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/cli/package.json b/packages/cli/package.json index 06bad738f..ba3fe2336 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -44,8 +44,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --sourcemap && tsup src/bin/cli.ts --format esm --dts --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --sourcemap && tsup src/bin/cli.ts --format esm --dts --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/core": "workspace:*", diff --git a/packages/core/package.json b/packages/core/package.json index 773e630c4..266a4c875 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -40,8 +40,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/crass/package.json b/packages/crass/package.json index b493ac115..b55e3796d 100644 --- a/packages/crass/package.json +++ b/packages/crass/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/cssnano/package.json b/packages/cssnano/package.json index 6cb89b281..bf285dc01 100644 --- a/packages/cssnano/package.json +++ b/packages/cssnano/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/csso/package.json b/packages/csso/package.json index cfb6990cf..1e8e87ccd 100644 --- a/packages/csso/package.json +++ b/packages/csso/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/google-closure-compiler/package.json b/packages/google-closure-compiler/package.json index 7515744ba..acfe9de50 100644 --- a/packages/google-closure-compiler/package.json +++ b/packages/google-closure-compiler/package.json @@ -42,8 +42,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/run": "workspace:*", diff --git a/packages/html-minifier/package.json b/packages/html-minifier/package.json index af4dd24a2..dc5f4d77a 100644 --- a/packages/html-minifier/package.json +++ b/packages/html-minifier/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/jsonminify/package.json b/packages/jsonminify/package.json index b345d05aa..5e7bd3690 100644 --- a/packages/jsonminify/package.json +++ b/packages/jsonminify/package.json @@ -42,8 +42,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/no-compress/package.json b/packages/no-compress/package.json index 75917049b..69ad8208f 100644 --- a/packages/no-compress/package.json +++ b/packages/no-compress/package.json @@ -38,8 +38,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*" diff --git a/packages/run/package.json b/packages/run/package.json index 3d4a27429..6e362c68e 100644 --- a/packages/run/package.json +++ b/packages/run/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "devDependencies": { "@node-minify/types": "workspace:*" diff --git a/packages/sqwish/package.json b/packages/sqwish/package.json index fcb31f11c..0e8811c7d 100644 --- a/packages/sqwish/package.json +++ b/packages/sqwish/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/terser/package.json b/packages/terser/package.json index 3aabd6e14..ec892bd60 100644 --- a/packages/terser/package.json +++ b/packages/terser/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/uglify-es/package.json b/packages/uglify-es/package.json index 4f4b96a51..3587a1a48 100644 --- a/packages/uglify-es/package.json +++ b/packages/uglify-es/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/uglify-js/package.json b/packages/uglify-js/package.json index fa08daf31..ac4d77fa5 100644 --- a/packages/uglify-js/package.json +++ b/packages/uglify-js/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/utils": "workspace:*", diff --git a/packages/utils/package.json b/packages/utils/package.json index 9b03541b0..d5656eb46 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -41,8 +41,8 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "prepublishOnly": "pnpm build" }, "dependencies": { "gzip-size": "6.0.0" diff --git a/packages/yui/package.json b/packages/yui/package.json index 3935fdc04..cddf74b91 100644 --- a/packages/yui/package.json +++ b/packages/yui/package.json @@ -41,8 +41,9 @@ }, "scripts": { "clean": "pnpm dlx rimraf dist", - "build": "npm run clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", - "prepublishOnly": "npm run build" + "build": "pnpm clean && tsup src/index.ts --format cjs,esm --dts --clean --sourcemap", + "postbuild": "pnpm dlx copyfiles -u 1 src/binaries/*.jar dist/", + "prepublishOnly": "pnpm build" }, "dependencies": { "@node-minify/run": "workspace:*", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b61a0c56a..6da7843c6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -25,6 +25,7 @@ importers: '@node-minify/yui': workspace:* '@types/node': 18.11.10 '@vitest/coverage-c8': 0.25.3 + copyfiles: 2.4.1 eslint: 8.29.0 eslint-config-prettier: 8.5.0 eslint-plugin-prettier: 4.2.1 @@ -59,6 +60,7 @@ importers: '@node-minify/yui': link:packages/yui '@types/node': 18.11.10 '@vitest/coverage-c8': 0.25.3 + copyfiles: 2.4.1 eslint: 8.29.0 eslint-config-prettier: 8.5.0_eslint@8.29.0 eslint-plugin-prettier: 4.2.1_nrhoyyjffvfyk4vtlt5destxgm @@ -3713,6 +3715,19 @@ packages: /convert-source-map/1.9.0: resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==} + /copyfiles/2.4.1: + resolution: {integrity: sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==} + hasBin: true + dependencies: + glob: 7.2.3 + minimatch: 3.1.2 + mkdirp: 1.0.4 + noms: 0.0.0 + through2: 2.0.5 + untildify: 4.0.0 + yargs: 16.2.0 + dev: true + /core-js/2.6.12: resolution: {integrity: sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==} deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js. @@ -5627,6 +5642,10 @@ packages: engines: {node: '>=12'} dev: false + /isarray/0.0.1: + resolution: {integrity: sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==} + dev: true + /isarray/1.0.0: resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} dev: true @@ -7067,6 +7086,13 @@ packages: resolution: {integrity: sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==} dev: false + /noms/0.0.0: + resolution: {integrity: sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==} + dependencies: + inherits: 2.0.4 + readable-stream: 1.0.34 + dev: true + /nopt/5.0.0: resolution: {integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==} engines: {node: '>=6'} @@ -8215,6 +8241,15 @@ packages: mute-stream: 0.0.8 dev: true + /readable-stream/1.0.34: + resolution: {integrity: sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==} + dependencies: + core-util-is: 1.0.3 + inherits: 2.0.4 + isarray: 0.0.1 + string_decoder: 0.10.31 + dev: true + /readable-stream/2.3.7: resolution: {integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==} dependencies: @@ -8820,6 +8855,10 @@ packages: emoji-regex: 9.2.2 strip-ansi: 7.0.1 + /string_decoder/0.10.31: + resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==} + dev: true + /string_decoder/1.1.1: resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} dependencies: @@ -9482,6 +9521,11 @@ packages: engines: {node: '>= 10.0.0'} dev: true + /untildify/4.0.0: + resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==} + engines: {node: '>=8'} + dev: true + /upath/2.0.1: resolution: {integrity: sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==} engines: {node: '>=4'}