Merge pull request #91 from edx/ari/version-updates

update & lock dependencies
openedx · Apr 10, 2017 · cda7161 · cda7161
2 parents eaa5e46 + 8a37a4a
commit cda7161
Show file tree

Hide file tree

Showing 7 changed files with 7,023 additions and 43 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: node_js
 sudo: false
 
 node_js:
-    - 4
+    - 6
 
 before_install:
     - export CHROME_BIN=chromium-browser
@@ -12,7 +12,7 @@ before_install:
 
 install:
     - rvm install 2.2.2
-    - npm install
+    - yarn --frozen-lockfile
     - bundle install
 
 script: gulp default --ci

diff --git a/README.md b/README.md
@@ -44,10 +44,12 @@ for important additional information.
 
 ## Getting Started
 
+The UI Toolkit uses [yarn](https://yarnpkg.com) to manage its dependencies. To work with the repo locally, you will need to have yarn installed. Check [the official documentation](https://yarnpkg.com/en/docs/install) for instructions on installing on your system.
+
 1. Get the code (e.g. clone the repository).
 2. Install the Node requirements:
 
-        $ npm install
+        $ yarn
 
 ## Linting
 

diff --git a/gulp/tasks/doc.js b/gulp/tasks/doc.js
@@ -15,7 +15,8 @@ var gulp = require('gulp'),
     config = require('../config').documentation,
     generateDoc = require('../utils/generate-doc'),
     rename = require('gulp-rename'),
-    webpack = require('webpack-stream'),
+    webpack = require('webpack'),
+    webpackStream = require('webpack-stream'),
     ghPages = require('gulp-gh-pages'),
     webpackConfig = require('../../webpack.config.js'),
     renameAsMarkdown,
@@ -93,7 +94,7 @@ gulp.task('copy-pattern-library', function() {
 
 gulp.task('webpack', function() {
     return gulp.src('')
-        .pipe(webpack(webpackConfig))
+        .pipe(webpackStream(webpackConfig, webpack))
         .pipe(gulp.dest(webpackConfig.output.path))
         .pipe(browserSync.stream());
 });

diff --git a/gulp/tasks/preview.js b/gulp/tasks/preview.js
@@ -16,7 +16,8 @@
 var gulp = require('gulp'),
     runSequence = require('run-sequence'),
     childProcess = require('child_process'),
-    webpack = require('webpack-stream'),
+    webpack = require('webpack'),
+    webpackStream = require('webpack-stream'),
     gitUtils = require('../utils/git-utils'),
     config = require('../config').documentation,
     webpackConfig = require('../../webpack.config.js'),
@@ -58,7 +59,7 @@ gulp.task('preview-webpack', function() {
         branch = gitUtils.currentBranch();
     process.env.SITE_ROOT = '/' + branch + '/';
     return gulp.src('')
-        .pipe(webpack(webpackConfig))
+        .pipe(webpackStream(webpackConfig, webpack))
         .pipe(gulp.dest(outputPath));
 });
 

diff --git a/package.json b/package.json
@@ -23,10 +23,10 @@
     "gulp-shell": "^0.5.2",
     "jquery": "~2.2.0",
     "moment": "^2.15.1",
-    "moment-timezone": "~0.5.5",
+    "moment-timezone": "0.5.5",
     "requirejs": "~2.1.22",
     "requirejs-text": "~2.0.12",
-    "sinon": "1.17.3 || >1.17.4",
+    "sinon": "^1.17.7",
     "underscore": "~1.8.3",
     "urijs": "~1.16.1"
   },
@@ -37,29 +37,28 @@
     "edx-pattern-library": "~0.12.5",
     "eslint": "~2.13.1",
     "eslint-config-edx": "~1.2.1",
-    "extract-text-webpack-plugin": "~1.0.1",
+    "extract-text-webpack-plugin": "^2.1.0",
     "gulp": "~3.9.1",
     "gulp-coveralls": "~0.1.4",
     "gulp-gh-pages": "~0.5.4",
-    "gulp-karma": "~0.0.5",
     "gulp-rename": "~1.2.2",
     "gulp-util": "~3.0.7",
     "jasmine": "~2.4.1",
-    "jasmine-core": "~2.4.1",
+    "jasmine-core": "^2.5.2",
     "jsdoc3-parser": "~1.1.0",
     "jsdox": "~0.4.9",
-    "karma": "~0.13.22",
-    "karma-chrome-launcher": "~0.2.2",
-    "karma-coverage": "~0.5.3",
+    "karma": "^1.5.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-coverage": "^1.1.1",
     "karma-coveralls": "^1.1.2",
-    "karma-firefox-launcher": "~0.1.6",
-    "karma-jasmine": "~0.3.8",
-    "karma-jasmine-html-reporter": "~0.2.0",
-    "karma-jasmine-jquery": "~0.1.1",
-    "karma-phantomjs-launcher": "~1.0.0",
-    "karma-requirejs": "~0.2.2",
-    "karma-sinon": "~1.0.3",
-    "karma-spec-reporter": "~0.0.24",
+    "karma-firefox-launcher": "^1.0.1",
+    "karma-jasmine": "^1.1.0",
+    "karma-jasmine-html-reporter": "^0.2.2",
+    "karma-jasmine-jquery": "^0.1.1",
+    "karma-phantomjs-launcher": "^1.0.4",
+    "karma-requirejs": "^1.1.0",
+    "karma-sinon": "^1.0.5",
+    "karma-spec-reporter": "0.0.30",
     "node-sass": "~3.7.0",
     "phantomjs-prebuilt": "~2.1.7",
     "require-dir": "latest",
@@ -68,13 +67,7 @@
     "sass-loader": "~3.2.0",
     "style-loader": "~0.13.1",
     "through2": "~2.0.0",
-    "webpack": "~1.12.14",
-    "webpack-stream": "~3.2.0"
-  },
-  "peerDependencies": {
-    "backbone.paginator": "~2.0.3",
-    "moment": "^2.15.1",
-    "moment-timezone": "~0.5.5",
-    "sinon": "1.17.3 || >1.17.4"
+    "webpack": "^2.3.3",
+    "webpack-stream": "^3.2.0"
   }
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -20,21 +20,35 @@ var path = require('path'),
             publicPath: siteRoot + publicStaticRoot,
             filename: 'ui-toolkit-doc-factory.js'
         },
