From f81f2d4db2fa10da77e600fb9724ce12de925d71 Mon Sep 17 00:00:00 2001 From: Guillaume Chau Date: Thu, 11 Feb 2021 16:43:00 +0100 Subject: [PATCH] fix: build --- package.json | 2 + packages/vue-apollo-composable/esbuild.mjs | 23 ++++++++ packages/vue-apollo-composable/package.json | 8 +-- .../vue-apollo-composable/src/useQuery.ts | 2 +- packages/vue-apollo-composable/tsconfig.json | 2 +- yarn.lock | 57 +++++++++++++++++-- 6 files changed, 83 insertions(+), 11 deletions(-) create mode 100644 packages/vue-apollo-composable/esbuild.mjs diff --git a/package.json b/package.json index b7f4aa8..05ea839 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,8 @@ }, "devDependencies": { "core-js": "^3.4.1", + "esbuild": "^0.8.44", + "esbuild-node-externals": "^1.0.2", "lerna": "^3.18.4" }, "resolutions": { diff --git a/packages/vue-apollo-composable/esbuild.mjs b/packages/vue-apollo-composable/esbuild.mjs new file mode 100644 index 0000000..31c8350 --- /dev/null +++ b/packages/vue-apollo-composable/esbuild.mjs @@ -0,0 +1,23 @@ +import esbuild from 'esbuild' +import path from 'path' +import { nodeExternalsPlugin } from 'esbuild-node-externals' + +(async () => { + const builds = [ + { format: 'esm', file: 'index.esm.js' }, + { format: 'cjs', file: 'index.js' }, + ] + for (const { format, file } of builds) { + await esbuild.build({ + entryPoints: ['./src/index.ts'], + bundle: true, + platform: 'neutral', + format, + outfile: path.join('dist', file), + sourcemap: true, + plugins: [ + nodeExternalsPlugin(), + ], + }) + } +})() diff --git a/packages/vue-apollo-composable/package.json b/packages/vue-apollo-composable/package.json index 7f6ba48..9efc803 100644 --- a/packages/vue-apollo-composable/package.json +++ b/packages/vue-apollo-composable/package.json @@ -21,15 +21,15 @@ "publishConfig": { "access": "public" }, - "main": "dist/vue-apollo-composable.js", + "main": "dist/index.js", "types": "dist/index.d.ts", - "module": "dist/index.js", + "module": "dist/index.esm.js", "files": [ "dist" ], "scripts": { - "dev": "tsc --watch -m es2015", - "build": "tsc --outFile dist/vue-apollo-composable.js && tsc -m es2015", + "dev": "tsc -d -w --sourceMap", + "build": "rimraf dist && node esbuild.mjs && tsc -d --emitDeclarationOnly", "prepublishOnly": "yarn test && yarn build", "test": "yarn lint && yarn test:types", "lint": "eslint . --ext .js,.ts", diff --git a/packages/vue-apollo-composable/src/useQuery.ts b/packages/vue-apollo-composable/src/useQuery.ts index 3ace2b8..93b89be 100644 --- a/packages/vue-apollo-composable/src/useQuery.ts +++ b/packages/vue-apollo-composable/src/useQuery.ts @@ -171,7 +171,7 @@ export function useQueryImpl< onServerPrefetch?.(() => { if (!isEnabled.value || (isServer && currentOptions.value?.prefetch === false)) return - return new Promise((resolve, reject) => { + return new Promise((resolve, reject) => { firstResolve = () => { resolve() firstResolve = undefined diff --git a/packages/vue-apollo-composable/tsconfig.json b/packages/vue-apollo-composable/tsconfig.json index bdbf84e..518ab66 100644 --- a/packages/vue-apollo-composable/tsconfig.json +++ b/packages/vue-apollo-composable/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "target": "es5", - "module": "amd", + "module": "CommonJS", "sourceMap": true, "skipLibCheck": true, "allowSyntheticDefaultImports": true, diff --git a/yarn.lock b/yarn.lock index 754fd76..d0ec28e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7463,6 +7463,19 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" +esbuild-node-externals@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/esbuild-node-externals/-/esbuild-node-externals-1.0.2.tgz#495982804901a91055f0cf2bb679f62ad5474edb" + integrity sha512-/MDAb6wsxa2R5q/1rEgOQMKLsQznU6cVFEPk9b/jCeddVnOqWIIKWl3BhmxzNVreS+Llf/ThexDnyMtxKH4rJg== + dependencies: + find-up "5.0.0" + tslib "2.1.0" + +esbuild@^0.8.44: + version "0.8.44" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.8.44.tgz#2a74f48fe20579081c9d8fe99be6fb8d2848c887" + integrity sha512-m9yyBZMgWuAB7e7tA2g9L4PovoLa5Xb73+Yg9uBBR2w3Fe4P9/nxqj/HLrw1k/rjdjF1eX1kNJRytboqOtRCCQ== + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" @@ -8514,6 +8527,14 @@ find-root@^1.1.0: resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== +find-up@5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -11489,6 +11510,13 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -13060,6 +13088,13 @@ p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1, p-limit@^2.3.0: dependencies: p-try "^2.0.0" +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + p-locate@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" @@ -13081,6 +13116,13 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + p-map-series@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca" @@ -16672,16 +16714,16 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" +tslib@2.1.0, tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" + integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== + tslib@^1, tslib@^1.10.0, tslib@^1.14.1, tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== - tslint@^5.20.1: version "5.20.1" resolved "https://registry.yarnpkg.com/tslint/-/tslint-5.20.1.tgz#e401e8aeda0152bc44dd07e614034f3f80c67b7d" @@ -18249,6 +18291,11 @@ yn@3.1.1: resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== + yorkie@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/yorkie/-/yorkie-2.0.0.tgz#92411912d435214e12c51c2ae1093e54b6bb83d9"