From ffca755c9740e577bc22acf4153d4f97baa02ad4 Mon Sep 17 00:00:00 2001 From: Manol Donev Date: Mon, 6 Aug 2018 18:08:31 +0300 Subject: [PATCH] chore: update demos inherit from supportlib activity --- demo/AngularApp/app/activity.android.ts | 2 +- demo/AngularApp/webpack.config.js | 5 ++++- demo/JavaScriptApp/app/activity.android.js | 4 ++-- demo/JavaScriptApp/webpack.config.js | 4 +++- demo/TypeScriptApp/app/activity.android.ts | 2 +- demo/TypeScriptApp/webpack.config.js | 4 +++- 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/demo/AngularApp/app/activity.android.ts b/demo/AngularApp/app/activity.android.ts index f04e39bd..9a20899f 100644 --- a/demo/AngularApp/app/activity.android.ts +++ b/demo/AngularApp/app/activity.android.ts @@ -1,7 +1,7 @@ import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame"; @JavaProxy("org.myApp.MainActivity") -class Activity extends android.app.Activity { +class Activity extends android.support.v7.app.AppCompatActivity { private _callbacks: AndroidActivityCallbacks; protected onCreate(savedInstanceState: any): void { // android.os.Bundle diff --git a/demo/AngularApp/webpack.config.js b/demo/AngularApp/webpack.config.js index 6f96e0e7..29cb9f93 100644 --- a/demo/AngularApp/webpack.config.js +++ b/demo/AngularApp/webpack.config.js @@ -41,6 +41,7 @@ module.exports = env => { snapshot, // --env.snapshot uglify, // --env.uglify report, // --env.report + sourceMap, // --env.sourceMap } = env; const appFullPath = resolve(projectRoot, appPath); @@ -98,7 +99,7 @@ module.exports = env => { "fs": "empty", "__dirname": false, }, - devtool: "none", + devtool: sourceMap ? "inline-source-map" : "none", optimization: { splitChunks: { cacheGroups: { @@ -196,6 +197,7 @@ module.exports = env => { // Define useful constants like TNS_WEBPACK new webpack.DefinePlugin({ "global.TNS_WEBPACK": "true", + "process": undefined, }), // Remove all files from the out dir. new CleanWebpackPlugin([ `${dist}/**/*` ]), @@ -227,6 +229,7 @@ module.exports = env => { entryModule: resolve(appPath, "app.module#AppModule"), tsConfigPath: join(__dirname, "tsconfig.esm.json"), skipCodeGeneration: !aot, + sourceMap: !!sourceMap, }), // Does IPC communication with the {N} CLI to notify events when running in watch mode. new nsWebpack.WatchStateLoggerPlugin(), diff --git a/demo/JavaScriptApp/app/activity.android.js b/demo/JavaScriptApp/app/activity.android.js index c5013fd5..253f00b3 100644 --- a/demo/JavaScriptApp/app/activity.android.js +++ b/demo/JavaScriptApp/app/activity.android.js @@ -1,7 +1,7 @@ const frame = require("ui/frame"); -const superProto = android.app.Activity.prototype; -android.app.Activity.extend("org.myApp.MainActivity", { +const superProto = android.support.v7.app.AppCompatActivity.prototype; +android.support.v7.app.AppCompatActivity.extend("org.myApp.MainActivity", { onCreate: function(savedInstanceState) { if(!this._callbacks) { frame.setActivityCallbacks(this); diff --git a/demo/JavaScriptApp/webpack.config.js b/demo/JavaScriptApp/webpack.config.js index 64ea43c1..7f984555 100644 --- a/demo/JavaScriptApp/webpack.config.js +++ b/demo/JavaScriptApp/webpack.config.js @@ -40,6 +40,7 @@ module.exports = env => { snapshot, // --env.snapshot uglify, // --env.uglify report, // --env.report + sourceMap, // --env.sourceMap } = env; const appFullPath = resolve(projectRoot, appPath); @@ -95,7 +96,7 @@ module.exports = env => { "fs": "empty", "__dirname": false, }, - devtool: "none", + devtool: sourceMap ? "inline-source-map" : "none", optimization: { splitChunks: { cacheGroups: { @@ -171,6 +172,7 @@ module.exports = env => { // Define useful constants like TNS_WEBPACK new webpack.DefinePlugin({ "global.TNS_WEBPACK": "true", + "process": undefined, }), // Remove all files from the out dir. new CleanWebpackPlugin([ `${dist}/**/*` ]), diff --git a/demo/TypeScriptApp/app/activity.android.ts b/demo/TypeScriptApp/app/activity.android.ts index f04e39bd..9a20899f 100644 --- a/demo/TypeScriptApp/app/activity.android.ts +++ b/demo/TypeScriptApp/app/activity.android.ts @@ -1,7 +1,7 @@ import {setActivityCallbacks, AndroidActivityCallbacks} from "ui/frame"; @JavaProxy("org.myApp.MainActivity") -class Activity extends android.app.Activity { +class Activity extends android.support.v7.app.AppCompatActivity { private _callbacks: AndroidActivityCallbacks; protected onCreate(savedInstanceState: any): void { // android.os.Bundle diff --git a/demo/TypeScriptApp/webpack.config.js b/demo/TypeScriptApp/webpack.config.js index 3c2bd1e1..2e4c3df9 100644 --- a/demo/TypeScriptApp/webpack.config.js +++ b/demo/TypeScriptApp/webpack.config.js @@ -40,6 +40,7 @@ module.exports = env => { snapshot, // --env.snapshot uglify, // --env.uglify report, // --env.report + sourceMap, // --env.sourceMap } = env; const appFullPath = resolve(projectRoot, appPath); @@ -97,7 +98,7 @@ module.exports = env => { "fs": "empty", "__dirname": false, }, - devtool: "none", + devtool: sourceMap ? "inline-source-map" : "none", optimization: { splitChunks: { cacheGroups: { @@ -181,6 +182,7 @@ module.exports = env => { // Define useful constants like TNS_WEBPACK new webpack.DefinePlugin({ "global.TNS_WEBPACK": "true", + "process": undefined, }), // Remove all files from the out dir. new CleanWebpackPlugin([ `${dist}/**/*` ]),