Fix tests so they work and pass with Parcel.js, updated outdated, remove .babelrc
This commit is contained in:
parent
d61c61aab8
commit
c15145cc03
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -1,5 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "filer",
|
"name": "filer",
|
||||||
|
<<<<<<< HEAD
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"version": "0.0.44",
|
"version": "0.0.44",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
|
@ -136,6 +137,9 @@
|
||||||
},
|
},
|
||||||
=======
|
=======
|
||||||
"version": "0.0.29",
|
"version": "0.0.29",
|
||||||
|
=======
|
||||||
|
"version": "0.0.44",
|
||||||
|
>>>>>>> Fix tests so they work and pass with Parcel.js, updated outdated, remove .babelrc
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
@ -1910,11 +1914,18 @@
|
||||||
"ms": "0.7.1"
|
"ms": "0.7.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
<<<<<<< HEAD
|
||||||
"decamelize": {
|
"decamelize": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
|
||||||
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
|
"integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
|
||||||
"dev": true
|
"dev": true
|
||||||
|
=======
|
||||||
|
"balanced-match": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
|
||||||
|
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
|
||||||
|
>>>>>>> Fix tests so they work and pass with Parcel.js, updated outdated, remove .babelrc
|
||||||
},
|
},
|
||||||
"decompress-zip": {
|
"decompress-zip": {
|
||||||
"version": "0.0.8",
|
"version": "0.0.8",
|
||||||
|
@ -1982,11 +1993,18 @@
|
||||||
"integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=",
|
"integrity": "sha1-gK7GTJ1tl+ZcwqnKqTwKpqv3Oqo=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
<<<<<<< HEAD
|
||||||
"deps-sort": {
|
"deps-sort": {
|
||||||
"version": "1.3.9",
|
"version": "1.3.9",
|
||||||
"resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
|
"resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz",
|
||||||
"integrity": "sha1-Kd//U+F7Nq7K51MK27v2IsLtGnE=",
|
"integrity": "sha1-Kd//U+F7Nq7K51MK27v2IsLtGnE=",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
=======
|
||||||
|
"brace-expansion": {
|
||||||
|
"version": "1.1.11",
|
||||||
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
||||||
|
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
|
||||||
|
>>>>>>> Fix tests so they work and pass with Parcel.js, updated outdated, remove .babelrc
|
||||||
"requires": {
|
"requires": {
|
||||||
"JSONStream": "^1.0.3",
|
"JSONStream": "^1.0.3",
|
||||||
"shasum": "^1.0.0",
|
"shasum": "^1.0.0",
|
||||||
|
@ -2284,10 +2302,40 @@
|
||||||
"babel-template": "6.26.0"
|
"babel-template": "6.26.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
<<<<<<< HEAD
|
||||||
"babel-plugin-transform-es2015-destructuring": {
|
"babel-plugin-transform-es2015-destructuring": {
|
||||||
"version": "6.23.0",
|
"version": "6.23.0",
|
||||||
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
|
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
|
||||||
"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
|
"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
|
||||||
|
=======
|
||||||
|
"command-exists": {
|
||||||
|
"version": "1.2.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.7.tgz",
|
||||||
|
"integrity": "sha512-doWDvhXCcW5LK0cIUWrOQ8oMFXJv3lEQCkJpGVjM8v9SV0uhqYXB943538tEA2CiaWqSyuYUGAm5ezDwEx9xlw==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
|
"commander": {
|
||||||
|
"version": "2.15.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
|
||||||
|
"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
|
"component-emitter": {
|
||||||
|
"version": "1.2.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
|
||||||
|
"integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
|
||||||
|
"dev": true
|
||||||
|
},
|
||||||
|
"concat-map": {
|
||||||
|
"version": "0.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
|
||||||
|
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
|
||||||
|
},
|
||||||
|
"config-chain": {
|
||||||
|
"version": "1.1.11",
|
||||||
|
"resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
|
||||||
|
"integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
|
||||||
|
>>>>>>> Fix tests so they work and pass with Parcel.js, updated outdated, remove .babelrc
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"babel-runtime": "6.26.0"
|
"babel-runtime": "6.26.0"
|
||||||
|
@ -8895,7 +8943,6 @@
|
||||||
"version": "3.0.4",
|
"version": "3.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
|
||||||
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
|
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
|
||||||
"dev": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"brace-expansion": "1.1.11"
|
"brace-expansion": "1.1.11"
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"base64-arraybuffer": "^0.1.5",
|
"base64-arraybuffer": "^0.1.5",
|
||||||
"minimatch": "^1.0.0"
|
"minimatch": "^3.0.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"chai": "^4.1.2",
|
"chai": "^4.1.2",
|
||||||
|
@ -36,6 +36,5 @@
|
||||||
"mocha": "^5.2.0",
|
"mocha": "^5.2.0",
|
||||||
"parcel-bundler": "^1.9.3"
|
"parcel-bundler": "^1.9.3"
|
||||||
},
|
},
|
||||||
"main": "./src/index.js",
|
"main": "./src/index.js"
|
||||||
"browser": "./dist/filer.min.js"
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue