Skip to content

feat(deps): update to NativeScript 2.5.0 #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2017
Merged

feat(deps): update to NativeScript 2.5.0 #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
212 changes: 106 additions & 106 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,109 +1,109 @@
{
"name": "nativescript-sdk-examples-ng",
"description": "NativeScript & Angular 2 SDK Examples",
"author": "Telerik <[email protected]>",
"version": "0.1.0",
"homepage": "https://github.com/NativeScript/nativescript-sdk-examples-ng",
"repository": {
"type": "git",
"url": "https://github.com/NativeScript/nativescript-sdk-examples-ng"
"name": "nativescript-sdk-examples-ng",
"description": "NativeScript & Angular 2 SDK Examples",
"author": "Telerik <[email protected]>",
"version": "0.1.0",
"homepage": "https://github.com/NativeScript/nativescript-sdk-examples-ng",
"repository": {
"type": "git",
"url": "https://github.com/NativeScript/nativescript-sdk-examples-ng"
},
"bugs": {
"url": "https://github.com/NativeScript/nativescript-sdk-examples-ng/issues"
},
"keywords": [
"NativeScript",
"Angular",
"SDK",
"example",
"documentation"
],
"license": "Apache-2.0",
"nativescript": {
"id": "org.nativescript.nativescriptsdkexamplesng",
"tns-ios": {
"version": "2.5.0"
},
"bugs": {
"url": "https://github.com/NativeScript/nativescript-sdk-examples-ng/issues"
},
"keywords": [
"NativeScript",
"Angular",
"SDK",
"example",
"documentation"
],
"license": "Apache-2.0",
"nativescript": {
"id": "org.nativescript.nativescriptsdkexamplesng",
"tns-ios": {
"version": "2.4.0"
},
"tns-android": {
"version": "2.4.1"
}
},
"dependencies": {
"@angular/common": "2.4.3",
"@angular/compiler": "2.4.3",
"@angular/core": "2.4.3",
"@angular/forms": "2.4.3",
"@angular/http": "2.4.3",
"@angular/platform-browser": "2.4.3",
"@angular/platform-browser-dynamic": "2.4.3",
"@angular/router": "3.4.3",
"nativescript-angular": "next",
"nativescript-camera": "0.0.7",
"nativescript-geolocation": "0.0.14",
"nativescript-googlemaps": "0.0.6",
"nativescript-intl": "~0.0.6",
"nativescript-theme-core": "^1.0.0",
"reflect-metadata": "~0.1.8",
"rxjs": "~5.0.1",
"tns-core-modules": "2.4.4"
},
"devDependencies": {
"@angular/compiler-cli": "2.4.3",
"@ngtools/webpack": "1.2.1",
"babel-traverse": "6.11.4",
"babel-types": "6.11.1",
"babylon": "6.8.4",
"codelyzer": "~2.0.0-beta.3",
"copy-webpack-plugin": "~3.0.1",
"css-loader": "~0.26.0",
"extract-text-webpack-plugin": "2.0.0-beta.5",
"fs-extra": "^0.30.0",
"glob": "^7.0.5",
"lazy": "1.0.11",
"markdown-snippet-injector": "^0.2.0",
"nativescript-dev-typescript": "https://github.com/NativeScript/nativescript-dev-typescript.git#master",
"nativescript-dev-webpack": "^0.3.0",
"opener": "^1.4.1",
"raw-loader": "~0.5.1",
"resolve-url-loader": "~1.6.0",
"rimraf": "^2.5.3",
"tar.gz": "^1.0.5",
"tns-platform-declarations": "^2.4.0",
"tslint": "~4.0.2",
"typescript": "~2.1.0",
"webpack": "~2.1.0-beta.27",
"webpack-sources": "~0.1.3",
"zone.js": "~0.7.2",
"nativescript-css-loader": "~0.26.0",
"htmlparser2": "^3.9.2"
},
"scripts": {
"pretsc": "npm install",
"tsc": "tsc",
"pretslint": "npm run tsc",
"tslint": "tslint -C tsconfig.json --project tslint.json",
"prebuild": "npm run tslint",
"build": "node scripts/build.js",
"postbuild": "npm run inject && npm run archive",
"inject": "mdinject --root=app --docsroot=dist/sdk-examples --sourceext=\".ts|.css|.html\" --snippettitles=\"TypeScript|CSS|HTML\"",
"archive": "node scripts/archive.js",
"prepush-to-github": "npm run build",
"push-to-github": "(cd dist/sdk-examples && rimraf .git && git init && git add -A && git commit -m \"nativescript-sdk-examples build preview\" && git remote add origin [email protected]:NativeScript/nativescript-sdk-examples-preview.git && git push -u --force origin master)",
"preshow-preview": "npm run push-to-github",
"show-preview": "opener https://github.com/NativeScript/nativescript-sdk-examples-preview",
"clean-android": "tns clean-app android",
"clean-ios": "tns clean-app ios",
"prewebpack-android": "npm run clean-android",
"prewebpack-ios": "npm run clean-ios",
"webpack-android": "webpack --config=webpack.android.js --progress",
"webpack-ios": "webpack --config=webpack.ios.js --progress",
"prestart-android-bundle": "npm run webpack-android",
"prestart-ios-bundle": "npm run webpack-ios",
"start-android-bundle": "tns run android --bundle --disable-npm-install",
"start-ios-bundle": "tns run ios --bundle --disable-npm-install",
"prebuild-android-bundle": "npm run webpack-android",
"prebuild-ios-bundle": "npm run webpack-ios",
"build-android-bundle": "tns build android --bundle --disable-npm-install",
"build-ios-bundle": "tns build ios --bundle --disable-npm-install"
"tns-android": {
"version": "2.5.0"
}
}
},
"dependencies": {
"@angular/common": "2.4.5",
"@angular/compiler": "2.4.5",
"@angular/core": "2.4.5",
"@angular/forms": "2.4.5",
"@angular/http": "2.4.5",
"@angular/platform-browser": "2.4.5",
"@angular/platform-browser-dynamic": "2.4.5",
"@angular/router": "3.4.5",
"nativescript-angular": "1.4.0",
"nativescript-camera": "0.0.7",
"nativescript-geolocation": "0.0.14",
"nativescript-googlemaps": "0.0.6",
"nativescript-intl": "~0.0.6",
"nativescript-theme-core": "^1.0.0",
"reflect-metadata": "~0.1.8",
"rxjs": "~5.0.1",
"tns-core-modules": "2.5.0"
},
"devDependencies": {
"@angular/compiler-cli": "2.4.5",
"@ngtools/webpack": "1.2.4",
"babel-traverse": "6.11.4",
"babel-types": "6.11.1",
"babylon": "6.8.4",
"codelyzer": "~2.0.0-beta.3",
"copy-webpack-plugin": "~3.0.1",
"css-loader": "~0.26.0",
"extract-text-webpack-plugin": "~2.0.0-beta.5",
"fs-extra": "^0.30.0",
"glob": "^7.0.5",
"lazy": "1.0.11",
"markdown-snippet-injector": "^0.2.0",
"nativescript-dev-typescript": "^0.3.2",
"nativescript-dev-webpack": "^0.3.0",
"opener": "^1.4.1",
"raw-loader": "~0.5.1",
"resolve-url-loader": "~1.6.0",
"rimraf": "^2.5.3",
"tar.gz": "^1.0.5",
"tns-platform-declarations": "^2.4.0",
"tslint": "~4.0.2",
"typescript": "~2.1.0",
"webpack": "2.2.0",
"webpack-sources": "~0.1.3",
"zone.js": "~0.7.2",
"nativescript-css-loader": "~0.26.0",
"htmlparser2": "^3.9.2"
},
"scripts": {
"pretsc": "npm install",
"tsc": "tsc",
"pretslint": "npm run tsc",
"tslint": "tslint -C tsconfig.json --project tslint.json",
"prebuild": "npm run tslint",
"build": "node scripts/build.js",
"postbuild": "npm run inject && npm run archive",
"inject": "mdinject --root=app --docsroot=dist/sdk-examples --sourceext=\".ts|.css|.html\" --snippettitles=\"TypeScript|CSS|HTML\"",
"archive": "node scripts/archive.js",
"prepush-to-github": "npm run build",
"push-to-github": "(cd dist/sdk-examples && rimraf .git && git init && git add -A && git commit -m \"nativescript-sdk-examples build preview\" && git remote add origin [email protected]:NativeScript/nativescript-sdk-examples-preview.git && git push -u --force origin master)",
"preshow-preview": "npm run push-to-github",
"show-preview": "opener https://github.com/NativeScript/nativescript-sdk-examples-preview",
"clean-android": "tns clean-app android",
"clean-ios": "tns clean-app ios",
"prewebpack-android": "npm run clean-android",
"prewebpack-ios": "npm run clean-ios",
"webpack-android": "webpack --config=webpack.android.js --progress",
"webpack-ios": "webpack --config=webpack.ios.js --progress",
"prestart-android-bundle": "npm run webpack-android",
"prestart-ios-bundle": "npm run webpack-ios",
"start-android-bundle": "tns run android --bundle --disable-npm-install",
"start-ios-bundle": "tns run ios --bundle --disable-npm-install",
"prebuild-android-bundle": "npm run webpack-android",
"prebuild-ios-bundle": "npm run webpack-ios",
"build-android-bundle": "tns build android --bundle --disable-npm-install",
"build-ios-bundle": "tns build ios --bundle --disable-npm-install"
}
}
17 changes: 11 additions & 6 deletions webpack.common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ module.exports = function (platform, destinationApp) {
}),
//Define useful constants like TNS_WEBPACK
new webpack.DefinePlugin({
global: "global",
__dirname: "__dirname",
"global.TNS_WEBPACK": "true",
}),
//Copy assets to out dir. Add your own globs as needed.
Expand All @@ -45,26 +43,32 @@ module.exports = function (platform, destinationApp) {
"./vendor",
"./bundle",
]),

