Skip to content

Commit

Permalink
perf(): Build pipeline moved to Webpack. Added AOT support.
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Akopkokhyants authored and akserg committed Dec 22, 2016
1 parent a0c1401 commit 7d7c0a8
Show file tree
Hide file tree
Showing 17 changed files with 547 additions and 329 deletions.
25 changes: 10 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,24 @@ manifest.mf
build.xml
node_modules/*
npm-debug.log
*.js
!config/*
!karma.conf.js
!webpack.config.js
*.map
*.d.ts
!make.js
coverage
dist
typings
bundles/*.*
src/*.js
src/*.d.ts
src/*.js.map
tests/*.js
tests/*.d.ts
tests/*.js.map
index.js
index.d.ts
index.js.map
_test-output
*.metadata.json
bundles
.vscode

#################
## JetBrains
#################
.idea
.project
.settings
.idea/*
*.iml

############
## Windows
Expand Down
23 changes: 7 additions & 16 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,29 +7,20 @@ manifest.mf
build.xml
node_modules/*
npm-debug.log
coverage
typings
typings.json
**/*.ts
**/*.js.map
*.ts
!*.d.ts
!src/*.d.ts
!tests/*.d.ts
.travis.yml
karma*
make.js
tsconfig.json
_test-output
systemjs.config.js
tests
.github
coverage
!*.metadata.json
!bundles/*.js

#################
## JetBrains
#################
.idea
.project
.settings
.idea/*
*.iml

############
## Windows
Expand All @@ -46,4 +37,4 @@ Desktop.ini
############

# Mac crap
.DS_Store
.DS_Store
29 changes: 21 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,23 +1,36 @@
sudo: false
language: node_js

cache:
directories:
- $HOME/.npm
- $HOME/.yarn-cache
- node_modules

sudo: false

notifications:
email: false

node_js:
- '5'
- '6'

branches:
except:
- "/^v\\d+\\.\\d+\\.\\d+$/"

before_install:
- npm i -g npm@^3.7
- export CHROME_BIN=chromium-browser
- npm i -g yarn

before_script:
- npm prune
script:
- npm run test

install:
- yarn

after_success:
- npm run semantic-release
branches:
except:
- "/^v\\d+\\.\\d+\\.\\d+$/"

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
32 changes: 32 additions & 0 deletions config/helpers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/**
* taken from angular2-webpack-starter
*/
var path = require('path');

// Helper functions
var ROOT = path.resolve(__dirname, '..');

function hasProcessFlag(flag) {
return process.argv.join('').indexOf(flag) > -1;
}

function isWebpackDevServer() {
return process.argv[1] && !! (/webpack-dev-server$/.exec(process.argv[1]));
}

function root(args) {
args = Array.prototype.slice.call(arguments, 0);
return path.join.apply(path, [ROOT].concat(args));
}

function checkNodeImport(context, request, cb) {
if (!path.isAbsolute(request) && request.charAt(0) !== '.') {
cb(null, 'commonjs ' + request); return;
}
cb();
}

exports.hasProcessFlag = hasProcessFlag;
exports.isWebpackDevServer = isWebpackDevServer;
exports.root = root;
exports.checkNodeImport = checkNodeImport;
58 changes: 58 additions & 0 deletions config/karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
module.exports = function(config) {
var testWebpackConfig = require('./webpack.test.js');

var configuration = {
basePath: '',

frameworks: ['jasmine'],

// list of files to exclude
exclude: [ ],

/*
* list of files / patterns to load in the browser
*
* we are building the test environment in ./spec-bundle.js
*/
files: [ { pattern: './config/spec-bundle.js', watched: false } ],

preprocessors: { './config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'] },

// Webpack Config at ./webpack.test.js
webpack: testWebpackConfig,

coverageReporter: {
type: 'in-memory'
},

remapCoverageReporter: {
'text-summary': null,
json: './coverage/coverage.json',
html: './coverage/html'
},

// Webpack please don't spam the console when running in karma!
webpackMiddleware: { stats: 'errors-only'},

reporters: [ 'mocha', 'coverage', 'remap-coverage' ],

// web server port
port: 9876,

colors: true,

/*
* level of logging
* possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
*/
logLevel: config.LOG_INFO,

autoWatch: false,

browsers: [process.env.TRAVIS ? 'Firefox' : 'Chrome'],

singleRun: true
};

config.set(configuration);
};
58 changes: 58 additions & 0 deletions config/spec-bundle.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
/*
* When testing with webpack and ES6, we have to do some extra
* things to get testing to work right. Because we are gonna write tests
* in ES6 too, we have to compile those as well. That's handled in
* karma.conf.js with the karma-webpack plugin. This is the entry
* file for webpack test. Just like webpack will create a bundle.js
* file for our client, when we run test, it will compile and bundle them
* all here! Crazy huh. So we need to do some setup
*/
Error.stackTraceLimit = Infinity;

require('core-js/es6');
require('core-js/es7/reflect');

// Typescript emit helpers polyfill
require('ts-helpers');

require('zone.js/dist/zone');
require('zone.js/dist/long-stack-trace-zone');
require('zone.js/dist/async-test');
require('zone.js/dist/fake-async-test');
require('zone.js/dist/sync-test');
require('zone.js/dist/proxy'); // since zone.js 0.6.15
require('zone.js/dist/jasmine-patch'); // put here since zone.js 0.6.14

// RxJS
require('rxjs/Rx');

var testing = require('@angular/core/testing');
var browser = require('@angular/platform-browser-dynamic/testing');

testing.TestBed.initTestEnvironment(
browser.BrowserDynamicTestingModule,
browser.platformBrowserDynamicTesting()
);

/*
* Ok, this is kinda crazy. We can use the context method on
* require that webpack created in order to tell webpack
* what files we actually want to require or import.
* Below, context will be a function/object with file names as keys.
* Using that regex we are saying look in ../src then find
* any file that ends with spec.ts and get its path. By passing in true
* we say do this recursively
*/
var testContext = require.context('../tests', true, /\.spec\.ts/);

/*
* get all the files, for each file, call the context function
* that will require the file and load it up here. Context will
* loop and require those spec files here
*/
function requireAll(requireContext) {
return requireContext.keys().map(requireContext);
}

// requires and returns all modules that match
var modules = requireAll(testContext);
46 changes: 46 additions & 0 deletions config/testing-utils.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/// <reference path="../node_modules/@types/jasmine/index.d.ts" />

/*
Temporary fiile for referencing the TypeScript defs for Jasmine + some potentially
utils for testing. Will change/adjust this once I find a better way of doing
*/

declare module jasmine {
interface Matchers {
toHaveText(text: string): boolean;
toContainText(text: string): boolean;
}
}

beforeEach(() => {
jasmine.addMatchers({

toHaveText: function() {
return {
compare: function(actual, expectedText) {
var actualText = actual.textContent;
return {
pass: actualText === expectedText,
get message() {
return 'Expected ' + actualText + ' to equal ' + expectedText;
}
};
}
};
},

toContainText: function() {
return {
compare: function(actual, expectedText) {
var actualText = actual.textContent;
return {
pass: actualText.indexOf(expectedText) > -1,
get message() {
return 'Expected ' + actualText + ' to contain ' + expectedText;
}
};
}
};
}
});
});
Loading

0 comments on commit 7d7c0a8

Please sign in to comment.