From 42d5740e35c072bad067356a97d1ce367f47736a Mon Sep 17 00:00:00 2001 From: Daniel Roe Date: Sun, 5 Sep 2021 19:24:51 +0100 Subject: [PATCH] build!: use `.mjs`/`.cjs` file extensions for node module context support (#717) --- packages/components/package.json | 8 ++++---- packages/core/package.json | 8 ++++---- packages/electron/package.json | 8 ++++---- packages/firebase/package.json | 20 +++++++++---------- packages/integrations/package.json | 32 +++++++++++++++--------------- packages/router/package.json | 8 ++++---- packages/rxjs/package.json | 8 ++++---- packages/shared/package.json | 8 ++++---- scripts/rollup.config.ts | 4 ++-- scripts/utils.ts | 12 +++++------ 10 files changed, 58 insertions(+), 58 deletions(-) diff --git a/packages/components/package.json b/packages/components/package.json index 22cf78d1a18f..801052d914dd 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -15,14 +15,14 @@ "author": "Jacob Clevenger", "exports": { ".": { - "import": "./index.esm.js", - "require": "./index.cjs.js" + "import": "./index.mjs", + "require": "./index.cjs" }, "./*": "./*" }, - "main": "./index.cjs.js", + "main": "./index.cjs", "types": "./index.d.ts", - "module": "./index.esm.js", + "module": "./index.mjs", "unpkg": "./index.iife.min.js", "jsdelivr": "./index.iife.min.js", "sideEffects": false, diff --git a/packages/core/package.json b/packages/core/package.json index 5e42e98aa713..291f92ba2c87 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -16,14 +16,14 @@ "author": "Anthony Fu", "exports": { ".": { - "import": "./index.esm.js", - "require": "./index.cjs.js" + "import": "./index.mjs", + "require": "./index.cjs" }, "./*": "./*" }, - "main": "./index.cjs.js", + "main": "./index.cjs", "types": "./index.d.ts", - "module": "./index.esm.js", + "module": "./index.mjs", "unpkg": "./index.iife.min.js", "jsdelivr": "./index.iife.min.js", "sideEffects": false, diff --git a/packages/electron/package.json b/packages/electron/package.json index 07d6448f16ba..270a72d7807e 100644 --- a/packages/electron/package.json +++ b/packages/electron/package.json @@ -18,14 +18,14 @@ "author": "Archer Gu", "exports": { ".": { - "import": "./index.esm.js", - "require": "./index.cjs.js" + "import": "./index.mjs", + "require": "./index.cjs" }, "./*": "./*" }, - "main": "./index.cjs.js", + "main": "./index.cjs", "types": "./index.d.ts", - "module": "./index.esm.js", + "module": "./index.mjs", "sideEffects": false, "bugs": { "url": "https://github.com/vueuse/vueuse/issues" diff --git a/packages/firebase/package.json b/packages/firebase/package.json index f164f5767608..84ff7641ed56 100644 --- a/packages/firebase/package.json +++ b/packages/firebase/package.json @@ -18,26 +18,26 @@ "author": "Anthony Fu", "exports": { ".": { - "import": "./index.esm.js", - "require": "./index.cjs.js" + "import": "./index.mjs", + "require": "./index.cjs" }, "./*": "./*", "./useAuth": { - "import": "./useAuth.esm.js", - "require": "./useAuth.cjs.js" + "import": "./useAuth.mjs", + "require": "./useAuth.cjs" }, "./useFirestore": { - "import": "./useFirestore.esm.js", - "require": "./useFirestore.cjs.js" + "import": "./useFirestore.mjs", + "require": "./useFirestore.cjs" }, "./useRTDB": { - "import": "./useRTDB.esm.js", - "require": "./useRTDB.cjs.js" + "import": "./useRTDB.mjs", + "require": "./useRTDB.cjs" } }, - "main": "./index.cjs.js", + "main": "./index.cjs", "types": "./index.d.ts", - "module": "./index.esm.js", + "module": "./index.mjs", "unpkg": "./index.iife.min.js", "jsdelivr": "./index.iife.min.js", "sideEffects": false, diff --git a/packages/integrations/package.json b/packages/integrations/package.json index be40109bf28e..68c7c1643909 100644 --- a/packages/integrations/package.json +++ b/packages/integrations/package.json @@ -16,38 +16,38 @@ "author": "Anthony Fu", "exports": { ".": { - "import": "./index.esm.js", - "require": "./index.cjs.js" + "import": "./index.mjs", + "require": "./index.cjs" }, "./*": "./*", "./useAxios": { - "import": "./useAxios.esm.js", - "require": "./useAxios.cjs.js" + "import": "./useAxios.mjs", + "require": "./useAxios.cjs" }, "./useCookies": { - "import": "./useCookies.esm.js", - "require": "./useCookies.cjs.js" + "import": "./useCookies.mjs", + "require": "./useCookies.cjs" }, "./useFocusTrap": { - "import": "./useFocusTrap.esm.js", - "require": "./useFocusTrap.cjs.js" + "import": "./useFocusTrap.mjs", + "require": "./useFocusTrap.cjs" }, "./useJwt": { - "import": "./useJwt.esm.js", - "require": "./useJwt.cjs.js" + "import": "./useJwt.mjs", + "require": "./useJwt.cjs" }, "./useNProgress": { - "import": "./useNProgress.esm.js", - "require": "./useNProgress.cjs.js" + "import": "./useNProgress.mjs", + "require": "./useNProgress.cjs" }, "./useQRCode": { - "import": "./useQRCode.esm.js", - "require": "./useQRCode.cjs.js" + "import": "./useQRCode.mjs", + "require": "./useQRCode.cjs" } }, - "main": "./index.cjs.js", + "main": "./index.cjs", "types": "./index.d.ts", - "module": "./index.esm.js", + "module": "./index.mjs", "unpkg": "./index.iife.min.js", "jsdelivr": "./index.iife.min.js", "sideEffects": false, diff --git a/packages/router/package.json b/packages/router/package.json index 6abdc6137e30..b625182d0aab 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -17,14 +17,14 @@ "author": "Anthony Fu", "exports": { ".": { - "import": "./index.esm.js", - "require": "./index.cjs.js" + "import": "./index.mjs", + "require": "./index.cjs" }, "./*": "./*" }, - "main": "./index.cjs.js", + "main": "./index.cjs", "types": "./index.d.ts", - "module": "./index.esm.js", + "module": "./index.mjs", "unpkg": "./index.iife.min.js", "jsdelivr": "./index.iife.min.js", "sideEffects": false, diff --git a/packages/rxjs/package.json b/packages/rxjs/package.json index 56736edd577c..0cab282e01ca 100644 --- a/packages/rxjs/package.json +++ b/packages/rxjs/package.json @@ -18,14 +18,14 @@ "author": "Anthony Fu", "exports": { ".": { - "import": "./index.esm.js", - "require": "./index.cjs.js" + "import": "./index.mjs", + "require": "./index.cjs" }, "./*": "./*" }, - "main": "./index.cjs.js", + "main": "./index.cjs", "types": "./index.d.ts", - "module": "./index.esm.js", + "module": "./index.mjs", "unpkg": "./index.iife.min.js", "jsdelivr": "./index.iife.min.js", "sideEffects": false, diff --git a/packages/shared/package.json b/packages/shared/package.json index 81c925472ea4..a924f221dba0 100644 --- a/packages/shared/package.json +++ b/packages/shared/package.json @@ -15,14 +15,14 @@ "author": "Anthony Fu", "exports": { ".": { - "import": "./index.esm.js", - "require": "./index.cjs.js" + "import": "./index.mjs", + "require": "./index.cjs" }, "./*": "./*" }, - "main": "./index.cjs.js", + "main": "./index.cjs", "types": "./index.d.ts", - "module": "./index.esm.js", + "module": "./index.mjs", "unpkg": "./index.iife.min.js", "jsdelivr": "./index.iife.min.js", "sideEffects": false, diff --git a/scripts/rollup.config.ts b/scripts/rollup.config.ts index ac6561c9815b..0ab5448a406d 100644 --- a/scripts/rollup.config.ts +++ b/scripts/rollup.config.ts @@ -36,11 +36,11 @@ for (const { globals, name, external, submodules, iife } of activePackages) { const output: OutputOptions[] = [ { - file: `packages/${name}/dist/${fn}.cjs.js`, + file: `packages/${name}/dist/${fn}.cjs`, format: 'cjs', }, { - file: `packages/${name}/dist/${fn}.esm.js`, + file: `packages/${name}/dist/${fn}.mjs`, format: 'es', }, ] diff --git a/scripts/utils.ts b/scripts/utils.ts index 55f694eac09f..9482d4455807 100644 --- a/scripts/utils.ts +++ b/scripts/utils.ts @@ -348,17 +348,17 @@ export async function updatePackageJSON(indexes: PackageIndexes) { packageJSON.homepage = name === 'core' ? 'https://github.com/vueuse/vueuse#readme' : `https://github.com/vueuse/vueuse/tree/main/packages/${name}#readme` - packageJSON.main = './index.cjs.js' + packageJSON.main = './index.cjs' packageJSON.types = './index.d.ts' - packageJSON.module = './index.esm.js' + packageJSON.module = './index.mjs' if (iife !== false) { packageJSON.unpkg = './index.iife.min.js' packageJSON.jsdelivr = './index.iife.min.js' } packageJSON.exports = { '.': { - import: './index.esm.js', - require: './index.cjs.js', + import: './index.mjs', + require: './index.cjs', }, './*': './*', } @@ -368,8 +368,8 @@ export async function updatePackageJSON(indexes: PackageIndexes) { .filter(i => i.package === name) .forEach((i) => { packageJSON.exports[`./${i.name}`] = { - import: `./${i.name}.esm.js`, - require: `./${i.name}.cjs.js`, + import: `./${i.name}.mjs`, + require: `./${i.name}.cjs`, } }) }