Merge pull request #52 from typecode/swap-to-webpack

Audit fixes

Author: LevKanter

.babelrc

@@ -1,14 +1,4 @@
 {
-  "presets": [
-    [
-      "es2015",
-      {
-        "modules": false
-      }
-    ]
-  ],
-  "plugins": [
-    "external-helpers",
-    "transform-object-rest-spread"
-  ]
+  "presets": [["@babel/preset-env", { "modules": false }]],
+  "plugins": ["add-module-exports"]
 }

.gitignore

@@ -5,5 +5,8 @@ _notes_/
 docs/site/
 docs/src/
 
+test/integration/screenshots
+test/integration/videos
+
 yarn-error.log
 npm-debug.log

README.md

@@ -106,7 +106,7 @@ and submit your issue / feature request.
 3. Make sure all tests pass
     1. If you have added a new feature, make sure there is a test for it
     2. Run the following:
-       `~> yarn test` (for unit tests) & `~>yarn test_e2e` (end-to-end tests)
+       `~> yarn test_unit` (for unit tests) & `~>yarn test_e2e` (end-to-end tests)
     3. If you have changed the codebase in a way that requires the tests to be updated
        please do so.
 4. Update the documentation if you've added any publicly accessible methods or options.
@@ -115,11 +115,11 @@ and submit your issue / feature request.
 7. Create a new pull request.
 
 ### Setup local dev environment
-Install all the node moudles
+Install all the node modules
 ```
 ~> yarn
-~> cd test/e2e/test && yarn
 ```
+
 ### Run build scripts
 For a one time build
 ```
@@ -130,34 +130,33 @@ For a continuous reactive build that watches for changes
 ~> yarn watch
 ```
 
