Let's move to node 6.9.2 and npm 3.10.9, thanks to shrinkwrap evangelizer @rochoa

pull/11941/head
xavijam 8 years ago
parent 94d76804bc
commit 6efd48ccc9

@ -123,8 +123,6 @@ After building the whole suite for the first time, a webpage will show up with a
Then, the process will watch changes in the codebase and will regenerate the specs as needed. Just refresh the Jasmine page to pass again the tests.
:warning: Node v6+ is required to run `grunt affected_specs`
If you prefer to generate all specs anyway, you can pass a flag to the grunt task:
```bash
@ -137,15 +135,13 @@ This will generate the whole Builder suite, not only the specs affected by the c
If you want to run simultaneously the application and the specs generation follow these steps:
1. Open a terminal with Node v0.10.48 (use nvm) and run `grunt && grunt dev`. This will build the application assets and will watch for changes.
2. Open a second terminal and use nvm to set the Node version to 6+.
1. Open a terminal with Node v6.9.2 (use nvm) and run `grunt && grunt dev`. This will build the application assets and will watch for changes.
3. In this second terminal run `grunt affected_specs`.
2. Open a second terminal and run `grunt affected_specs`.
4. You will see in the first terminal that a lot of changes build the bundle again. That's normal. The first step of the point 3 is to copy all needed files, so the `watch` of `grunt dev` triggers. Don't worry about it.
3. You will see in the first terminal that a lot of changes build the bundle again. That's normal. The first step of the point 3 is to copy all needed files, so the `watch` of `grunt dev` triggers. Don't worry about it.
5. That's it. When you change any Builder Javascript file `grunt dev` will build the application bundle and `grunt affected_specs` will build the specs.
4. That's it. When you change any Builder Javascript file `grunt dev` will build the application bundle and `grunt affected_specs` will build the specs.
#### Running a particular spec
@ -155,7 +151,7 @@ If you only want to run a subset of tests the easiest and fastest way is to use
We use [Grunt](http://gruntjs.com/) to automate build tasks related to both CSS and JS.
We use v0.10.x of [node](http://nodejs.org/) (we recommend to use [NVM](https://github.com/creationix/nvm)).
We use v6.9.2 of [node](http://nodejs.org/) (we recommend to use [NVM](https://github.com/creationix/nvm)).
Install dependencies using a normal npm install as such:
```bash

@ -6,10 +6,8 @@ var jasmineCfg = require('./lib/build/tasks/jasmine.js');
var duplicatedDependencies = require('./lib/build/tasks/shrinkwrap-duplicated-dependencies.js');
var webpackTask = null;
var NODE_VERSION = '0.10.26 - 0.12';
var NPM_VERSION = '2.14 - 2.15';
var WEBPACK_NODE_VERSION = '6 - 7';
var WEBPACK_NPM_VERSION = '2.14 - 3';
var REQUIRED_NODE_VERSION = '6.9.2';
var REQUIRED_NPM_VERSION = '3.10.9';
var DEVELOPMENT = 'development';
@ -88,12 +86,7 @@ module.exports = function(grunt) {
checkVersion('npm -v', requiredNpmVersion, 'npm', logFn);
}
if (grunt.cli.tasks.indexOf('affected_specs') > - 1) {
// Webpack needs a higher version of Node than the rest of the tasks.
preFlight(WEBPACK_NODE_VERSION, WEBPACK_NPM_VERSION, logVersionsError);
} else {
preFlight(NODE_VERSION, NPM_VERSION, logVersionsError);
}
preFlight(REQUIRED_NODE_VERSION, REQUIRED_NPM_VERSION, logVersionsError);
grunt.log.writeln('');
var duplicatedModules = duplicatedDependencies(require('./npm-shrinkwrap.json'), SHRINKWRAP_MODULES_TO_VALIDATE);

@ -4,6 +4,7 @@ Development
* An attacker could execute commands in the server running the queues by importing a file with a carefully crafted filename. Fixed in #11782
### Features
* Using Node v6.9.2 and npm v3.10.9 (#11935).
* Color picker for codemirror component.
* New dropdown for Data Observatory (#11618)
* Quota pre-check to analyses that consume quota.

4167
npm-shrinkwrap.json generated

File diff suppressed because it is too large Load Diff

@ -19,6 +19,7 @@
"backbone-model-file-upload": "CartoDB/backbone-model-file-upload#1.0.0",
"backbone-undo": "cartodb/Backbone.Undo.js#c10e997",
"bootstrap-colorpicker": "2.4.0",
"browserify": "13.0.0",
"browserify-shim": "3.8.12",
"camshaft-reference": "<2.0",
"carto": "cartodb/carto#master",
@ -42,7 +43,6 @@
"aws-sdk": "2.0.0-rc11",
"bluebird": "3.5.0",
"brfs": "^1.4.3",
"browserify": "13.0.0",
"browserify-resolutions": "1.1.0",
"cartoassets": "cartodb/CartoAssets#master",
"colors": "1.1.2",
@ -171,7 +171,7 @@
"scripts": {
"test": "echo \"Run 'grunt test' to run specs through command line.\"",
"preupdate-internal-deps": "echo 'DEPRECATED TASK, use `npm run-script update-internal-deps` instead'",
"update-internal-deps": "rm -rf node_modules && npm install --no-shrinkwrap && npm shrinkwrap",
"update-internal-deps": "rm -rf node_modules && npm install --production --no-shrinkwrap && npm dedupe && npm prune && npm shrinkwrap && npm install",
"branch-files": "node lib/build/branchFiles/branchFiles.js",
"affected_specs": "node lib/build/branchFiles/branchFiles.js | xargs node lib/build/affectedFiles/affectedFiles.js"
}

Loading…
Cancel
Save