From 5dd168972f222a95d47843de476a0a18176b6a07 Mon Sep 17 00:00:00 2001 From: so1ve Date: Tue, 18 Apr 2023 17:07:18 +0800 Subject: [PATCH 1/2] fix: release --- package.json | 11 +----- pnpm-lock.yaml | 87 --------------------------------------------- scripts/patchCJS.ts | 56 ----------------------------- 3 files changed, 1 insertion(+), 153 deletions(-) delete mode 100644 scripts/patchCJS.ts diff --git a/package.json b/package.json index 2f04fe2..08f2efe 100644 --- a/package.json +++ b/package.json @@ -53,11 +53,6 @@ "require": "./dist/rspack.cjs", "import": "./dist/rspack.mjs" }, - "./types": { - "types": "./dist/types.d.ts", - "require": "./dist/types.cjs", - "import": "./dist/types.mjs" - }, "./*": "./*" }, "main": "./dist/index.cjs", @@ -81,7 +76,7 @@ "access": "public" }, "scripts": { - "build": "rimraf dist && unbuild && tsx scripts/patchCJS.ts", + "build": "unbuild", "stub": "unbuild --stub", "lint": "eslint .", "lint:fix": "eslint . --fix", @@ -91,7 +86,6 @@ "typecheck": "tsc --noEmit" }, "peerDependencies": { - "vite": "^3.0.0 || ^4.0.0", "vue": "^2.7.0-0" }, "dependencies": { @@ -114,14 +108,11 @@ "minimist": "^1.2.6", "picocolors": "^1.0.0", "pnpm": "^7.32.1", - "prettier": "^2.7.1", "puppeteer": "^14.4.0", - "rimraf": "^5.0.0", "rollup": "^3.20.4", "semver": "^7.3.7", "slash": "^3.0.0", "source-map": "^0.6.1", - "tsx": "^3.12.6", "typescript": "^5.0.4", "unbuild": "^1.2.1", "vite": "^4.2.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 65fb8cd..804248b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,14 +20,11 @@ importers: minimist: ^1.2.6 picocolors: ^1.0.0 pnpm: ^7.32.1 - prettier: ^2.7.1 puppeteer: ^14.4.0 - rimraf: ^5.0.0 rollup: ^3.20.4 semver: ^7.3.7 slash: ^3.0.0 source-map: ^0.6.1 - tsx: ^3.12.6 typescript: ^5.0.4 unbuild: ^1.2.1 unplugin: ^1.3.1 @@ -54,14 +51,11 @@ importers: minimist: 1.2.8 picocolors: 1.0.0 pnpm: 7.32.1 - prettier: 2.8.7 puppeteer: 14.4.1 - rimraf: 5.0.0 rollup: 3.20.4 semver: 7.4.0 slash: 3.0.0 source-map: 0.6.1 - tsx: 3.12.6 typescript: 5.0.4 unbuild: 1.2.1 vite: 4.2.1_@types+node@18.15.11 @@ -320,27 +314,6 @@ packages: jsdoc-type-pratt-parser: 4.0.0 dev: true - /@esbuild-kit/cjs-loader/2.4.2: - resolution: {integrity: sha512-BDXFbYOJzT/NBEtp71cvsrGPwGAMGRB/349rwKuoxNSiKjPraNNnlK6MIIabViCjqZugu6j+xeMDlEkWdHHJSg==} - dependencies: - '@esbuild-kit/core-utils': 3.1.0 - get-tsconfig: 4.5.0 - dev: true - - /@esbuild-kit/core-utils/3.1.0: - resolution: {integrity: sha512-Uuk8RpCg/7fdHSceR1M6XbSZFSuMrxcePFuGgyvsBn+u339dk5OeL4jv2EojwTN2st/unJGsVm4qHWjWNmJ/tw==} - dependencies: - esbuild: 0.17.17 - source-map-support: 0.5.21 - dev: true - - /@esbuild-kit/esm-loader/2.5.5: - resolution: {integrity: sha512-Qwfvj/qoPbClxCRNuac1Du01r9gvNOT+pMYtJDapfB1eoGN1YlJ1BixLyL9WVENRx5RXgNLdfYdx/CuswlGhMw==} - dependencies: - '@esbuild-kit/core-utils': 3.1.0 - get-tsconfig: 4.5.0 - dev: true - /@esbuild/android-arm/0.17.17: resolution: {integrity: sha512-E6VAZwN7diCa3labs0GYvhEPL2M94WLF8A+czO8hfjREXxba8Ng7nM5VxV+9ihNXIY1iQO1XxUU4P7hbqbICxg==} engines: {node: '>=12'} @@ -3231,16 +3204,6 @@ packages: resolution: {integrity: sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==} dev: true - /glob/10.1.0: - resolution: {integrity: sha512-daGobsYuT0G4hng24B5LbeLNvwKZYRhWyDl3RvqqAGZjJnCopWWK6PWnAGBY1M/vdA63QE+jddhZcYp+74Bq6Q==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - fs.realpath: 1.0.0 - minimatch: 9.0.0 - minipass: 5.0.0 - path-scurry: 1.7.0 - dev: true - /glob/7.2.3: resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} dependencies: @@ -3905,11 +3868,6 @@ packages: yallist: 4.0.0 dev: true - /lru-cache/9.0.3: - resolution: {integrity: sha512-cyjNRew29d4kbgnz1sjDqxg7qg8NW4s+HQzCGjeon7DV5T2yDije16W9HaUFV1dhVEMh+SjrOcK0TomBmf3Egg==} - engines: {node: 14 || >=16.14} - dev: true - /magic-string/0.27.0: resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} engines: {node: '>=12'} @@ -4035,13 +3993,6 @@ packages: brace-expansion: 2.0.1 dev: true - /minimatch/9.0.0: - resolution: {integrity: sha512-0jJj8AvgKqWN05mrwuqi8QYKx1WmYSUoKSxu5Qhs9prezTz10sxAHGNZe9J9cqIJzta8DWsleh2KaVaLl6Ru2w==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - brace-expansion: 2.0.1 - dev: true - /minimist-options/4.1.0: resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==} engines: {node: '>= 6'} @@ -4067,11 +4018,6 @@ packages: engines: {node: '>=8'} dev: true - /minipass/5.0.0: - resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==} - engines: {node: '>=8'} - dev: true - /minizlib/2.1.2: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} @@ -4396,14 +4342,6 @@ packages: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} dev: true - /path-scurry/1.7.0: - resolution: {integrity: sha512-UkZUeDjczjYRE495+9thsgcVgsaCPkaw80slmfVFgllxY+IO8ubTsOpFVjDPROBqJdHfVPUFRHPBV/WciOVfWg==} - engines: {node: '>=16 || 14 >=14.17'} - dependencies: - lru-cache: 9.0.3 - minipass: 5.0.0 - dev: true - /path-type/3.0.0: resolution: {integrity: sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==} engines: {node: '>=4'} @@ -4501,12 +4439,6 @@ packages: fast-diff: 1.2.0 dev: true - /prettier/2.8.7: - resolution: {integrity: sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==} - engines: {node: '>=10.13.0'} - hasBin: true - dev: true - /pretty-bytes/6.1.0: resolution: {integrity: sha512-Rk753HI8f4uivXi4ZCIYdhmG1V+WKzvRMg/X+M42a6t7D07RcmopXJMDNk6N++7Bl75URRGsb40ruvg7Hcp2wQ==} engines: {node: ^14.13.1 || >=16.0.0} @@ -4745,14 +4677,6 @@ packages: glob: 7.2.3 dev: true - /rimraf/5.0.0: - resolution: {integrity: sha512-Jf9llaP+RvaEVS5nPShYFhtXIrb3LRKP281ib3So0KkeZKo2wIKyq0Re7TOSwanasA423PSr6CCIL4bP6T040g==} - engines: {node: '>=14'} - hasBin: true - dependencies: - glob: 10.1.0 - dev: true - /rollup-plugin-dts/5.3.0_dqoqy63ndela2j7oq3l4jxkjsa: resolution: {integrity: sha512-8FXp0ZkyZj1iU5klkIJYLjIq/YZSwBoERu33QBDxm/1yw5UU4txrEtcmMkrq+ZiKu3Q4qvPCNqc3ovX6rjqzbQ==} engines: {node: '>=v14'} @@ -5252,17 +5176,6 @@ packages: typescript: 5.0.4 dev: true - /tsx/3.12.6: - resolution: {integrity: sha512-q93WgS3lBdHlPgS0h1i+87Pt6n9K/qULIMNYZo07nSeu2z5QE2CellcAZfofVXBo2tQg9av2ZcRMQ2S2i5oadQ==} - hasBin: true - dependencies: - '@esbuild-kit/cjs-loader': 2.4.2 - '@esbuild-kit/core-utils': 3.1.0 - '@esbuild-kit/esm-loader': 2.5.5 - optionalDependencies: - fsevents: 2.3.2 - dev: true - /type-check/0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} diff --git a/scripts/patchCJS.ts b/scripts/patchCJS.ts deleted file mode 100644 index b6e560b..0000000 --- a/scripts/patchCJS.ts +++ /dev/null @@ -1,56 +0,0 @@ -/** - -It converts - -```ts -exports["default"] = vuePlugin; -exports.parseVueRequest = parseVueRequest; -``` - -to - -```ts -module.exports = vuePlugin; -module.exports["default"] = vuePlugin; -module.exports.parseVueRequest = parseVueRequest; -``` -*/ - -import { readFileSync, writeFileSync } from "node:fs"; - -import colors from "picocolors"; - -const indexPath = "dist/index.cjs"; -let code = readFileSync(indexPath, "utf-8"); - -const matchMixed = code.match(/\nexports\["default"\] = (\w+);/); -if (matchMixed) { - const name = matchMixed[1]; - - const lines = code.trimEnd().split("\n"); - - // search from the end to prepend `modules.` to `export[xxx]` - for (let i = lines.length - 1; i > 0; i--) { - if (lines[i].startsWith("exports")) { lines[i] = `module.${lines[i]}`; } - else { - // at the beginning of exports, export the default function - lines[i] += `\nmodule.exports = ${name};`; - break; - } - } - - writeFileSync(indexPath, lines.join("\n")); - - console.log(colors.bold(`${indexPath} CJS patched`)); -} else { - const matchDefault = code.match(/\nmodule.exports = (\w+);/); - - if (matchDefault) { - code += `module.exports["default"] = ${matchDefault[1]};\n`; - writeFileSync(indexPath, code); - console.log(colors.bold(`${indexPath} CJS patched`)); - } else { - console.error(colors.red(`${indexPath} CJS patch failed`)); - process.exit(1); - } -} From e6f2fa19fb00621247e0af3b3bc84939eb6d546f Mon Sep 17 00:00:00 2001 From: so1ve Date: Tue, 18 Apr 2023 17:07:23 +0800 Subject: [PATCH 2/2] chore: release v0.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 08f2efe..fc5465f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "unplugin-vue2", - "version": "0.1.0", + "version": "0.1.1", "packageManager": "pnpm@7.32.1", "author": "Ray (@so1ve)", "description": "",