honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: fix paths for examples tests

This commit is contained in:
Jason Aden 2017-03-08 14:48:20 -08:00
parent b74ab83d2c
commit 2b44854885
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
aio/transforms/angular.io-package/index.js
View File

@ -20,7 +20,7 @@ const cheatsheetPackage = require('../cheatsheet-package');
const rhoPackage = require('../rho-package');
const PROJECT_ROOT = path.resolve(__dirname, '../../..');
const API_SOURCE_PATH = path.resolve(PROJECT_ROOT, 'modules');
const API_SOURCE_PATH = path.resolve(PROJECT_ROOT, 'packages');
const AIO_PATH = path.resolve(PROJECT_ROOT, 'aio');
const CONTENTS_PATH = path.resolve(AIO_PATH, 'content');
const TEMPLATES_PATH = path.resolve(AIO_PATH, 'transforms/templates');
@ -64,25 +64,25 @@ module.exports =
readTypeScriptModules.ignoreExportsMatching = [/^_/];
readTypeScriptModules.hidePrivateMembers = true;
readTypeScriptModules.sourceFiles = [
'@angular/common/index.ts',
'@angular/common/testing/index.ts',
'@angular/core/index.ts',
'@angular/core/testing/index.ts',
'@angular/forms/index.ts',
'@angular/http/index.ts',
'@angular/http/testing/index.ts',
'@angular/platform-browser/index.ts',
'@angular/platform-browser/testing/index.ts',
'@angular/platform-browser-dynamic/index.ts',
'@angular/platform-browser-dynamic/testing/index.ts',
'@angular/platform-server/index.ts',
'@angular/platform-server/testing/index.ts',
'@angular/platform-webworker/index.ts',
'@angular/platform-webworker-dynamic/index.ts',
'@angular/router/index.ts',
'@angular/router/testing/index.ts',
'@angular/upgrade/index.ts',
'@angular/upgrade/static.ts',
'common/index.ts',
'common/testing/index.ts',
'core/index.ts',
'core/testing/index.ts',
'forms/index.ts',
'http/index.ts',
'http/testing/index.ts',
'platform-browser/index.ts',
'platform-browser/testing/index.ts',
'platform-browser-dynamic/index.ts',
'platform-browser-dynamic/testing/index.ts',
'platform-server/index.ts',
'platform-server/testing/index.ts',
'platform-webworker/index.ts',
'platform-webworker-dynamic/index.ts',
'router/index.ts',
'router/testing/index.ts',
'upgrade/index.ts',
'upgrade/static.ts',
];
readFilesProcessor.basePath = PROJECT_ROOT;
@ -105,7 +105,7 @@ module.exports =
{basePath: CONTENTS_PATH, include: CONTENTS_PATH + '/cheatsheet/*.md'},
{
basePath: API_SOURCE_PATH,
include: API_SOURCE_PATH + '/@angular/examples/**/*',
include: API_SOURCE_PATH + '/examples/**/*',
fileReader: 'exampleFileReader'
},
{
@ -115,7 +115,7 @@ module.exports =
},
];
collectExamples.exampleFolders = ['@angular/examples', 'examples'];
collectExamples.exampleFolders = ['examples', 'examples'];
generateKeywordsProcessor.ignoreWordsFile = 'aio/transforms/angular.io-package/ignore.words';
generateKeywordsProcessor.docTypesToIgnore = ['example-region'];
@ -255,4 +255,4 @@ function requireFolder(folderPath) {
return fs.readdirSync(absolutePath)
.filter(p => !/[._]spec\.js$/.test(p)) // ignore spec files
.map(p => require(path.resolve(absolutePath, p)));
}
}

12
packages/examples/build.sh
View File

@ -17,14 +17,14 @@ $(npm bin)/tsc -p ./tsconfig-build.json
mkdir $DIST/vendor/
ln -s ../../dist/packages-dist/ $DIST/vendor/@angular
ln -s ../../../dist/packages-dist/ $DIST/vendor/@angular
for FILE in \
../../node_modules/angular/angular.js \
../../node_modules/zone.js/dist/zone.js \
../../node_modules/systemjs/dist/system.js \
../../node_modules/reflect-metadata/Reflect.js \
../../node_modules/rxjs
../../../node_modules/angular/angular.js \
../../../node_modules/zone.js/dist/zone.js \
../../../node_modules/systemjs/dist/system.js \
../../../node_modules/reflect-metadata/Reflect.js \
../../../node_modules/rxjs
do
ln -s $FILE $DIST/vendor/`basename $FILE`
done

2
packages/examples/test.sh
View File

@ -5,4 +5,4 @@ cd `dirname $0`
gulp serve-examples &
(cd ../../../ && NODE_PATH=$NODE_PATH:dist/all $(npm bin)/protractor protractor-examples-e2e.conf.js --bundles=true)
(cd ../../ && NODE_PATH=$NODE_PATH:dist/all $(npm bin)/protractor protractor-examples-e2e.conf.js --bundles=true)

4
scripts/ci/build.sh
View File

@ -37,7 +37,7 @@ travisFoldEnd "tsc a bunch of useless stuff"
# Build integration tests
if [[ ${CI_MODE} == "e2e" ]]; then
if [[ ${CI_MODE:-} == "e2e" ]]; then
travisFoldStart "build.integration"
cd "`dirname $0`/../../integration"
./build_rxjs_es6.sh
@ -47,7 +47,7 @@ fi
# Build angular.io
if [[ ${CI_MODE} == "aio" ]]; then
if [[ ${CI_MODE:-} == "aio" ]]; then
travisFoldStart "build.aio"
cd "`dirname $0`/../../aio"
yarn run build