Skip to content
This repository was archived by the owner on Mar 20, 2024. It is now read-only.

Commit a10e4af

Browse files
committed
fix: revert to wait for app stability if buffering
* Revert of #60 due to issues with lazy loading * Add linting rules and refactor files accordingly * Bump deps to Angular v5.2 and TypeScript v2.6 * Resolve IE issues by removing Array.from and Element.remove references * Remove Renderer2 references from preboot provider
1 parent e4dc6e2 commit a10e4af

32 files changed

+974
-345
lines changed

build-config.js

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/**
2+
* Build configuration for the packaging tool. This file will be automatically detected and used
3+
* to build the different packages inside of Preboot.
4+
*/
5+
const {join} = require('path');
6+
7+
const package = require('./package.json');
8+
9+
/** Current version of the project*/
10+
const buildVersion = package.version;
11+
12+
/**
13+
* Required Angular version for all Preboot packages. This version will be used
14+
* as the peer dependency version for Angular in all release packages.
15+
*/
16+
const angularVersion = '^5.0.0';
17+
18+
/** License that will be placed inside of all created bundles. */
19+
const buildLicense = `/**
20+
* @license
21+
* Copyright Google LLC All Rights Reserved.
22+
*
23+
* Use of this source code is governed by an MIT-style license that can be
24+
* found in the LICENSE file at https://angular.io/license
25+
*/`;
26+
27+
module.exports = {
28+
projectVersion: buildVersion,
29+
angularVersion: angularVersion,
30+
projectDir: __dirname,
31+
packagesDir: join(__dirname, 'src'),
32+
outputDir: join(__dirname, 'dist'),
33+
licenseBanner: buildLicense
34+
};

integration/protractor.conf.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,21 @@
44
const { SpecReporter } = require('jasmine-spec-reporter');
55

66
exports.config = {
7+
useAllAngular2AppRoots: true,
8+
specs: ['./out-tsc/e2e/**/*.spec.js'],
9+
baseUrl: 'http://localhost:9393/',
710
allScriptsTimeout: 11000,
8-
specs: [
9-
'./out-tsc/e2e/**/*.spec.js'
10-
],
11+
getPageTimeout: 11000,
1112
capabilities: {
12-
'browserName': 'chrome'
13+
browserName: 'chrome',
14+
// For Travis
15+
chromeOptions: {
16+
binary: process.env.CHROME_BIN,
17+
args: ['--no-sandbox']
18+
}
1319
},
1420
directConnect: true,
15-
baseUrl: 'http://localhost:9393/',
21+
1622
framework: 'jasmine',
1723
jasmineNodeOpts: {
1824
showColors: true,

karma.conf.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ module.exports = function (config) {
2222
customLaunchers: {
2323
// From the CLI. Not used here but interesting
2424
// chrome setup for travis CI using chromium
25-
Chrome_travis_ci: {
26-
base: 'Chrome',
27-
flags: ['--no-sandbox']
25+
CustomChrome: {
26+
base: 'ChromeHeadless',
27+
flags: process.env.TRAVIS && ['--no-sandbox']
2828
}
2929
},
3030

@@ -56,7 +56,7 @@ module.exports = function (config) {
5656
colors: true,
5757
logLevel: config.LOG_INFO,
5858
autoWatch: false,
59-
browsers: ['Chrome'],
59+
browsers: ['CustomChrome'],
6060
singleRun: false
6161
})
6262
};

0 commit comments

Comments
 (0)