Merge e80e08f into c7fc75b

.github/contributing.md

@@ -32,9 +32,6 @@ We use Gulp for managing the build. Here are some useful Gulp tasks:
 
   * `npm test` Runs all tests (webpack, commonjs, etc) checks the coding style, lints the code, calculates complexity, runs all tests, and enforces code coverage. You should make sure you do this before submitting a PR.
   * `gulp` The default task checks the coding style, lints the code, calculates complexity, runs the tests (not webpack or commonJS tests), and enforces code coverage.
-  * `gulp scss` Generates the css file from the source scss.
-  * `gulp css-lint` Lint the css files after generating.
-  * `gulp templatecache` Generates src/js/datetimepicker.templates.js. You must re-add the IIFE around the generated code after it is generated (PR to fix this would be apprecaited)
 
 # Contributing to AngularJS
 

.npmignore

@@ -8,7 +8,6 @@ bower_components
 complexity
 coverage
 demo
-Gruntfile.js
 gulpfile.js
 karma.conf.js
 paths.js

.travis.yml

@@ -1,15 +1,18 @@
 sudo: false
+dist: bionic
 language: node_js
+node_js:
+  - '12'
+services:
+  - xvfb
+addons:
+  firefox: latest
+  chrome: latest
 cache:
   directories:
     - node_modules
 notifications:
   email: none
-node_js:
-  - '6'
-before_install:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
 before_script:
   - npm prune
 script:

gulpfile.js

@@ -12,22 +12,22 @@ var standard = require('gulp-standard')
 
 var karmaConfig = path.join(__dirname, 'karma.conf.js')
 
