From 7f1e9e3c45625c7e7a6ffbec068daceeb03d00ed Mon Sep 17 00:00:00 2001 From: Kean Mariotti Date: Tue, 5 Jul 2022 08:37:29 +0000 Subject: [PATCH] enable Angular production mode Test: npm run build:prod Change-Id: Iadfe6f81b0cfb611aa6b9266a08424927d82c5d1 --- tools/winscope-ng/src/main.dev.ts | 20 +++++++++++++++++++ .../winscope-ng/src/{main.ts => main.prod.ts} | 20 ++++--------------- tools/winscope-ng/webpack.config.common.js | 5 ----- tools/winscope-ng/webpack.config.dev.js | 4 ++++ tools/winscope-ng/webpack.config.prod.js | 4 ++++ 5 files changed, 32 insertions(+), 21 deletions(-) create mode 100644 tools/winscope-ng/src/main.dev.ts rename tools/winscope-ng/src/{main.ts => main.prod.ts} (53%) diff --git a/tools/winscope-ng/src/main.dev.ts b/tools/winscope-ng/src/main.dev.ts new file mode 100644 index 000000000..134f523ff --- /dev/null +++ b/tools/winscope-ng/src/main.dev.ts @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import {platformBrowserDynamic} from "@angular/platform-browser-dynamic"; +import {AppModule} from "./app/app.module"; + +platformBrowserDynamic().bootstrapModule(AppModule) + .catch(err => console.error(err)); diff --git a/tools/winscope-ng/src/main.ts b/tools/winscope-ng/src/main.prod.ts similarity index 53% rename from tools/winscope-ng/src/main.ts rename to tools/winscope-ng/src/main.prod.ts index 0006f738d..d418def2a 100644 --- a/tools/winscope-ng/src/main.ts +++ b/tools/winscope-ng/src/main.prod.ts @@ -13,23 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import {enableProdMode} from "@angular/core"; +import {platformBrowserDynamic} from "@angular/platform-browser-dynamic"; +import {AppModule} from "./app/app.module"; -/* - * For easier debugging in development mode, you can import the following file - * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`. - * - * This import should be commented out in production mode because it will have a negative impact - * on performance if an error is thrown. - */ -// import 'zone.js/plugins/zone-error'; // Included with Angular CLI. - -import { enableProdMode } from '@angular/core'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; - -import { AppModule } from './app/app.module'; - -//TODO: implement production mode switch -//enableProdMode(); +enableProdMode(); platformBrowserDynamic().bootstrapModule(AppModule) .catch(err => console.error(err)); diff --git a/tools/winscope-ng/webpack.config.common.js b/tools/winscope-ng/webpack.config.common.js index ca3549580..2eaf8ba80 100644 --- a/tools/winscope-ng/webpack.config.common.js +++ b/tools/winscope-ng/webpack.config.common.js @@ -17,11 +17,6 @@ const path = require('path'); const HtmlWebpackPlugin = require('html-webpack-plugin'); module.exports = { - entry: { - polyfills: "./src/polyfills.ts", - app: "./src/main.ts" - }, - resolve: { extensions: [".ts", ".js"], modules: [ diff --git a/tools/winscope-ng/webpack.config.dev.js b/tools/winscope-ng/webpack.config.dev.js index 16260d7cf..cc17c0065 100644 --- a/tools/winscope-ng/webpack.config.dev.js +++ b/tools/winscope-ng/webpack.config.dev.js @@ -18,6 +18,10 @@ const configCommon = require('./webpack.config.common'); const configDev = { mode: 'development', + entry: { + polyfills: "./src/polyfills.ts", + app: "./src/main.dev.ts" + }, devtool: "source-map", }; diff --git a/tools/winscope-ng/webpack.config.prod.js b/tools/winscope-ng/webpack.config.prod.js index a48f9a79d..2b2ab913e 100644 --- a/tools/winscope-ng/webpack.config.prod.js +++ b/tools/winscope-ng/webpack.config.prod.js @@ -21,6 +21,10 @@ const HtmlWebpackInlineSourcePlugin = require('html-webpack-inline-source-plugin const configProd = { mode: 'production', + entry: { + polyfills: "./src/polyfills.ts", + app: "./src/main.prod.ts" + }, output: { path: path.resolve(__dirname, 'dist'), publicPath: '/',