From: pooya parsa Date: Wed, 3 Nov 2021 19:30:38 +0000 (+0100) Subject: fix(nuxt): migrate to unbuild (#765) X-Git-Tag: @pinia/nuxt@0.1.1~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8ccb71e3ad5d1d5e55e1418e7c9f981f64c71ff;p=thirdparty%2Fvuejs%2Fpinia.git fix(nuxt): migrate to unbuild (#765) --- diff --git a/packages/nuxt/.gitignore b/packages/nuxt/.gitignore deleted file mode 100644 index 99d57c6e..00000000 --- a/packages/nuxt/.gitignore +++ /dev/null @@ -1 +0,0 @@ -module.cjs diff --git a/packages/nuxt/build.config.ts b/packages/nuxt/build.config.ts new file mode 100644 index 00000000..67cf2ba0 --- /dev/null +++ b/packages/nuxt/build.config.ts @@ -0,0 +1,9 @@ +import { defineBuildConfig } from 'unbuild' + +export default defineBuildConfig({ + declaration: true, + emitCJS: false, + cjsBridge: true, + entries: ['src/module'], + externals: ['pinia', '@nuxt/kit-edge', '@nuxt/types'], +}) diff --git a/packages/nuxt/module.cjs b/packages/nuxt/module.cjs new file mode 100644 index 00000000..5df57566 --- /dev/null +++ b/packages/nuxt/module.cjs @@ -0,0 +1,6 @@ +// CommonJS proxy to bypass jiti transforms from nuxt 2 and using native ESM +module.exports = function(...args) { + return import('./dist/module.mjs').then(m => m.default.call(this, ...args)) +} + +module.exports.meta = require('./package.json') diff --git a/packages/nuxt/package.json b/packages/nuxt/package.json index 85145d0d..8d46cd51 100644 --- a/packages/nuxt/package.json +++ b/packages/nuxt/package.json @@ -43,7 +43,7 @@ "dist/templates/*.mjs" ], "scripts": { - "build": "siroc build", + "build": "unbuild", "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s --commit-path . -l @pinia/nuxt -r 1" }, "dependencies": { @@ -53,7 +53,7 @@ "devDependencies": { "@nuxt/types": "^2.15.8", "pinia": "^2.0.0-0", - "siroc": "^0.16.0" + "unbuild": "^0.5.11" }, "peerDependencies": { "pinia": "~2.0.0-rc.15" diff --git a/yarn.lock b/yarn.lock index 9a9c6023..1c4d65ec 100644 --- a/yarn.lock +++ b/yarn.lock @@ -106,7 +106,7 @@ "@algolia/logger-common" "4.11.0" "@algolia/requester-common" "4.11.0" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.16.0": +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.0.tgz#0dfc80309beec8411e65e706461c408b0bb9b431" integrity sha512-IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA== @@ -1666,7 +1666,7 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@rollup/pluginutils@^4.1.0": +"@rollup/pluginutils@^4.1.0", "@rollup/pluginutils@^4.1.1": version "4.1.1" resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.1.1.tgz#1d4da86dd4eded15656a57d933fda2b9a08d47ec" integrity sha512-clDjivHqWGXi7u+0d2r2sBi4Ie6VLEAzWMIkvJLnDmxoOhBYOTfzGbOQBA32THHm11/LiJbd01tJUpJsbshSWQ== @@ -2780,7 +2780,7 @@ chalk@^2.0.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -5816,7 +5816,7 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdist@^0.3.3: +mkdist@^0.3.3, mkdist@^0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/mkdist/-/mkdist-0.3.5.tgz#11f484524ff9996a9fd073802f89baeaefbd9832" integrity sha512-3ai1qPfTufa/YMdsjYoA372YVogn1yLkHTG7H7tG66xJpYdoK3vnelROhM41dGhHh/4RhObCkDwAQCpIx81A3g== @@ -5829,7 +5829,7 @@ mkdist@^0.3.3: mri "^1.2.0" pathe "^0.2.0" -mlly@^0.3.12, mlly@^0.3.6: +mlly@^0.3.0, mlly@^0.3.12, mlly@^0.3.6: version "0.3.12" resolved "https://registry.yarnpkg.com/mlly/-/mlly-0.3.12.tgz#9928d517622558ea6ce3d5544df1a4f7c6687811" integrity sha512-+5DdpxP48PpfV/FcP4j/8TREPycnROCg0hX1nmD6aoZ2lD4FpZI4sxWG6l6YpUktXi/vckj8NaAl3DVQSkIn3w== @@ -6537,6 +6537,11 @@ prettier@^2.4.1: resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA== +pretty-bytes@^5.6.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb" + integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg== + pretty-format@^27.0.0, pretty-format@^27.3.1: version "27.3.1" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-27.3.1.tgz#7e9486365ccdd4a502061fa761d3ab9ca1b78df5" @@ -6920,6 +6925,15 @@ rollup-plugin-dts@^3.0.2: optionalDependencies: "@babel/code-frame" "^7.12.13" +rollup-plugin-dts@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-dts/-/rollup-plugin-dts-4.0.0.tgz#7645280183b7624e77375a548a11297f9916f6d8" + integrity sha512-tgUC8CxVgtlLDVloUEA9uACVaxjJHuYxlDSTp1LdCexA0bJx+RuMi45RjdLG9RTCgZlV5YBh3O7P2u6dS1KlnA== + dependencies: + magic-string "^0.25.7" + optionalDependencies: + "@babel/code-frame" "^7.14.5" + rollup-plugin-esbuild@4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/rollup-plugin-esbuild/-/rollup-plugin-esbuild-4.5.0.tgz#0fbcb6d2d651d87dc540c4fc3b2db669f48da1f0" @@ -6929,6 +6943,15 @@ rollup-plugin-esbuild@4.5.0: joycon "^3.0.1" jsonc-parser "^3.0.0" +rollup-plugin-esbuild@^4.6.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-esbuild/-/rollup-plugin-esbuild-4.6.0.tgz#293b0c8d2e64b753918f3023c1fb87dc4acdef3b" + integrity sha512-fjihkrOCy7qeNDd1VmtWw39UA4b6a96NVrsuK6eg1SArnWoS3G4xLoW7liF0oRQU7+ONPr/Gjxz9cv+WLRhaGA== + dependencies: + "@rollup/pluginutils" "^4.1.1" + joycon "^3.0.1" + jsonc-parser "^3.0.0" + rollup-plugin-terser@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d" @@ -6950,7 +6973,7 @@ rollup-plugin-typescript2@^0.30.0: resolve "1.20.0" tslib "2.1.0" -rollup@^2.56.3, rollup@^2.57.0, rollup@^2.58.3: +rollup@^2.56.3, rollup@^2.57.0, rollup@^2.58.0, rollup@^2.58.3: version "2.59.0" resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.59.0.tgz#108c61b0fa0a37ebc8d1f164f281622056f0db59" integrity sha512-l7s90JQhCQ6JyZjKgo7Lq1dKh2RxatOM+Jr6a9F7WbS9WgKbocyUSeLmZl8evAse7y96Ae98L2k1cBOwWD8nHw== @@ -7875,6 +7898,36 @@ unbox-primitive@^1.0.1: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" +unbuild@^0.5.11: + version "0.5.11" + resolved "https://registry.yarnpkg.com/unbuild/-/unbuild-0.5.11.tgz#f3fb9ec18a8c4dd5d56a7924c51cbf5fea5fbd32" + integrity sha512-FR+9WwE5Y4XGdITr6dWplfmyXhFYuSF+GSd/ejuND144Uz6c2wwyxtUd+PUD9xAqMj4ZsahO1HjX/BSsgDtfVA== + dependencies: + "@rollup/plugin-alias" "^3.1.8" + "@rollup/plugin-commonjs" "^21.0.1" + "@rollup/plugin-json" "^4.1.0" + "@rollup/plugin-node-resolve" "^13.0.6" + "@rollup/plugin-replace" "^3.0.0" + chalk "^4.1.1" + consola "^2.15.3" + defu "^5.0.0" + esbuild "^0.13.8" + jiti "^1.12.9" + magic-string "^0.25.7" + mkdirp "^1.0.4" + mkdist "^0.3.5" + mlly "^0.3.0" + mri "^1.2.0" + pathe "^0.2.0" + pretty-bytes "^5.6.0" + rimraf "^3.0.2" + rollup "^2.58.0" + rollup-plugin-dts "^4.0.0" + rollup-plugin-esbuild "^4.6.0" + scule "^0.2.1" + typescript "^4.4.4" + untyped "^0.2.9" + unctx@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/unctx/-/unctx-1.0.2.tgz#d8d9c83a0965aa277f61058c94548fcee6861e48" @@ -7909,7 +7962,7 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== -untyped@^0.2.11: +untyped@^0.2.11, untyped@^0.2.9: version "0.2.11" resolved "https://registry.yarnpkg.com/untyped/-/untyped-0.2.11.tgz#a956977e82ad1186232995bc4ba4b68ae7d20b26" integrity sha512-KVNcu9jB+mlnQJiunAzmqpnnn9R+yniT+AkOk9ZgCIsThwh0nlP6wO+O7mJjHM7Y2yplEu3v6NNtRvb82+uGxw==