-gulp.task('clean', function () {
+gulp.task('clean', function clean () {
   var del = require('del')
   return del([
     'build'
   ])
 })
 
-gulp.task('complexity', function (done) {
+gulp.task('complexity', function complexity (done) {
   var callback = function () {
     done()
   }
 
   plato.inspect(paths.lint, 'build/complexity', {title: 'prerender', recurse: true}, callback)
 })
 
-gulp.task('lint', function () {
+gulp.task('lint', function lint () {
   return gulp
     .src(paths.lint)
     .pipe(standard())
@@ -37,13 +37,13 @@ gulp.task('lint', function () {
     }))
 })
 
-gulp.task('tdd', function (done) {
-  gulp.watch(paths.all, ['jscs', 'lint'])
+gulp.task('tdd', function tdd (done) {
+  gulp.watch(paths.all, gulp.parallel('lint'))
 
   var config = testConfig(
     {
       autoWatch: true,
-      browsers: ['PhantomJS'],
+      browsers: ['ChromeHeadless'],
       configFile: karmaConfig,
       singleRun: false
     }
@@ -53,7 +53,7 @@ gulp.task('tdd', function (done) {
   server.start()
 })
 
-gulp.task('test', ['lint'], function (done) {
+gulp.task('test', gulp.series('lint', function test (done) {
   var config = testConfig(
     {
       configFile: karmaConfig,
@@ -64,13 +64,13 @@ gulp.task('test', ['lint'], function (done) {
 
   var server = new Server(config, done)
   server.start()
-})
+}))
 
-gulp.task('default', ['complexity', 'test'])
+gulp.task('default', gulp.parallel('complexity', 'test'))
 
 var testConfig = function (options) {
   var travisDefaultOptions = {
-    browsers: ['Firefox'],
+    browsers: ['FirefoxHeadless', 'ChromeHeadless'],
     reporters: ['dots', 'coverage', 'threshold']
   }
 

karma.conf.js

@@ -26,7 +26,6 @@ module.exports = function (config) {
       'karma-jasmine',
       'karma-chrome-launcher',
       'karma-firefox-launcher',
-      'karma-phantomjs-launcher',
       'karma-coverage',
       'karma-threshold-reporter'
     ],
@@ -85,7 +84,7 @@ module.exports = function (config) {
     // - Safari (only Mac)
     // - PhantomJS
     // - IE (only Windows)
-    browsers: ['PhantomJS'],
+    browsers: ['FirefoxHeadless', 'ChromeHeadless'],
 
     // If browser does not capture in given timeout [ms], kill it
     captureTimeout: 60000,

package.json

@@ -22,32 +22,27 @@
     "angular-mocks": "^1.x",
     "coveralls": "^2.11.14",
     "cz-conventional-changelog": "^1.2.0",
+    "del": "^5.1.0",
     "eslint": "^3.8.1",
-    "gulp": "^3.9.1",
-    "gulp-htmlmin": "^3.0.0",
-    "gulp-jscs": "^4.0.0",
-    "gulp-jshint": "^2.0.1",
-    "gulp-standard": "^8.0.2",
-    "jasmine-core": "^2.5.2",
+    "gulp": "^4.0.0",
+    "gulp-standard": "^8.0.4",
     "jquery": "^3.1.1",
     "jshint": "^2.9.4",
     "jshint-stylish": "^2.2.1",
-    "karma": "^1.3.0",
-    "karma-chrome-launcher": "^2.0.0",
-    "karma-coverage": "^1.1.1",
-    "karma-firefox-launcher": "^1.0.0",
-    "karma-jasmine": "^1.0.2",
-    "karma-phantomjs-launcher": "^1.0.2",
+    "karma": "^5.0.0",
+    "karma-chrome-launcher": "^3.1.0",
+    "karma-coverage": "^2.0.2",
+    "karma-firefox-launcher": "^1.3.0",
+    "karma-jasmine": "^3.1.1",
     "karma-threshold-reporter": "^0.1.15",
-    "karma-webpack": "^1.8.0",
+    "karma-webpack": "^4.0.2",
     "lodash": "^4.16.4",
-    "phantomjs-prebuilt": "^2.1.13",
     "plato": "^1.7.0",
     "run-browser": "^2.0.2",
     "semantic-release": "^6.3.0",
     "standard": "^8.4.0",
     "tape": "^4.6.2",
-    "webpack": "^1.13.2"
+    "webpack": "^4.43.0"
   },
   "scripts": {
     "coverage:upload": "cat build/coverage/lcov.info | coveralls",

paths.js

@@ -7,7 +7,7 @@ var nodeModules = [
   'node_modules/angular-mocks/angular-mocks.js'
 ]
 var bumpFiles = ['package.json', 'bower.json', 'README.md', 'src/js/*.js']
-var miscFiles = ['GruntFile.js', 'gulpfile.js', 'karma.conf.js', 'paths.js']
+var miscFiles = ['gulpfile.js', 'karma.conf.js', 'paths.js']
 var demoFiles = []
 var sourceFiles = ['src/**/*.js']
 var testFiles = ['test/**/*.spec.js']

src/dateTimeInput.js

@@ -17,9 +17,8 @@
     var ng = typeof angular === 'undefined' ? require('angular') : angular
     var mt = typeof moment === 'undefined' ? require('moment') : moment
     factory(ng, mt)
-    module.exports = 'ui.bootstrap.datetimepicker'
-    /* istanbul ignore next */
-  } else if (typeof define === 'function' && /* istanbul ignore next */ define.amd) {
+    module.exports = 'ui.dateTimeInput'
+  } else /* istanbul ignore next */ if (typeof define === 'function' && define.amd) {
     define(['angular', 'moment'], factory)
   } else {
     factory(root.angular, root.moment)

test/webpack/karma.conf.js

@@ -8,8 +8,6 @@
  * @since 9/11/16.
  */
 
-var webpackConfig = require('./webpack.conf');
-
 module.exports = function(config) {
   'use strict';
   config.set({
@@ -30,10 +28,10 @@ module.exports = function(config) {
     }],
 
     // webpack configuration
-    webpack: webpackConfig,
+    webpack: {},
 
     // webpack middlewae configuration
-    webpackMiddleware: { noInfo: true },
+    webpackMiddleware: { stats: 'errors-only' },
 
     // list of files to exclude
     exclude: [],
@@ -64,14 +62,21 @@ module.exports = function(config) {
 
     // start these browsers
     // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-    browsers: ['PhantomJS'],
+    browsers: ['FirefoxHeadless', 'ChromeHeadless'],
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
     singleRun: true,
 
     // Concurrency level
     // how many browser should be started simultaneous
-    concurrency: Infinity
+    concurrency: Infinity,
+
+    // Webpack tests need the tests to run in order in order to test the require call
+    client: {
+        jasmine: {
+            random: false
+        }
+    },
   });
 };

test/webpack/webpack.test.js

@@ -16,11 +16,12 @@ describe('webpack require', function () {
   }
 
   it('should throw an error if the module is not defined', function () {
-    expect(loadDateTimeInput).toThrow();
+    expect(loadDateTimeInput).toThrowError(/\[\$injector:nomod\] Module 'ui\.dateTimeInput'/);
   });
 
   it('should be available when required', function () {
-    require('../../');
+    var exported = require('../../');
+    expect(exported).toBe('ui.dateTimeInput');
     expect(loadDateTimeInput).not.toThrow();
   });
 });