From 03389629f5ecd8dec77e540f4b091ed264c757d9 Mon Sep 17 00:00:00 2001 From: Sasha Koss Date: Thu, 16 Apr 2020 18:10:16 +0300 Subject: [PATCH] Build ESM submodule --- .prettierrc | 3 ++- Makefile | 2 ++ package.json | 8 +++++--- src/adaptor/browser/index.ts | 2 +- src/adaptor/browser/lazy.ts | 2 +- src/adaptor/browser/package.json | 3 --- src/adaptor/package.esm.json | 4 ++++ src/adaptor/package.json | 2 +- src/add/package.json | 4 ++++ src/all/package.json | 4 ++++ src/batch/package.json | 4 ++++ src/collection/package.json | 4 ++++ src/cursor/package.json | 4 ++++ src/data/package.json | 4 ++++ src/doc/package.json | 4 ++++ src/field/package.json | 4 ++++ src/get/package.json | 4 ++++ src/getMany/package.json | 4 ++++ src/group/package.json | 4 ++++ src/limit/package.json | 4 ++++ src/onAll/package.json | 4 ++++ src/onGet/package.json | 4 ++++ src/onGetMany/package.json | 4 ++++ src/onQuery/package.json | 4 ++++ src/order/package.json | 4 ++++ src/query/package.json | 4 ++++ src/ref/package.json | 4 ++++ src/remove/package.json | 4 ++++ src/set/package.json | 4 ++++ src/subcollection/package.json | 4 ++++ src/testing/package.json | 4 ++++ src/transaction/package.json | 4 ++++ src/update/package.json | 4 ++++ src/upset/package.json | 4 ++++ src/value/package.json | 4 ++++ src/where/package.json | 4 ++++ tsconfig.json | 1 + yarn.lock | 15 ++++++++++----- 38 files changed, 139 insertions(+), 15 deletions(-) delete mode 100644 src/adaptor/browser/package.json create mode 100644 src/adaptor/package.esm.json create mode 100644 src/add/package.json create mode 100644 src/all/package.json create mode 100644 src/batch/package.json create mode 100644 src/collection/package.json create mode 100644 src/cursor/package.json create mode 100644 src/data/package.json create mode 100644 src/doc/package.json create mode 100644 src/field/package.json create mode 100644 src/get/package.json create mode 100644 src/getMany/package.json create mode 100644 src/group/package.json create mode 100644 src/limit/package.json create mode 100644 src/onAll/package.json create mode 100644 src/onGet/package.json create mode 100644 src/onGetMany/package.json create mode 100644 src/onQuery/package.json create mode 100644 src/order/package.json create mode 100644 src/query/package.json create mode 100644 src/ref/package.json create mode 100644 src/remove/package.json create mode 100644 src/set/package.json create mode 100644 src/subcollection/package.json create mode 100644 src/testing/package.json create mode 100644 src/transaction/package.json create mode 100644 src/update/package.json create mode 100644 src/upset/package.json create mode 100644 src/value/package.json create mode 100644 src/where/package.json diff --git a/.prettierrc b/.prettierrc index fd496a82..299b9e14 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,4 +1,5 @@ { "singleQuote": true, - "semi": false + "semi": false, + "trailingComma": "none" } diff --git a/Makefile b/Makefile index bc4a919d..1ff5a17b 100644 --- a/Makefile +++ b/Makefile @@ -33,6 +33,8 @@ build: @${BIN}/prettier "lib/**/*.[jt]s" --write --loglevel silent @cp {package.json,*.md} lib @rsync --archive --prune-empty-dirs --exclude '*.ts' --relative src/./ lib + @${BIN}/tsc --outDir lib/esm --module es2020 --target es2019 + @cp src/adaptor/package.esm.json lib/esm/adaptor/package.json publish: build cd lib && npm publish --access public diff --git a/package.json b/package.json index 5219d121..994080aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "typesaurus", - "version": "6.0.0-alpha.1", + "version": "6.0.0-alpha.4", "description": "Type-safe ODM for Firestore", "keywords": [ "Firebase", @@ -8,6 +8,8 @@ "TypeScript" ], "main": "index.js", + "module": "esm/index.js", + "sideEffects": false, "repository": "https://github.com/kossnocorp/typesaurus", "author": "Sasha Koss ", "license": "MIT", @@ -35,11 +37,11 @@ "mocha": "^6.2.0", "nanoid": "^2.0.3", "power-assert": "^1.6.1", - "prettier": "^1.17.1", + "prettier": "^2.0.4", "puppeteer": "^1.19.0", "sinon": "^7.3.2", "typedoc": "^0.15.0", - "typescript": "^3.7.4", + "typescript": "^3.8.3", "webpack": "^4.37.0" } } diff --git a/src/adaptor/browser/index.ts b/src/adaptor/browser/index.ts index 96fefba4..63e77931 100644 --- a/src/adaptor/browser/index.ts +++ b/src/adaptor/browser/index.ts @@ -11,7 +11,7 @@ export default async function adaptor() { // At the moment, the browser's Firestore adaptor doesn't support getAll. // Get rid of the fallback when the issue is closed: // https://github.com/firebase/firebase-js-sdk/issues/1176 - if (!('getAll' in firestore)) return Object.assign(firestore, { getAll }) + if (!('getAll' in firestore)) Object.assign(firestore, { getAll }) return { firestore, diff --git a/src/adaptor/browser/lazy.ts b/src/adaptor/browser/lazy.ts index ac3f144e..5dbbe50b 100644 --- a/src/adaptor/browser/lazy.ts +++ b/src/adaptor/browser/lazy.ts @@ -12,7 +12,7 @@ export default async function adaptor() { // At the moment, the browser's Firestore adaptor doesn't support getAll. // Get rid of the fallback when the issue is closed: // https://github.com/firebase/firebase-js-sdk/issues/1176 - if (!('getAll' in firestore)) return Object.assign(firestore, { getAll }) + if (!('getAll' in firestore)) Object.assign(firestore, { getAll }) return { firestore, diff --git a/src/adaptor/browser/package.json b/src/adaptor/browser/package.json deleted file mode 100644 index f627c070..00000000 --- a/src/adaptor/browser/package.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "module": "./lazy" -} diff --git a/src/adaptor/package.esm.json b/src/adaptor/package.esm.json new file mode 100644 index 00000000..04cd8c4d --- /dev/null +++ b/src/adaptor/package.esm.json @@ -0,0 +1,4 @@ +{ + "browser": "./browser/lazy", + "main": "./node" +} diff --git a/src/adaptor/package.json b/src/adaptor/package.json index 7e834e1f..c621ef0c 100644 --- a/src/adaptor/package.json +++ b/src/adaptor/package.json @@ -1,4 +1,4 @@ { - "browser": "./browser", + "browser": "./browser/index", "main": "./node" } diff --git a/src/add/package.json b/src/add/package.json new file mode 100644 index 00000000..c33c6a77 --- /dev/null +++ b/src/add/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/add/index.js", + "sideEffects": false +} diff --git a/src/all/package.json b/src/all/package.json new file mode 100644 index 00000000..5191aa1c --- /dev/null +++ b/src/all/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/all/index.js", + "sideEffects": false +} diff --git a/src/batch/package.json b/src/batch/package.json new file mode 100644 index 00000000..cfe70cb4 --- /dev/null +++ b/src/batch/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/batch/index.js", + "sideEffects": false +} diff --git a/src/collection/package.json b/src/collection/package.json new file mode 100644 index 00000000..758e0906 --- /dev/null +++ b/src/collection/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/collection/index.js", + "sideEffects": false +} diff --git a/src/cursor/package.json b/src/cursor/package.json new file mode 100644 index 00000000..1e531a50 --- /dev/null +++ b/src/cursor/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/cursor/index.js", + "sideEffects": false +} diff --git a/src/data/package.json b/src/data/package.json new file mode 100644 index 00000000..31c08588 --- /dev/null +++ b/src/data/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/data/index.js", + "sideEffects": false +} diff --git a/src/doc/package.json b/src/doc/package.json new file mode 100644 index 00000000..3210c11d --- /dev/null +++ b/src/doc/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/doc/index.js", + "sideEffects": false +} diff --git a/src/field/package.json b/src/field/package.json new file mode 100644 index 00000000..158bd75f --- /dev/null +++ b/src/field/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/field/index.js", + "sideEffects": false +} diff --git a/src/get/package.json b/src/get/package.json new file mode 100644 index 00000000..2edc9fed --- /dev/null +++ b/src/get/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/get/index.js", + "sideEffects": false +} diff --git a/src/getMany/package.json b/src/getMany/package.json new file mode 100644 index 00000000..d7631f08 --- /dev/null +++ b/src/getMany/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/getMany/index.js", + "sideEffects": false +} diff --git a/src/group/package.json b/src/group/package.json new file mode 100644 index 00000000..ca0daafe --- /dev/null +++ b/src/group/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/group/index.js", + "sideEffects": false +} diff --git a/src/limit/package.json b/src/limit/package.json new file mode 100644 index 00000000..60dc2dbc --- /dev/null +++ b/src/limit/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/limit/index.js", + "sideEffects": false +} diff --git a/src/onAll/package.json b/src/onAll/package.json new file mode 100644 index 00000000..ec64bbb4 --- /dev/null +++ b/src/onAll/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/onAll/index.js", + "sideEffects": false +} diff --git a/src/onGet/package.json b/src/onGet/package.json new file mode 100644 index 00000000..c9ea243d --- /dev/null +++ b/src/onGet/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/onGet/index.js", + "sideEffects": false +} diff --git a/src/onGetMany/package.json b/src/onGetMany/package.json new file mode 100644 index 00000000..8c658e3b --- /dev/null +++ b/src/onGetMany/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/onGetMany/index.js", + "sideEffects": false +} diff --git a/src/onQuery/package.json b/src/onQuery/package.json new file mode 100644 index 00000000..12710c9a --- /dev/null +++ b/src/onQuery/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/onQuery/index.js", + "sideEffects": false +} diff --git a/src/order/package.json b/src/order/package.json new file mode 100644 index 00000000..8b170480 --- /dev/null +++ b/src/order/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/order/index.js", + "sideEffects": false +} diff --git a/src/query/package.json b/src/query/package.json new file mode 100644 index 00000000..42d1f771 --- /dev/null +++ b/src/query/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/query/index.js", + "sideEffects": false +} diff --git a/src/ref/package.json b/src/ref/package.json new file mode 100644 index 00000000..99a0a635 --- /dev/null +++ b/src/ref/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/ref/index.js", + "sideEffects": false +} diff --git a/src/remove/package.json b/src/remove/package.json new file mode 100644 index 00000000..faea90b8 --- /dev/null +++ b/src/remove/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/remove/index.js", + "sideEffects": false +} diff --git a/src/set/package.json b/src/set/package.json new file mode 100644 index 00000000..f4a88621 --- /dev/null +++ b/src/set/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/set/index.js", + "sideEffects": false +} diff --git a/src/subcollection/package.json b/src/subcollection/package.json new file mode 100644 index 00000000..13a5f38e --- /dev/null +++ b/src/subcollection/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/subcollection/index.js", + "sideEffects": false +} diff --git a/src/testing/package.json b/src/testing/package.json new file mode 100644 index 00000000..35de1229 --- /dev/null +++ b/src/testing/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/testing/index.js", + "sideEffects": false +} diff --git a/src/transaction/package.json b/src/transaction/package.json new file mode 100644 index 00000000..930e18bd --- /dev/null +++ b/src/transaction/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/transaction/index.js", + "sideEffects": false +} diff --git a/src/update/package.json b/src/update/package.json new file mode 100644 index 00000000..f42ae08e --- /dev/null +++ b/src/update/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/update/index.js", + "sideEffects": false +} diff --git a/src/upset/package.json b/src/upset/package.json new file mode 100644 index 00000000..a6a77183 --- /dev/null +++ b/src/upset/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/upset/index.js", + "sideEffects": false +} diff --git a/src/value/package.json b/src/value/package.json new file mode 100644 index 00000000..b88cea6d --- /dev/null +++ b/src/value/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/value/index.js", + "sideEffects": false +} diff --git a/src/where/package.json b/src/where/package.json new file mode 100644 index 00000000..685e864b --- /dev/null +++ b/src/where/package.json @@ -0,0 +1,4 @@ +{ + "module": "../esm/where/index.js", + "sideEffects": false +} diff --git a/tsconfig.json b/tsconfig.json index 39edb8e9..e67aed61 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,6 +4,7 @@ "declaration": true, "target": "es6", "module": "commonjs", + "moduleResolution": "node", "sourceMap": true, "outDir": "lib", "strict": true, diff --git a/yarn.lock b/yarn.lock index 589bfb45..85a519a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8052,10 +8052,10 @@ prepend-http@^1.0.1: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier@^1.17.1: - version "1.18.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" - integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== +prettier@^2.0.4: + version "2.0.4" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef" + integrity sha512-SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w== pretty-format@^24.8.0: version "24.8.0" @@ -9779,11 +9779,16 @@ typedoc@^0.15.0: typedoc-default-themes "^0.6.3" typescript "3.7.x" -typescript@3.7.x, typescript@^3.7.4: +typescript@3.7.x: version "3.7.4" resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.4.tgz#1743a5ec5fef6a1fa9f3e4708e33c81c73876c19" integrity sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw== +typescript@^3.8.3: + version "3.8.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" + integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== + uglify-js@^3.1.4: version "3.7.3" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"