Browse Source

update devDependencies, so things work with current node versions

master
Norwin Roosen 1 year ago
parent
commit
4a22d8986e
No account linked to committer's email address
8 changed files with 8220 additions and 59 deletions
  1. 15
    15
      .eslintrc
  2. 1
    1
      .nvmrc
  3. 9
    9
      README.md
  4. 5
    5
      app/assets/styles/_base.scss
  5. 1
    1
      app/assets/styles/main.scss
  6. 4
    4
      gulpfile.js
  7. 26
    24
      package.json
  8. 8159
    0
      yarn.lock

+ 15
- 15
.eslintrc View File

@@ -10,20 +10,20 @@
10 10
   "ecmaFeatures": {
11 11
     "jsx": true
12 12
   },
13
-  rules: {
14
-    'react/display-name': 1 ,
15
-    'react/jsx-no-duplicate-props': 2,
16
-    'react/jsx-no-undef': 2,
17
-    'react/jsx-uses-react': 2,
18
-    'react/jsx-uses-vars': 2,
19
-    'react/no-danger': 0,
20
-    'react/no-deprecated': 2,
21
-    'react/no-did-mount-set-state': [2, 'allow-in-func'],
22
-    'react/no-did-update-set-state': [2, 'allow-in-func'],
23
-    'react/no-direct-mutation-state': 2,
24
-    'react/no-is-mounted': 2,
25
-    'react/no-unknown-property': 2,
26
-    'react/prop-types': 2,
27
-    'react/react-in-jsx-scope': 2
13
+  "rules": {
14
+    "react/display-name": 1 ,
15
+    "react/jsx-no-duplicate-props": 2,
16
+    "react/jsx-no-undef": 2,
17
+    "react/jsx-uses-react": 2,
18
+    "react/jsx-uses-vars": 2,
19
+    "react/no-danger": 0,
20
+    "react/no-deprecated": 2,
21
+    "react/no-did-mount-set-state": [2],
22
+    "react/no-did-update-set-state": [2],
23
+    "react/no-direct-mutation-state": 2,
24
+    "react/no-is-mounted": 2,
25
+    "react/no-unknown-property": 2,
26
+    "react/prop-types": 2,
27
+    "react/react-in-jsx-scope": 2
28 28
   }
29 29
 }

+ 1
- 1
.nvmrc View File

@@ -1 +1 @@
1
-v4.2.2
1
+v8.9.0

+ 9
- 9
README.md View File