// Exclude explicitly required but never declared in XML elements.
// Loader nativescript-dev-webpack/tns-xml-loader should be added for *.xml/html files.
// Loader nativescript-dev-webpack/tns-xml-loader should be added for *.xml/html and *.ts files.
new nsWebpack.ExcludeUnusedElementsPlugin(),

//Angular AOT compiler
new AotPlugin({
tsConfigPath: "tsconfig.aot.json",
entryModule: path.resolve(__dirname, "app/app.module#AppModule"),
typeChecking: false
}),
new nsWebpack.StyleUrlResolvePlugin({platform}),
];

if (process.env.npm_config_uglify) {
plugins.push(new webpack.LoaderOptionsPlugin({
minimize: true
}));

//Work around an Android issue by setting compress = false
var compress = platform !== "android";
plugins.push(new webpack.optimize.UglifyJsPlugin({
mangle: {
except: nsWebpack.uglifyMangleExcludes,
},
compress: compress,
comments: false
}));
}

Expand Down Expand Up @@ -107,15 +111,15 @@ module.exports = function (platform, destinationApp) {
test: /\.html$|\.xml$/,
loaders: [
"raw-loader",
'nativescript-dev-webpack/tns-xml-loader'
"nativescript-dev-webpack/tns-xml-loader",
]
},
// Root app.css file gets extracted with bundled dependencies
{
test: /app\.css$/,
loader: ExtractTextPlugin.extract([
"resolve-url-loader",
"css-loader",
"nativescript-css-loader",
"nativescript-dev-webpack/platform-css-loader",
]),
},
Expand All @@ -131,6 +135,7 @@ module.exports = function (platform, destinationApp) {
{
test: /\.ts$/,
loaders: [
"nativescript-dev-webpack/tns-xml-loader",
"nativescript-dev-webpack/tns-aot-loader",
"@ngtools/webpack",
]
Expand Down