From e5245fca4a1085e55d38d3fe6f5155d973b8b72e Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 00:37:49 -0300 Subject: [PATCH 01/12] fix(dependancies): add peerDependancies --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index bd885e802f9..1fd8f452e44 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,9 @@ "popper.js": "^1.15.0", "vue-functional-data-merge": "^2.0.7" }, + "peerDependencies": { + "vue": "^2.5.1" + }, "devDependencies": { "@babel/cli": "^7.4.3", "@babel/core": "^7.4.3", From e203ad34d19cd596eaa35cfb8c185745f2a03bc0 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 00:42:12 -0300 Subject: [PATCH 02/12] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1fd8f452e44..acc69994355 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "vue-functional-data-merge": "^2.0.7" }, "peerDependencies": { - "vue": "^2.5.1" + "vue": "^2.5.16" }, "devDependencies": { "@babel/cli": "^7.4.3", From ef23be2cc03c1d1ecdd0304ab661f5703e054196 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 01:01:03 -0300 Subject: [PATCH 03/12] Update rollup.config.js --- scripts/rollup.config.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js index 18d6ae82999..9bfeff711cd 100644 --- a/scripts/rollup.config.js +++ b/scripts/rollup.config.js @@ -4,13 +4,13 @@ import babel from 'rollup-plugin-babel' import resolve from 'rollup-plugin-node-resolve' import commonjs from 'rollup-plugin-commonjs' import { camelCase } from 'lodash' -import { name, dependencies } from '../package.json' +import { name, dependencies, peerDependencies } from '../package.json' const base = path.resolve(__dirname, '..') const src = path.resolve(base, 'src') const dist = path.resolve(base, 'dist') -const externals = ['vue', ...Object.keys(dependencies)] +const externals = [...Object.keys(peerDependencies), ...Object.keys(dependencies)] // Libs in `external` will not be bundled to dist, // since they are expected to be provided later. @@ -21,7 +21,11 @@ const externalExcludes = ['popper.js', 'vue-functional-data-merge'] const baseConfig = { input: path.resolve(src, 'index.js'), external: Object.keys(dependencies), - plugins: [resolve({ external: ['vue'] }), commonjs(), babel({ exclude: 'node_modules/**' })] + plugins: [ + resolve({ external: ['vue'], dedupe: ['vue'] }), + commonjs(), + babel({ exclude: 'node_modules/**' }) + ] } // Ensure dist directory exists @@ -60,7 +64,6 @@ export default [ // ES { ...baseConfig, - external: ['vue'], output: { format: 'es', file: path.resolve(dist, `${name}.esm.js`), From e869d137f8847054fc0e1449f531cab89243c400 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 01:50:28 -0300 Subject: [PATCH 04/12] Update rollup.config.js --- scripts/rollup.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js index 9bfeff711cd..68b9b06e6a7 100644 --- a/scripts/rollup.config.js +++ b/scripts/rollup.config.js @@ -20,9 +20,9 @@ const externalExcludes = ['popper.js', 'vue-functional-data-merge'] // The base rollup configuration const baseConfig = { input: path.resolve(src, 'index.js'), - external: Object.keys(dependencies), + external: externals, plugins: [ - resolve({ external: ['vue'], dedupe: ['vue'] }), + resolve({ external: ['vue'] }), commonjs(), babel({ exclude: 'node_modules/**' }) ] From 900b970dbca426903eaf2ef0f5703837cff1d236 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 02:04:15 -0300 Subject: [PATCH 05/12] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index acc69994355..a713cd0b3bb 100644 --- a/package.json +++ b/package.json @@ -77,7 +77,7 @@ "vue-functional-data-merge": "^2.0.7" }, "peerDependencies": { - "vue": "^2.5.16" + "vue": ">=2.5.1 < 3.0.0" }, "devDependencies": { "@babel/cli": "^7.4.3", From 8cb130b95ff3771f2e720d9803c4d13a33b80a78 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 02:07:15 -0300 Subject: [PATCH 06/12] Update rollup.config.js --- scripts/rollup.config.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js index 68b9b06e6a7..3cc738ae8d3 100644 --- a/scripts/rollup.config.js +++ b/scripts/rollup.config.js @@ -21,11 +21,7 @@ const externalExcludes = ['popper.js', 'vue-functional-data-merge'] const baseConfig = { input: path.resolve(src, 'index.js'), external: externals, - plugins: [ - resolve({ external: ['vue'] }), - commonjs(), - babel({ exclude: 'node_modules/**' }) - ] + plugins: [resolve({ external: ['vue'] }), commonjs(), babel({ exclude: 'node_modules/**' })] } // Ensure dist directory exists From 2f230dc222fbbc86542ea16fe987863cb690a247 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 02:45:03 -0300 Subject: [PATCH 07/12] Update build.sh --- scripts/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build.sh b/scripts/build.sh index 1f37445d86c..fe5b4e53775 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -15,7 +15,7 @@ echo 'Done.' echo '' echo 'Build ES modules...' -NODE_ENV=es babel src --out-dir es --ignore 'src/**/*/fixtures,src/**/*.spec.js' +NODE_ENV=es babel src --out-dir es --ignore 'src/**/*.spec.js' echo 'Done.' echo '' From ff829ae84a5cb55c476527a41d52aa978137bc77 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 13:51:39 -0300 Subject: [PATCH 08/12] Update rollup.config.js --- scripts/rollup.config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js index 3cc738ae8d3..726d751ee46 100644 --- a/scripts/rollup.config.js +++ b/scripts/rollup.config.js @@ -10,11 +10,12 @@ const base = path.resolve(__dirname, '..') const src = path.resolve(base, 'src') const dist = path.resolve(base, 'dist') -const externals = [...Object.keys(peerDependencies), ...Object.keys(dependencies)] +const externals = [...Object.keys(peerDependencies || {}), ...Object.keys(dependencies || {})] // Libs in `external` will not be bundled to dist, // since they are expected to be provided later. -// We want to include some of them in the build, so we exclude it here. +// In some cases, wee want to include some of them in the build, so we +// exclude the external here. const externalExcludes = ['popper.js', 'vue-functional-data-merge'] // The base rollup configuration From 0c51c9f0bfcd734ba4a2834febefb019d6bf1aca Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 14:04:53 -0300 Subject: [PATCH 09/12] Delete rollup.config.esm.js rollup.config.esm.js is no longer used (hasn't been for quite a while) --- scripts/rollup.config.esm.js | 34 ---------------------------------- 1 file changed, 34 deletions(-) delete mode 100644 scripts/rollup.config.esm.js diff --git a/scripts/rollup.config.esm.js b/scripts/rollup.config.esm.js deleted file mode 100644 index 8d398854917..00000000000 --- a/scripts/rollup.config.esm.js +++ /dev/null @@ -1,34 +0,0 @@ -import fs from 'fs' -import path from 'path' -import babel from 'rollup-plugin-babel' -import resolve from 'rollup-plugin-node-resolve' -import commonjs from 'rollup-plugin-commonjs' -import css from 'rollup-plugin-css-porter' -import { name, dependencies } from '../package.json' - -const base = path.resolve(__dirname, '..') -const src = path.resolve(base, 'src') -const dist = path.resolve(base, 'dist') - -// Ensure dist directory exists -if (!fs.existsSync(dist)) { - fs.mkdirSync(dist) -} - -export default { - input: path.resolve(src, 'index.js'), - external: Object.keys(dependencies), - plugins: [ - css({ dest: path.resolve(dist, `${name}.css`) }), - resolve({ external: ['vue'] }), - commonjs(), - babel() - ], - output: [ - { - format: 'es', - file: path.resolve(dist, `${name}.esm.js`), - sourcemap: true - } - ] -} From 220e5fb6c7708c42f784ae6359d30929545f2fe1 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 14:08:11 -0300 Subject: [PATCH 10/12] Update rollup.config.js --- scripts/rollup.config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js index 726d751ee46..31cab36b3de 100644 --- a/scripts/rollup.config.js +++ b/scripts/rollup.config.js @@ -4,13 +4,13 @@ import babel from 'rollup-plugin-babel' import resolve from 'rollup-plugin-node-resolve' import commonjs from 'rollup-plugin-commonjs' import { camelCase } from 'lodash' -import { name, dependencies, peerDependencies } from '../package.json' +import { name, dependencies } from '../package.json' const base = path.resolve(__dirname, '..') const src = path.resolve(base, 'src') const dist = path.resolve(base, 'dist') -const externals = [...Object.keys(peerDependencies || {}), ...Object.keys(dependencies || {})] +const externals = ['vue', ...Object.keys(dependencies)] // Libs in `external` will not be bundled to dist, // since they are expected to be provided later. From 64cd2819579a38ed586dac4595d4c82e11315a81 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 14:08:39 -0300 Subject: [PATCH 11/12] Update package.json --- package.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/package.json b/package.json index 7b10c8be4f1..ed5eea2cd2c 100644 --- a/package.json +++ b/package.json @@ -76,9 +76,6 @@ "popper.js": "^1.15.0", "vue-functional-data-merge": "^2.0.7" }, - "peerDependencies": { - "vue": ">=2.5.1 < 3.0.0" - }, "devDependencies": { "@babel/cli": "^7.4.3", "@babel/core": "^7.4.3", From 6348719871a755810d229b4b9c062814294def18 Mon Sep 17 00:00:00 2001 From: Troy Morehouse Date: Mon, 8 Apr 2019 14:11:08 -0300 Subject: [PATCH 12/12] Update rollup.config.js --- scripts/rollup.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/rollup.config.js b/scripts/rollup.config.js index 31cab36b3de..2b79ab515e5 100644 --- a/scripts/rollup.config.js +++ b/scripts/rollup.config.js @@ -58,7 +58,7 @@ export default [ } }, - // ES + // ESM { ...baseConfig, output: {