Skip to content

Commit 248ed99

Browse files
authored
chore(testapp): use testapp's package.json to install node_modules (angular#3302)
* use testapp's package.json to install node_modules * update hybrid to use the node_modules folder and remove lib folder
1 parent 7c376c5 commit 248ed99

File tree

13 files changed

+22
-97185
lines changed

13 files changed

+22
-97185
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ before_install:
3939
- g++-4.8 --version
4040

4141
before_script:
42+
- npm run install_testapp
4243
- npm run pretest
4344
- mkdir -p $LOGS_DIR
4445
- ./scripts/travis_setup.sh

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
"pretest": "gulp pretest",
5858
"start": "node testapp/scripts/web-server.js",
5959
"test": "node scripts/test.js",
60+
"install_testapp": "cd testapp && npm install",
6061
"tsc": "./node_modules/typescript/bin/tsc",
6162
"tsc:w": "./node_modules/typescript/bin/tsc -w"
6263
},

testapp/hybrid/index.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@
1111
<script src="../ng1/lib/angular/angular.min.js"></script>
1212
<script src="../ng1/lib/angular/angular-animate.min.js"></script>
1313
<script src="../ng1/lib/angular/angular-route.min.js"></script>
14-
<script src="../ng2/lib/es6-shim/es6-shim.min.js"></script>
15-
<script src="../ng2/lib/systemjs/dist/system-polyfills.js"></script>
1614

17-
<script src="../ng2/lib/angular2.0.0-beta.0/bundles/angular2-polyfills.js"></script>
18-
<script src="../ng2/lib/systemjs/dist/system.js"></script>
19-
<script src="../ng2/lib/typescript/lib/typescript.js"></script>
20-
<script src="../ng2/lib/rxjs/bundles/Rx.js"></script>
21-
<script src="../ng2/lib/angular2.0.0-beta.0/bundles/angular2.dev.js"></script>
15+
<script src="../node_modules/es6-shim/es6-shim.min.js"></script>
16+
<script src="../node_modules/systemjs/dist/system-polyfills.js"></script>
17+
<script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
18+
<script src="../node_modules/systemjs/dist/system.js"></script>
19+
<script src="../node_modules/typescript/lib/typescript.js"></script>
20+
<script src="../node_modules/rxjs/bundles/Rx.js"></script>
21+
<script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
2222

2323
<!-- Add the router library -->
24-
<script src="lib/angular2.0.0-beta.0/bundles/upgrade.js"></script>
24+
<script src="../node_modules/angular2/bundles/upgrade.js"></script>
2525

2626
<script>
2727
System.config({

testapp/ng2/index.html

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,16 @@
88
<link href="https://fonts.googleapis.com/css?family=Roboto:400,300,500,400italic,700" rel="stylesheet" type="text/css">
99
<link rel="stylesheet" href="styles.css">
1010
<!-- IE required polyfills, in this exact order -->
11-
<script src="lib/es6-shim/es6-shim.min.js"></script>
12-
<script src="lib/systemjs/dist/system-polyfills.js"></script>
13-
14-
<script src="lib/angular2.0.0-beta.0/bundles/angular2-polyfills.js"></script>
15-
<script src="lib/systemjs/dist/system.js"></script>
16-
<script src="lib/typescript/lib/typescript.js"></script>
17-
<script src="lib/rxjs/bundles/Rx.js"></script>
18-
<script src="lib/angular2.0.0-beta.0/bundles/angular2.dev.js"></script>
11+
<script src="../node_modules/es6-shim/es6-shim.min.js"></script>
12+
<script src="../node_modules/systemjs/dist/system-polyfills.js"></script>
13+
<script src="../node_modules/angular2/bundles/angular2-polyfills.js"></script>
14+
<script src="../node_modules/systemjs/dist/system.js"></script>
15+
<script src="../node_modules/typescript/lib/typescript.js"></script>
16+
<script src="../node_modules/rxjs/bundles/Rx.js"></script>
17+
<script src="../node_modules/angular2/bundles/angular2.dev.js"></script>
1918

2019
<!-- Add the router library -->
21-
<script src="lib/angular2.0.0-beta.0/bundles/router.js"></script>
20+
<script src="../node_modules/angular2/bundles/router.js"></script>
2221

2322
<script>
2423
System.config({

0 commit comments

Comments
 (0)