All build and tests working

pull/15581/head
jesusbotella 4 years ago
parent 8a63c54963
commit 590204347d

@ -1,10 +1,10 @@
{ {
"presets": [ "presets": [
["@babel/env", [
"@babel/env",
{ {
"useBuiltIns": "usage", "useBuiltIns": "usage",
"corejs": 3, "corejs": 3
"debug": true
} }
] ]
], ],
@ -15,13 +15,22 @@
[ [
"@babel/plugin-transform-runtime", "@babel/plugin-transform-runtime",
{ {
"absoluteRuntime": false, "corejs": 3
"corejs": 3,
"helpers": true,
"regenerator": true,
"useESModules": true
} }
] ]
], ],
"sourceType": "unambiguous" "sourceType": "unambiguous",
"env": {
"test": {
"presets": [
["@babel/env"]
],
"plugins": [
"@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-transform-classes",
"@babel/plugin-transform-object-assign",
"@babel/plugin-transform-modules-commonjs"
]
}
}
} }

@ -1,14 +0,0 @@
{
"plugins": [
[
"@babel/plugin-transform-runtime",
{
"absoluteRuntime": false,
"corejs": 3,
"helpers": true,
"regenerator": true,
"useESModules": true
}
]
]
}

@ -1,16 +0,0 @@
{
"presets": [
[
"@babel/env",
{
"useBuiltIns": "usage",
"corejs": 3,
"debug": true,
"modules": "commonjs"
}
]
],
"plugins": [
"@babel/plugin-transform-modules-commonjs"
]
}

@ -3,8 +3,10 @@ const path = require('path');
const srcPath = 'lib/assets/javascripts/'; const srcPath = 'lib/assets/javascripts/';
const testPath = 'lib/assets/test/spec/new-dashboard'; const testPath = 'lib/assets/test/spec/new-dashboard';
const rootDir = path.resolve(__dirname, '../../../../../../');
module.exports = { module.exports = {
rootDir: path.resolve(__dirname, '../../../../../../'), rootDir,
roots: [ roots: [
`<rootDir>/${testPath}/unit/specs` `<rootDir>/${testPath}/unit/specs`
], ],
@ -48,5 +50,12 @@ module.exports = {
coverageDirectory: `<rootDir>/${testPath}/coverage`, coverageDirectory: `<rootDir>/${testPath}/coverage`,
collectCoverageFrom: [ collectCoverageFrom: [
`${srcPath}/new-dashboard/**/*.{js,vue}` `${srcPath}/new-dashboard/**/*.{js,vue}`
] ],
globals: {
'vue-jest': {
babelConfig: {
configFile: path.join(rootDir, 'babel.config.json')
}
}
}
}; };

@ -52,7 +52,7 @@ module.exports = {
options: { options: {
babelrc: false, babelrc: false,
configFile: false, configFile: false,
presets: [['@babel/env', { debug: true }]], presets: ['@babel/env'],
plugins: ['@babel/plugin-transform-object-assign'] plugins: ['@babel/plugin-transform-object-assign']
} }
}, },

22
package-lock.json generated

@ -1560,6 +1560,17 @@
"d3": "3.5.17", "d3": "3.5.17",
"turbo-carto": "^0.21.1", "turbo-carto": "^0.21.1",
"turf-jenks": "~1.0.1" "turf-jenks": "~1.0.1"
},
"dependencies": {
"carto": {
"version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
"from": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
"requires": {
"mapnik-reference": "~6.0.2",
"optimist": "~0.6.0",
"underscore": "1.8.3"
}
}
} }
} }
} }
@ -11667,6 +11678,17 @@
"d3": "3.5.17", "d3": "3.5.17",
"turbo-carto": "^0.21.1", "turbo-carto": "^0.21.1",
"turf-jenks": "~1.0.1" "turf-jenks": "~1.0.1"
},
"dependencies": {
"carto": {
"version": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
"from": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
"requires": {
"mapnik-reference": "~6.0.2",
"optimist": "~0.6.0",
"underscore": "1.8.3"
}
}
} }
} }
} }

Loading…
Cancel
Save