Skip to content

Commit 4cff0e8

Browse files
committed
chore: cleanup
1 parent a1eb1cf commit 4cff0e8

23 files changed

+90
-5812
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ dist
1414
!/nativescript-angular/hooks/**/*.js
1515
!/nativescript-angular/gulpfile.js
1616
!/nativescript-angular/zone-js/dist/*.js
17-
!/nativescript-angular/zone-js/dist/zone-nativescript.ts
1817

1918
/nativescript-angular-package/**/*.d.ts
2019
/nativescript-angular-package/**/*.js

doc/upgrading-zonejs.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
`nativescript-angular` uses a fork of the `zone.js` package in order to work around incompatibilities between node, browser, and mobile implementations.
44

5-
The fork resides at https://github.com/NativeScript/zone.js in the `zone-nativescript` branch. It adds a separate `lib/nativescript/nativescript.ts` entry point that is used to generate a new bundle: `dist/zone-nativescript.js`.
5+
The fork resides at https://github.com/NativeScript/zone.js in the `zone-nativescript` branch. It adds a separate `lib/nativescript/nativescript.ts` entry point that is used to generate a new bundle: `zone-nativescript.js`.
66

77
To upgrade to a newer release of `zone.js`:
88

@@ -11,5 +11,5 @@ To upgrade to a newer release of `zone.js`:
1111
3. Rebuild: `gulp build`
1212
4. Run the node-based smoke tests: `gulp test/nativescript`
1313
5. Run the browser tests: `node_modules/.bin/karma start karma.conf.js --single-run` (You need to run node `test/ws-server.js` in a separate console first)
14-
6. Commit `dist/zone-nativescript.js`, drop the previous `dist/zone-nativescript.js` commit from the branch. Force push the new `zone-nativescript` branch to GitHub.
14+
6. Commit `zone-nativescript.js`, drop the previous `zone-nativescript.js` commit from the branch. Force push the new `zone-nativescript` branch to GitHub.
1515
7. Update your copy of `nativescript-angular/zone.js/dist/zone-nativescript.js` with the bundle you just built.

e2e/animation-examples/app/App_Resources/iOS/build.xcconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
// To build for device with Xcode 8 you need to specify your development team. More info: https://developer.apple.com/library/prerelease/content/releasenotes/DeveloperTools/RN-Xcode/Introduction.html
55
// DEVELOPMENT_TEAM = YOUR_TEAM_ID;
66
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
7-
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;

e2e/animation-examples/package.json

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,12 @@
3838
"babel-types": "~6.26.0",
3939
"babylon": "~6.18.0",
4040
"chai": "^4.2.0",
41-
"copy-webpack-plugin": "~6.0.3",
4241
"lazy": "~1.0.11",
4342
"mocha": "~8.0.1",
4443
"mochawesome": "~6.1.1",
4544
"nativescript-css-loader": "~0.26.0",
46-
"nativescript-dev-appium": "^6.1.0",
47-
"nativescript-dev-webpack": "~1.5.1",
48-
"typescript": "~3.9.0",
49-
"webpack": "~4.43.0"
45+
"@nativescript/webpack": "~2.0.0-alpha.2",
46+
"typescript": "~3.9.0"
5047
},
5148
"scripts": {
5249
"clean": "npx rimraf hooks node_modules platforms package-lock.json",
@@ -56,7 +53,7 @@
5653
"e2e-watch": "tsc -p e2e --watch",
5754
"ns-verify-bundle": "ns-verify-bundle",
5855
"update-ns-webpack": "update-ns-webpack",
59-
"ios": "tns debug ios --env.aot --emulator --no-hmr",
60-
"android": "tns debug android --env.aot --emulator --no-hmr"
56+
"ios": "tns debug ios --emulator --no-hmr",
57+
"android": "tns debug android --emulator --no-hmr"
6158
}
6259
}

e2e/router/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
"@angular/platform-browser-dynamic": "~9.1.0",
2020
"@angular/router": "~9.1.0",
2121
"@nativescript/angular": "file:../../dist/nativescript-angular-scoped.tgz",
22-
"nativescript-intl": "^3.0.0",
2322
"reflect-metadata": "~0.1.8",
2423
"rxjs": "~6.5.5",
2524
"@nativescript/core": "next",

e2e/single-page/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"@angular/platform-browser-dynamic": "~9.1.0",
1717
"@angular/router": "~9.1.0",
1818
"@nativescript/angular": "file:../../dist/nativescript-angular-scoped.tgz",
19-
"nativescript-intl": "^3.0.0",
2019
"reflect-metadata": "~0.1.8",
2120
"rxjs": "~6.5.5",
2221
"@nativescript/core": "next",

e2e/tests-app-ng/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
"@angular/platform-browser-dynamic": "~10.0.0",
2323
"@angular/router": "~10.0.0",
2424
"@nativescript/angular": "file:../../dist/nativescript-angular-scoped.tgz",
25-
"nativescript-intl": "~3.0.0",
2625
"nativescript-theme-core": "^1.0.4",
2726
"reflect-metadata": "~0.1.8",
2827
"rxjs": "~6.5.5",

nativescript-angular-package/platform-static.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
// Bootstrap helper module for jasmine spec tests
22
import "@nativescript/angular/platform";
3-
import "@nativescript/angular/zone-js/dist/zone-nativescript.jasmine.js";
3+
// import "@nativescript/angular/zone-js/dist/zone-nativescript.jasmine.js";
4+
import '@nativescript/zone-js';
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
import "@nativescript/angular/platform";
2-
import "@nativescript/angular/zone-js/dist/zone-nativescript.mocha.js";
2+
// import "@nativescript/angular/zone-js/dist/zone-nativescript.mocha.js";
3+
import '@nativescript/zone-js';

0 commit comments

Comments
 (0)