-        modulesDirectories: ['node_modules'],
         resolve: {
             alias: {
                 afontgarde: 'edx-pattern-library/js/afontgarde',
                 modernizr: 'edx-pattern-library/js/modernizr-custom',
                 'edx-pattern-library': patternLibraryPath,
                 'edx-ui-toolkit': path.resolve(__dirname, 'src'),
                 doc: path.resolve(__dirname, 'doc/static')
-            }
+            },
+            modules: ['node_modules']
         },
         module: {
-            loaders: [
+            rules: [
                 {
                     test: /\.scss$/,
-                    loader: ExtractTextPlugin.extract('style', 'css!sass')
+                    loader: ExtractTextPlugin.extract({
+                        fallback: 'style-loader',
+                        use: [{
+                            loader: 'css-loader'
+                        }, {
+                            loader: 'sass-loader',
+                            options: {
+                                includePaths: [
+                                    path.resolve(__dirname, './node_modules')
+                                ],
+                                data: '$pattern-library-path: \'' + siteRoot +
+                                      './public/edx-pattern-library\' !default;'
+                            }
+                        }]
+                    })
                 }
             ]
         },
@@ -43,16 +57,11 @@ var path = require('path'),
                 $: 'jquery'
             }),
             new Webpack.IgnorePlugin(/^(config.js)$/),
+            new Webpack.LoaderOptionsPlugin({
+                debug: true
+            }),
             new ExtractTextPlugin('ui-toolkit.css')
         ],
-        sassLoader: {
-            includePaths: [
-                path.resolve(__dirname, './node_modules'),
-                path.resolve(__dirname, './node_modules/edx-pattern-library/node_modules')
-            ],
-            data: '$pattern-library-path: \'' + siteRoot + './public/edx-pattern-library\' !default;'
-        },
-        debug: true,
         devtool: 'inline-source-map'
     };
 }());