@@ -7,30 +7,30 @@ Simple dashboard that taps into the [opensensemap](http://opensensemap.org/) api
7 7
 ## Development environment
8 8
 To set up the development environment for this website, you'll need to install the following on your system:
9 9
 
10
-- Node (v4.2.x) & Npm ([nvm](https://github.com/creationix/nvm) usage is advised)
10
+- Node (v8.9.x) & yarn ([nvm](https://github.com/creationix/nvm) usage is advised)
11 11
 
12 12
 > The versions mentioned are the ones used during development. It could work with newer ones.
13 13
   Run `nvm use` to activate the correct version.
14 14
 
15 15
 After these basic requirements are met, run the following commands in the website's folder:
16
-```
17
-$ npm install
16
+```sh
17
+$ yarn install
18 18
 ```
19 19
 
20 20
 ### Getting started
21 21
 
22
-```
23
-$ npm run serve
22
+```sh
23
+$ yarn serve
24 24
 ```
25 25
 Compiles the sass files, javascript, and launches the server making the site available at `http://localhost:1337/`
26 26
 The system will watch files and execute tasks whenever one of them changes.
27
-The site will automatically refresh since it is bundled with livereload.  
28
-  
29
-The current code will show the values for the [DS Lisbon sensebox](http://opensensemap.org/#/explore/570629b945fd40c8197462fb).  
27
+The site will automatically refresh since it is bundled with livereload.
28
+
29
+The current code will show the values for the [Begga sensebox](http://opensensemap.org/#/explore/5b26181b1fef04001b69093c).
30 30
 This can be changed by setting the correct ids in `config/production.js`
31 31
 
32 32
 ### Other commands
33 33
 Compile the files to the `dist` folder ready for production.
34 34
 ```
35 35
 $ npm run build
36
-```
36
+```

+ 5
- 5
app/assets/styles/_base.scss View File

@@ -114,9 +114,9 @@ a:active {
114 114
 }
115 115
 
116 116
 .site-headline {
117
-  @include col(12/12);
117
+  @include column(12/12);
118 118
   @include media(medium-up) {
119
-    @include col(6/12);
119
+    @include column(6/12);
120 120
   }
121 121
 }
122 122
 
@@ -171,10 +171,10 @@ a:active {
171 171
   margin-bottom: 2rem;
172 172
 
173 173
   @include media(large-up) {
174
-    @include col(6/12, $cycle: 2);
174
+    @include column(6/12, $cycle: 2);
175 175
   }
176 176
   @include media(xlarge-up) {
177
-    @include col(4/12, $cycle: 3, $uncycle: 2);
177
+    @include column(4/12, $cycle: 3);
178 178
   }
179 179
 
180 180
   &__header {
@@ -237,7 +237,7 @@ a:active {
237 237
     &__list  {
238 238
       @extend .clearfix;
239 239
       li {
240
-        @include col(6/12);
240
+        @include column(6/12);
241 241
         text-align: center;
242 242
 
243 243
         &:not(:last-child) {

+ 1
- 1
app/assets/styles/main.scss View File

@@ -27,7 +27,7 @@
27 27
  * http://jeet.gs/
28 28
  */
29 29
 
30
-@import "jeet/index";
30
+@import "jeet/scss/index";
31 31
 
32 32
 
33 33
 /* Reboot

+ 4
- 4
gulpfile.js View File

@@ -11,7 +11,7 @@ var browserify = require('browserify');
11 11
 var source = require('vinyl-source-stream');
12 12
 var buffer = require('vinyl-buffer');
13 13
 var sourcemaps = require('gulp-sourcemaps');
14
-var gutil = require('gulp-util');
14
+var log = require('fancy-log');
15 15
 var exit = require('gulp-exit');
16 16
 var rev = require('gulp-rev');
17 17
 var revReplace = require('gulp-rev-replace');
@@ -133,7 +133,7 @@ gulp.task('javascript', function () {
133 133
   }
134 134
 
135 135
   watcher
136
-  .on('log', gutil.log)
136
+  .on('log', log)
137 137
   .on('update', bundler);
138 138
 
139 139
   return bundler();
@@ -149,7 +149,7 @@ gulp.task('vendorScripts', function () {
149 149
     require: pkg.dependencies ? Object.keys(pkg.dependencies) : []
150 150
   });
151 151
   return vb.bundle()
152
-    .on('error', gutil.log.bind(gutil, 'Browserify Error'))
152
+    .on('error', err => log('Browserify Error', err))
153 153
     .pipe(source('vendor.js'))
154 154
     .pipe(buffer())
155 155
     .pipe(sourcemaps.init({loadMaps: true}))
@@ -202,7 +202,7 @@ gulp.task('styles', function () {
202 202
     .pipe($.sass({
203 203
       outputStyle: 'expanded',
204 204
       precision: 10,
205
-      includePaths: ['.'].concat(require('node-bourbon').includePaths).concat(['node_modules/jeet/scss'])
205
+      includePaths: ['.'].concat(require('node-bourbon').includePaths).concat(['node_modules'])
206 206
     }))
207 207
     .pipe($.sourcemaps.write())
208 208
     .pipe(gulp.dest('.tmp/assets/styles'))

+ 26
- 24
package.json View File

@@ -38,48 +38,50 @@
38 38
     ]
39 39
   },
40 40
   "devDependencies": {
41
-    "babel": "^6.5.2",
41
+    "babel-cli": "^6.26.0",
42 42
     "babel-preset-es2015": "^6.5.0",
43 43
     "babel-preset-react": "^6.5.0",
44
-    "babelify": "^7.2.0",
44
+    "babelify": "^8.0.0",
45 45
     "browser-sync": "^2.11.1",
46
-    "browserify": "^13.0.0",
47
-    "collecticons-processor": "^2.0.0",
48
-    "del": "^2.2.0",
49
-    "envify": "^3.4.0",
50
-    "eslint": "^1.0.0",
51
-    "eslint-config-semistandard": "^5.0.0",
52
-    "eslint-config-standard": "^4.0.0",
53
-    "eslint-plugin-promise": "^1.0.8",
54
-    "eslint-plugin-react": "^3.16.1",
55
-    "eslint-plugin-standard": "^1.3.2",
46
+    "browserify": "^16.2.2",
47
+    "collecticons-processor": "^3.1.0",
48
+    "del": "^3.0.0",
49
+    "envify": "^4.1.0",
50
+    "eslint": "^4.19.1",
51
+    "eslint-config-semistandard": "^12.0.1",
52
+    "eslint-config-standard": "^11.0.0",
53
+    "eslint-plugin-import": "^2.12.0",
54
+    "eslint-plugin-node": "^6.0.1",
55
+    "eslint-plugin-promise": "^3.8.0",
56
+    "eslint-plugin-react": "^7.9.1",
57
+    "eslint-plugin-standard": "^3.1.0",
56 58
     "gulp": "^3.9.1",
57
-    "gulp-cache": "^0.4.2",
58
-    "gulp-csso": "^1.0.1",
59
+    "gulp-cache": "^1.0.2",
60
+    "gulp-csso": "^3.0.1",
59 61
     "gulp-exit": "0.0.2",
60 62
     "gulp-if": "^2.0.0",
61
-    "gulp-imagemin": "^2.4.0",
63
+    "gulp-imagemin": "^4.1.0",
62 64
     "gulp-load-plugins": "^1.2.0",
63 65
     "gulp-plumber": "^1.1.0",
64
-    "gulp-rev": "^7.0.0",
66
+    "gulp-rev": "^8.1.1",
65 67
     "gulp-rev-replace": "^0.4.3",
66
-    "gulp-sass": "^2.2.0",
67
-    "gulp-size": "^2.0.0",
68
-    "gulp-sourcemaps": "^1.6.0",
69
-    "gulp-uglify": "^1.5.2",
68
+    "gulp-sass": "^4.0.1",
69
+    "gulp-size": "^3.0.0",
70
+    "gulp-sourcemaps": "^2.6.4",
71
+    "gulp-uglify": "^3.0.0",
70 72
     "gulp-useref": "^3.0.5",
71
-    "gulp-util": "^3.0.7",
72
-    "jeet": "^6.1.2",
73
+    "jeet": "^7.2.0",
73 74
     "node-bourbon": "^4.2.3",
74
-    "node-notifier": "^4.5.0",
75
+    "node-notifier": "^5.2.1",
75 76
     "require-globify": "^1.3.0",
76 77
     "vinyl-buffer": "^1.0.0",
77
-    "vinyl-source-stream": "^1.1.0",
78
+    "vinyl-source-stream": "^2.0.0",
78 79
     "watchify": "^3.7.0"
79 80
   },
80 81
   "dependencies": {
81 82
     "babel-polyfill": "^6.3.14",
82 83
     "d3": "^3.5.16",
84
+    "fancy-log": "^1.3.2",
83 85
     "history": "^2.0.1",
84 86
     "isomorphic-fetch": "^2.2.1",
85 87
     "lodash": "^4.10.0",

+ 8159
- 0
yarn.lock
File diff suppressed because it is too large
View File


Loading…
Cancel
Save