-### Run the local server
-You will need to have [Docker](https://docs.docker.com/install/) and [Docker Compose](https://docs.docker.com/compose/install/) installed firstly.
-
-Then:
+### Run the dev server
 ```
-~> yarn local_server
+~> yarn dev-server
 ```
 You should then be able to navigate your browser to:
 ```
-http://localhost:4848
+http://localhost:9000
 ```
 
 ### Run the tests
 **Make sure you build first**
-Once again, you will need to have [Docker](https://docs.docker.com/install/) and [Docker Compose](https://docs.docker.com/compose/install/) installed.
-
-Then:
 
 Unit tests (Karma & Jasmine)
 ```
-~> yarn test
+~> yarn test_unit
 ```
 
 e2e tests (nightwatch)
 ```
 ~> yarn test_e2e
 ```
 
+all tests (unit & e2e)
+```
+~> yarn test
+```
+
 ### Build and read the developer docs
 For a once off build:
 ```
@@ -176,5 +175,5 @@ Then, to read the docs:
 
 And point you browser to:
 ```
-http://localhost:4849
+http://localhost:9001
 ```

cypress.json

@@ -0,0 +1,8 @@
+{
+    "fixturesFolder": "test/integration/fixtures",
+    "integrationFolder": "test/integration/specs",
+    "pluginsFile": "test/integration/plugins/index.js",
+    "screenshotsFolder": "test/integration/screenshots",
+    "supportFile": "test/integration/support/index.js",
+    "videosFolder": "test/integration/videos"
+}

docs/docker-compose.yml

@@ -0,0 +1,18 @@
+/*global require __dirname module*/
+
+const path = require('path');
+console.log(path.resolve(__dirname, 'src/index.js'));
+module.exports = {
+    entry: path.resolve(__dirname, 'src/index.js'),
+    output: {
+        path: path.resolve(__dirname, 'src/'),
+        filename: 'build.js'
+    },
+    devServer: {
+        contentBase: path.resolve(__dirname, 'site/'),
+        host: '0.0.0.0',
+        port: 9001,
+        disableHostCheck: true,
+        index: 'index.html'
+    }
+};

docs/webpack.config.js

@@ -1,110 +1,43 @@
 // jshint strict: false
+const webpackConfig = require('./webpack.config');
+delete webpackConfig.entry;
+delete webpackConfig.output;
 
 module.exports = function (config) {
     config.set({
         basePath: '',
 
-        frameworks: ['jasmine-jquery', 'jasmine'],
+        frameworks: ['jquery-2.0.0', 'jasmine'],
 
         files: [
             './test/unit/setup.js',
-            // {pattern: './src/scripts/**/*.js', included: false},
             {pattern: './test/unit/fixtures/**/*.html', included: false, served: true},
-            // {pattern: './test/helpers/**/*.js', included: false},
-            './test/unit/**/*.spec.js'
+            'test/unit/**/*.spec.js'
         ],
 
         preprocessors: {
-            './test/unit/setup.js': ['rollup'],
-            './src/scripts/**/*.js': ['rollup', /*'sourcemap', 'coverage'*/],
-            './test/unit/**/*.spec.js': ['rollup', /*'sourcemap'*/]
+            './test/unit/setup.js': ['webpack'],
+            './src/scripts/**/*.js': ['webpack'],
+            'test/unit/**/*.spec.js': ['webpack']
         },
 
-        rollupPreprocessor: {
-            plugins: [
-                require('rollup-plugin-node-resolve')({
-                    jsnext: true,
-                    main: true,
-                    browser: true
-                }),
-                require('rollup-plugin-sass')({
-                    output: false,
-                    processor(css) {
-                        return require('postcss')([require('autoprefixer')]).process(css)
-                            .then(result => result.css);
-                    }
+        webpack: Object.assign({}, webpackConfig, {
+            output: {
 
-                }),
-                require('rollup-plugin-handlebars-plus')({
-                    templateExtension: '.html'
-                }),
-                require('rollup-plugin-commonjs')(),
-                require('rollup-plugin-istanbul')({
-                    exclude: ['./test/unit/**/*.js', 'node_modules/**']
-                }),
-                require('rollup-plugin-babel')({
-                    exclude: 'node_modules/**'
-                })
-            ],
-            format: 'iife',
-            moduleName: 'typester',
-            sourceMap: 'inline'
+            }
+        }),
+
+        webpackMiddleware: {
+            noInfo: true
         },
+
         logLevel: config.LOG_DEBUG,
-        plugins: [
-            'karma-rollup-preprocessor',
-            'karma-jasmine',
-            'karma-jasmine-jquery',
-            'karma-spec-reporter',
-            'karma-sourcemap-loader',
-            'karma-coverage',
-            'karma-phantomjs-launcher'
-        ],
-        reporters: ['spec'/*, 'coverage' */],
+        reporters: ['spec'],
         coverageReporter: {
             type: 'html',
             dir: 'coverage/'
         },
         browsers: ['PhantomJS'],
         autoWatchBatchDelay: 3000
     });
-
-
-    if (process.env.NODE_ENV === 'ci') {
-        config.set({
-            plugins: config.plugins.concat([
-                'karma-junit-reporter',
-                'karma-chrome-launcher',
-                'karma-firefox-launcher'
-            ]),
-            reporters: ['junit'],
-            autoWatch: false,
-            browserDisconnectTolerance: 2,
-            concurrency: 1,
-            singleRun: true,
-            junitReporter: {
-                outputDir: 'coverage',
-                outputFile: 'report.xml',
-                suite: '',
-                useBrowserName: true
-            },
-            customLaunchers: {
-                'chrome': {
-                    base: 'Chrome',
-                    flags: ['--headless', '--no-sandbox', '--disable-gpu', '--remote-debugging-port=9222'],
-                    displayName: 'Typester-Chrome'
-                },
-                'firefox': {
-                    base: 'Firefox',
-                    flags: ['-headless'],
-                    displayName: 'Typester-Firefox'
-                },
-                'phantom': {
-                    base: 'PhantomJS',
-                    displayName: 'Typester-PhantomJS'
-                }
-            },
-            browsers: ['phantom', 'chrome', 'firefox']
-        });
-    }
 };