Jun 27, 2020 · Jun 28, 2020 · Jul 3, 2020 · Jul 3, 2020 · Jul 3, 2020 · Sep 28, 2020
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md

 First of all, thank you for taking the time to contribute!

 Before starting, make yourself familiar with the `nativescript-dev-webpack`'s [documentation](http://docs.nativescript.org/best-practices/bundling-with-webpack) and the official [NativeScript Code Of Conduct]( https://github.com/NativeScript/codeofconduct).
 Before starting, make yourself familiar with the `@nativescript/webpack`'s [documentation](http://docs.nativescript.org/best-practices/bundling-with-webpack) and the official [NativeScript Code Of Conduct]( https://github.com/NativeScript/codeofconduct).

 ## Project Structure

    cd demo/AngularApp
    ```

 2. Install your local copy of the `nativescript-dev-webpack` plugin.
 2. Install your local copy of the `@nativescript/webpack` plugin.
    ```bash
    npm run setup
    ```
diff --git a/PULL_REQUEST_TESTS.md b/PULL_REQUEST_TESTS.md
 |Comment                 |Commit Status Context|Description|
 |:----------------------:|:-------------------:|:---------:|
 |`run ci`                |                     |Run all below.|
 |`js`|ci/jenkins/webpack-js|Pack the *nativescript-dev-webpack* plugin and bundle the [template-hello-world](https://github.com/NativeScript/template-hello-world) template app.      |
 |`ts`|ci/jenkins/webpack-ts|Pack the *nativescript-dev-webpack* plugin and bundle the [template-hello-world-ts](https://github.com/NativeScript/template-hello-world-ts) template app.|
 |`ng`|ci/jenkins/webpack-ng|Pack the *nativescript-dev-webpack* plugin and bundle the [template-hello-world-ng](https://github.com/NativeScript/template-hello-world-ng) template app.|
 |`groceries`|ci/jenkins/webpack-groceries|Pack the *nativescript-dev-webpack* plugin and bundle the [Groceries](https://github.com/NativeScript/sample-Groceries) app.                |
 |`sdk`|ci/jenkins/webpack-sdk|Pack the *nativescript-dev-webpack* plugin and bundle the [SDK](https://github.com/NativeScript/nativescript-sdk-examples-ng) app.                      |
 |`testsappng`|ci/jenkins/webpack-testsappng|Pack the *nativescript-dev-webpack* plugin and bundle the [tests-app-ng](https://github.com/NativeScript/tests-app-ng) app.                    |
 |`js`|ci/jenkins/webpack-js|Pack the *@nativescript/webpack* plugin and bundle the [template-hello-world](https://github.com/NativeScript/template-hello-world) template app.      |
 |`ts`|ci/jenkins/webpack-ts|Pack the *@nativescript/webpack* plugin and bundle the [template-hello-world-ts](https://github.com/NativeScript/template-hello-world-ts) template app.|
 |`ng`|ci/jenkins/webpack-ng|Pack the *@nativescript/webpack* plugin and bundle the [template-hello-world-ng](https://github.com/NativeScript/template-hello-world-ng) template app.|
 |`groceries`|ci/jenkins/webpack-groceries|Pack the *@nativescript/webpack* plugin and bundle the [Groceries](https://github.com/NativeScript/sample-Groceries) app.                |
 |`sdk`|ci/jenkins/webpack-sdk|Pack the *@nativescript/webpack* plugin and bundle the [SDK](https://github.com/NativeScript/nativescript-sdk-examples-ng) app.                      |
 |`testsappng`|ci/jenkins/webpack-testsappng|Pack the *@nativescript/webpack* plugin and bundle the [tests-app-ng](https://github.com/NativeScript/tests-app-ng) app.                    |
diff --git a/README.md b/README.md
 # NativeScript Webpack

 This repository contains the code for the nativescript-dev-webpack plugin which helps in webpacking [NativeScript](https://www.nativescript.org/) apps.
 This repository contains the code for the@nativescript/webpack plugin which helps in webpacking [NativeScript](https://www.nativescript.org/) apps.

 JavaScript code and general asset bundling have been a member of the web developer toolbox for a long time. Tools like Webpack have been providing support for an enjoyable development experience that lets you assemble client-side code from various module sources and formats and then package it together. Most importantly, they allow for page load time optimizations that reduce or parallelize the number of requests a browser makes to the server.

 ## Usage

 ```sh
 $ npm install --save-dev nativescript-dev-webpack
 $ npm install --save-dev@nativescript/webpack

 $ tns run android
 or
diff --git a/android-app-components-loader.js b/android-app-components-loader.js
    const imports = modules.map(convertSlashesInPath)
        .map(m => `require("${m}");`).join("\n");
    const augmentedSource = `
        let applicationCheckPlatform = require("tns-core-modules/application");
        let applicationCheckPlatform = require("@nativescript/core/application");
        if (applicationCheckPlatform.android && !global["__snapshot"]) {
            ${imports}
        }
diff --git a/apply-css-loader.js b/apply-css-loader.js
    }

    content += `
    const application = require("tns-core-modules/application");
    require("tns-core-modules/ui/styling/style-scope");
    const application = require("@nativescript/core/application");
    require("@nativescript/core/ui/styling/style-scope");

    if (typeof exports.forEach === "function") {
        exports.forEach(cssExport => {
diff --git a/bundle-config-loader.ts b/bundle-config-loader.ts

    if (!registerModules) {
        registerModules = defaultMatch;
        for (const key in ignoredFiles) {
        for (const key in<any>ignoredFiles) {
            registerModules = `(?<!${escapeRegExp(ignoredFiles[key])})` + registerModules;
        }
        registerModules = new RegExp(registerModules);
        registerModules =<any>new RegExp(registerModules);
    }

    if (unitTesting) {

    const hmr = `
        if (module.hot) {
            const hmrUpdate = require("nativescript-dev-webpack/hmr").hmrUpdate;
            const hmrUpdate = require("@nativescript/webpack/hmr").hmrUpdate;
            global.__coreModulesLiveSync = global.__onLiveSync;

            global.__onLiveSync = function () {
        }
        `;

    let sourceModule = "tns-core-modules";
    let sourceModule = "@nativescript/core";

    if (platform && platform !== "ios" && platform !== "android") {
        sourceModule = `nativescript-platform-${platform}`;
        source = `
            require("${
            angular ?
                'nativescript-dev-webpack/load-application-css-angular' :
                'nativescript-dev-webpack/load-application-css-regular'
                '@nativescript/webpack/load-application-css-angular' :
                '@nativescript/webpack/load-application-css-regular'
            }")();
            ${source}
        `;
diff --git a/css2json-loader.spec.ts b/css2json-loader.spec.ts
    it("inlines css2json loader in imports if option is provided", (done) => {
        const loaderContext = {
            callback: (error, source: string, map) => {
                expect(source).toContain(`global.registerModule("./custom.css", () => require("!nativescript-dev-webpack/css2json-loader?useForImports!./custom.css"))`);
                expect(source).toContain(`global.registerModule("./custom.css", () => require("!@nativescript/webpack/css2json-loader?useForImports!./custom.css"))`);
                expect(source).toContain(`{"type":"declaration","property":"background-color","value":"#7f9"}`);

                done();
diff --git a/css2json-loader.ts b/css2json-loader.ts

 const betweenQuotesPattern = /('|")(.*?)\1/;
 const unpackUrlPattern = /url\(([^\)]+)\)/;
 const inlineLoader = "!nativescript-dev-webpack/css2json-loader?useForImports!"
 const inlineLoader = "!@nativescript/webpack/css2json-loader?useForImports!"

 const loader: loader.Loader = function (content: string, map) {
    const options = getOptions(this) || {};
            }
        });
    const str = JSON.stringify(ast, (k, v) => k === "position" ? undefined : v);
    this.callback(null, `${dependencies.join("\n")}module.exports = ${str};`, map);
    this.callback(null, `${dependencies.join("\n")}module.exports = ${str};`);
 }

 function getImportRules(ast: Stylesheet): Import[] {
diff --git a/demo/AngularApp/app/activity.android.ts b/demo/AngularApp/app/activity.android.ts
 import { setActivityCallbacks, AndroidActivityCallbacks } from "tns-core-modules/ui/frame";
 import { setActivityCallbacks, AndroidActivityCallbacks } from "@nativescript/core/ui/frame";

 @JavaProxy("org.myApp.MainActivity")
 class Activity extends androidx.appcompat.app.AppCompatActivity {
diff --git a/demo/AngularApp/app/app.module.ts b/demo/AngularApp/app/app.module.ts
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptModule } from "nativescript-angular/nativescript.module";
 import { NativeScriptModule } from "@nativescript/angular";
 import { AppRoutingModule } from "./app.routing";
 import { AppComponent } from "./app.component";

 // import { PlayfulSpirit } from "./directive";

 // Uncomment and add to NgModule imports if you need to use two-way binding
 // import { NativeScriptFormsModule } from "nativescript-angular/forms";
 // import { NativeScriptFormsModule } from "@nativescript/angular";

 // Uncomment and add to NgModule imports  if you need to use the HTTP wrapper
 // import { NativeScriptHttpModule } from "nativescript-angular/http";
 // import { NativeScriptHttpModule } from "@nativescript/angular";

 @NgModule({
    bootstrap: [
diff --git a/demo/AngularApp/app/app.routing.ts b/demo/AngularApp/app/app.routing.ts
 import { NgModule } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
 import { NativeScriptRouterModule } from "@nativescript/angular";
 import { Routes } from "@angular/router";

 import { ItemsComponent } from "./item/items.component";
    { path: "item/:id", component: ItemDetailComponent },
    {
        path: "ninjas",
        loadChildren: "./ninjas/ninjas.module#NinjasModule",
        loadChildren:() => import("./ninjas/ninjas.module").then(m => m.NinjasModule)
    },

 ];
diff --git a/demo/AngularApp/app/main.aot.ts b/demo/AngularApp/app/main.aot.ts
diff --git a/demo/AngularApp/app/main.ts b/demo/AngularApp/app/main.ts
 // this import should be first in order to load some required settings (like globals and reflect-metadata)
 import {platformNativeScriptDynamic } from "nativescript-angular/platform";
 import {platformNativeScript } from "@nativescript/angular";
 import { AppModule } from "./app.module";

 platformNativeScriptDynamic().bootstrapModule(AppModule);
 platformNativeScript().bootstrapModule(AppModule);
diff --git a/demo/AngularApp/app/ninjas/details/ninja.module.ts b/demo/AngularApp/app/ninjas/details/ninja.module.ts
 import { NativeScriptCommonModule} from "nativescript-angular/common";
 import { NativeScriptCommonModule, NativeScriptRouterModule} from "@nativescript/angular";
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";

 import { NinjaComponent } from "./ninja.component";
 import { routes } from "./ninja.routes";
diff --git a/demo/AngularApp/app/ninjas/ninjas.module.ts b/demo/AngularApp/app/ninjas/ninjas.module.ts
 import { NativeScriptCommonModule} from "nativescript-angular/common";
 import { NativeScriptCommonModule, NativeScriptRouterModule} from "@nativescript/angular";
 import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
 import { NativeScriptRouterModule } from "nativescript-angular/router";

 import { NinjasComponent } from "./ninjas.component";
 import { routes } from "./ninjas.routes";
diff --git a/demo/AngularApp/package.json b/demo/AngularApp/package.json
    }
  },
  "dependencies": {
    "@angular/common": "8.2.0",
    "@angular/compiler": "8.2.0",
    "@angular/core": "8.2.0",
    "@angular/forms": "8.2.0",
    "@angular/platform-browser": "8.2.0",
    "@angular/platform-browser-dynamic": "8.2.0",
    "@angular/router": "8.2.0",
    "nativescript-angular": "next",
    "@angular/common": "~10.0.0",
    "@angular/compiler": "~10.0.0",
    "@angular/core": "~10.0.0",
    "@angular/forms": "~10.0.0",
    "@angular/platform-browser": "~10.0.0",
    "@angular/platform-browser-dynamic": "~10.0.0",
    "@angular/router": "~10.0.0",
    "@nativescript/angular": "next",
    "@nativescript/core": "next",
    "nativescript-theme-core": "~1.0.2",
    "reflect-metadata": "~0.1.8",
    "rxjs": "^6.3.3",
    "tns-core-modules": "next",
    "zone.js": "^0.9.1"
    "rxjs": "^6.5.5",
    "zone.js": "^0.10.3"
  },
  "devDependencies": {
    "@angular/compiler-cli": "8.2.0",
    "@ngtools/webpack": "8.2.0",
    "@angular/compiler-cli": "~10.0.0",
    "@ngtools/webpack": "~10.0.0",
    "@types/chai": "~4.1.7",
    "@types/mocha": "~5.2.5",
    "@types/node": "~10.12.18",
    "chai": "4.2.0",
    "mochawesome": "~3.1.2",
    "nativescript-dev-appium": "next",
    "nativescript-dev-webpack": "next",
    "@nativescript/webpack": "next",
    "node-sass": "^4.12.0",
    "typescript": "~3.5.3"
    "typescript": "~3.9.0"
  },
  "scripts": {
    "setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
    "setup": "npm pack ../../ && npm i -D nativescript-webpack*.tgz",
    "e2e": "tsc -p e2e && mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json",
    "compile-tests": "tsc -p e2e --watch"
  }
diff --git a/demo/AngularApp/tsconfig.json b/demo/AngularApp/tsconfig.json
        "paths": {
            "~/*": [
                "app/*"
            ],
            "*": [
                "./node_modules/tns-core-modules/*",
                "./node_modules/*"
            ]
        }
    },
diff --git a/demo/JavaScriptApp/app/activity.android.js b/demo/JavaScriptApp/app/activity.android.js
 const frame = require("tns-core-modules/ui/frame");
 const frame = require("@nativescript/core/ui/frame");

 const superProto = androidx.appcompat.app.AppCompatActivity.prototype;
 androidx.appcompat.app.AppCompatActivity.extend("org.myApp.MainActivity", {
diff --git a/demo/JavaScriptApp/app/app.js b/demo/JavaScriptApp/app/app.js
 purpose of the file is to pass control to the app’s first module.
 */

 var application = require("tns-core-modules/application");
 var application = require("@nativescript/core/application");

 application.run({ moduleName: "app-root" });

diff --git a/demo/JavaScriptApp/app/main-page.android.js b/demo/JavaScriptApp/app/main-page.android.js
 var frameModule = require("tns-core-modules/ui/frame");
 var frameModule = require("@nativescript/core/ui/frame");
 var createViewModel = require("./main-view-model").createViewModel;

 function onNavigatingTo(args) {
diff --git a/demo/JavaScriptApp/app/main-page.ios.js b/demo/JavaScriptApp/app/main-page.ios.js
 var frameModule = require("tns-core-modules/ui/frame");
 var frameModule = require("@nativescript/core/ui/frame");
 var createViewModel = require("./main-view-model").createViewModel;

 function onNavigatingTo(args) {
diff --git a/demo/JavaScriptApp/app/main-view-model.js b/demo/JavaScriptApp/app/main-view-model.js
 var Observable = require("tns-core-modules/data/observable").Observable;
 var Observable = require("@nativescript/core/data/observable").Observable;

 function getMessage(counter) {
    if (counter <= 0) {
diff --git a/demo/JavaScriptApp/app/references.d.ts b/demo/JavaScriptApp/app/references.d.ts
diff --git a/demo/JavaScriptApp/package.json b/demo/JavaScriptApp/package.json
  },
  "dependencies": {
    "nativescript-theme-core": "~1.0.2",
    "tns-core-modules": "next"
    "@nativescript/core": "~6.5.8"
  },
  "devDependencies": {
    "@types/chai": "~4.1.7",
    "mocha": "~5.2.0",
    "mochawesome": "~3.1.2",
    "nativescript-dev-appium": "next",
    "nativescript-dev-webpack": "next",
    "@nativescript/webpack": "next",
    "node-sass": "4.12.0"
  },
  "scripts": {
    "setup": "npm pack ../../ && npm i -D nativescript-dev-webpack*.tgz",
    "setup": "npm pack ../../ && npm i -D nativescript-webpack*.tgz",
    "e2e": "mocha --opts ../config/mocha.opts --recursive e2e --appiumCapsLocation ../config/appium.capabilities.json"
  }
 }
diff --git a/demo/TypeScriptApp/app/activity.android.ts b/demo/TypeScriptApp/app/activity.android.ts
 import {setActivityCallbacks, AndroidActivityCallbacks} from "tns-core-modules/ui/frame";
 import {setActivityCallbacks, AndroidActivityCallbacks} from "@nativescript/core/ui/frame";

 @JavaProxy("org.myApp.MainActivity")
 class Activity extends androidx.appcompat.app.AppCompatActivity {
diff --git a/demo/TypeScriptApp/app/app.ts b/demo/TypeScriptApp/app/app.ts
 purpose of the file is to pass control to the app’s first module.
 */

 import * as app from 'tns-core-modules/application';
 import * as app from '@nativescript/core/application';

 app.run({ moduleName: "app-root" });

diff --git a/demo/TypeScriptApp/app/main-page.android.ts b/demo/TypeScriptApp/app/main-page.android.ts
 logic, and to set up your page’s data binding.
 */

 import { EventData } from 'tns-core-modules/data/observable';
 import { Page } from 'tns-core-modules/ui/page';
 import { Label } from 'tns-core-modules/ui/label';
 import * as frameModule from 'tns-core-modules/ui/frame';
 import { EventData, Page, Label, Frame } from '@nativescript/core';
 import { HelloWorldModel } from './main-view-model';

 export function onNavigatingTo(args: EventData) {
 }

 export function goToSecondPage(args) {
    var topmost =frameModule.topmost();
    var topmost =Frame.topmost();
    topmost.navigate("views/second-page");
 }
diff --git a/demo/TypeScriptApp/app/main-page.ios.ts b/demo/TypeScriptApp/app/main-page.ios.ts
 logic, and to set up your page’s data binding.
 */

 import { EventData } from 'tns-core-modules/data/observable';
 import { Page } from 'tns-core-modules/ui/page';
 import { EventData, Page, Label, Frame } from '@nativescript/core';
 import { HelloWorldModel } from './main-view-model';
 import { Label } from 'tns-core-modules/ui/label';
 import * as frameModule from 'tns-core-modules/ui/frame';

 // Event handler for Page "navigatingTo" event attached in main-page.xml
 export function onNavigatingTo(args: EventData) {
 }

 export function goToSecondPage(args) {
    var topmost =frameModule.topmost();
    var topmost =Frame.topmost();
    topmost.navigate("views/second-page");
 }
diff --git a/demo/TypeScriptApp/app/main-view-model.ts b/demo/TypeScriptApp/app/main-view-model.ts
 import {Observable} from 'tns-core-modules/data/observable';
 import {Observable} from '@nativescript/core';

 export class HelloWorldModel extends Observable {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,7 +18,7 @@

		First of all, thank you for taking the time to contribute!

		Before starting, make yourself familiar with the `nativescript-dev-webpack`'s [documentation](http://docs.nativescript.org/best-practices/bundling-with-webpack) and the official [NativeScript Code Of Conduct]( https://github.com/NativeScript/codeofconduct).
		Before starting, make yourself familiar with the `@nativescript/webpack`'s [documentation](http://docs.nativescript.org/best-practices/bundling-with-webpack) and the official [NativeScript Code Of Conduct]( https://github.com/NativeScript/codeofconduct).

		## Project Structure

Expand DownExpand Up		@@ -67,7 +67,7 @@ NOTE: There are three test apps in the repository, located in the `/demo` direct
		cd demo/AngularApp
		```

		2. Install your local copy of the `nativescript-dev-webpack` plugin.
		2. Install your local copy of the `@nativescript/webpack` plugin.
		```bash
		npm run setup
		```
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,9 +3,9 @@ This document describes comment messages available to execute tests on pull requ
		\|Comment \|Commit Status Context\|Description\|
		\|:----------------------:\|:-------------------:\|:---------:\|
		\|`run ci` \| \|Run all below.\|
		\|`js`\|ci/jenkins/webpack-js\|Pack the nativescript-dev-webpack plugin and bundle the [template-hello-world](https://github.com/NativeScript/template-hello-world) template app. \|
		\|`ts`\|ci/jenkins/webpack-ts\|Pack the nativescript-dev-webpack plugin and bundle the [template-hello-world-ts](https://github.com/NativeScript/template-hello-world-ts) template app.\|
		\|`ng`\|ci/jenkins/webpack-ng\|Pack the nativescript-dev-webpack plugin and bundle the [template-hello-world-ng](https://github.com/NativeScript/template-hello-world-ng) template app.\|
		\|`groceries`\|ci/jenkins/webpack-groceries\|Pack the nativescript-dev-webpack plugin and bundle the [Groceries](https://github.com/NativeScript/sample-Groceries) app. \|
		\|`sdk`\|ci/jenkins/webpack-sdk\|Pack the nativescript-dev-webpack plugin and bundle the [SDK](https://github.com/NativeScript/nativescript-sdk-examples-ng) app. \|
		\|`testsappng`\|ci/jenkins/webpack-testsappng\|Pack the nativescript-dev-webpack plugin and bundle the [tests-app-ng](https://github.com/NativeScript/tests-app-ng) app. \|
		\|`js`\|ci/jenkins/webpack-js\|Pack the @nativescript/webpack plugin and bundle the [template-hello-world](https://github.com/NativeScript/template-hello-world) template app. \|
		\|`ts`\|ci/jenkins/webpack-ts\|Pack the @nativescript/webpack plugin and bundle the [template-hello-world-ts](https://github.com/NativeScript/template-hello-world-ts) template app.\|
		\|`ng`\|ci/jenkins/webpack-ng\|Pack the @nativescript/webpack plugin and bundle the [template-hello-world-ng](https://github.com/NativeScript/template-hello-world-ng) template app.\|
		\|`groceries`\|ci/jenkins/webpack-groceries\|Pack the @nativescript/webpack plugin and bundle the [Groceries](https://github.com/NativeScript/sample-Groceries) app. \|
		\|`sdk`\|ci/jenkins/webpack-sdk\|Pack the @nativescript/webpack plugin and bundle the [SDK](https://github.com/NativeScript/nativescript-sdk-examples-ng) app. \|
		\|`testsappng`\|ci/jenkins/webpack-testsappng\|Pack the @nativescript/webpack plugin and bundle the [tests-app-ng](https://github.com/NativeScript/tests-app-ng) app. \|
Original file line number	Diff line number	Diff line change
		@@ -1,6 +1,6 @@
		# NativeScript Webpack

		This repository contains the code for the nativescript-dev-webpack plugin which helps in webpacking [NativeScript](https://www.nativescript.org/) apps.
		This repository contains the code for the@nativescript/webpack plugin which helps in webpacking [NativeScript](https://www.nativescript.org/) apps.

		JavaScript code and general asset bundling have been a member of the web developer toolbox for a long time. Tools like Webpack have been providing support for an enjoyable development experience that lets you assemble client-side code from various module sources and formats and then package it together. Most importantly, they allow for page load time optimizations that reduce or parallelize the number of requests a browser makes to the server.

Expand DownExpand Up		@@ -31,7 +31,7 @@ For more details, see the [NativeScript docs for building with webpack](http://d
		## Usage

		```sh
		$ npm install --save-dev nativescript-dev-webpack
		$ npm install --save-dev@nativescript/webpack

		$ tns run android
		or
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,7 +6,7 @@ module.exports = function (source, map) {
		const imports = modules.map(convertSlashesInPath)
		.map(m => `require("${m}");`).join("\n");
		const augmentedSource = `
		let applicationCheckPlatform = require("tns-core-modules/application");
		let applicationCheckPlatform = require("@nativescript/core/application");
		if (applicationCheckPlatform.android && !global["__snapshot"]) {
		${imports}
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,8 +26,8 @@ module.exports = function (content, map) {
		}

		content += `
		const application = require("tns-core-modules/application");
		require("tns-core-modules/ui/styling/style-scope");
		const application = require("@nativescript/core/application");
		require("@nativescript/core/ui/styling/style-scope");

		if (typeof exports.forEach === "function") {
		exports.forEach(cssExport => {
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,10 +20,10 @@ const loader: loader.Loader = function (source, map) {

		if (!registerModules) {
		registerModules = defaultMatch;
		for (const key in ignoredFiles) {
		for (const key in<any>ignoredFiles) {
		registerModules = `(?<!${escapeRegExp(ignoredFiles[key])})` + registerModules;
		}
		registerModules = new RegExp(registerModules);
		registerModules =<any>new RegExp(registerModules);
Copy link Codex-Sep 28, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Opt for`as T` for type casting. This any casting seems dangerous and seemingly dances around the typings issues that exist here, while functionally identical to before, is it safe? Looks more like the upstream typings are not ideal for this Personally i'd opt for something more typesafe given the typings for`ignoredFiles`: letregisterModulesSafe:RegExp;if(!registerModules){registerModules=defaultMatch;// I assume you don't want to use a booleanif(Array.isArray(ignoredFiles)){for(constignoredFileofignoredFiles){registerModules+=`(?<!${escapeRegExp(ignoredFile)})`;}}elseif(typeofignoredFiles==="string"){registerModules+=`(?<!${escapeRegExp(ignoredFiles)})`;}registerModulesSafe=newRegExp(registerModules)asany;} Then you can more safely load this expression further down: }elseif(registerModules\|\|registerModulesSafe){...constcontext=require.context("~/",true,${registerModules\|\|registerModulesSafe});...}
		}

		if (unitTesting) {
Expand All		@@ -34,7 +34,7 @@ const loader: loader.Loader = function (source, map) {

		const hmr = `
		if (module.hot) {
		const hmrUpdate = require("nativescript-dev-webpack/hmr").hmrUpdate;
		const hmrUpdate = require("@nativescript/webpack/hmr").hmrUpdate;
		global.__coreModulesLiveSync = global.__onLiveSync;

		global.__onLiveSync = function () {
Expand All		@@ -54,7 +54,7 @@ const loader: loader.Loader = function (source, map) {
		}
		`;

		let sourceModule = "tns-core-modules";
		let sourceModule = "@nativescript/core";

		if (platform && platform !== "ios" && platform !== "android") {
		sourceModule = `nativescript-platform-${platform}`;
Expand DownExpand Up		@@ -88,8 +88,8 @@ const loader: loader.Loader = function (source, map) {
		source = `
		require("${
		angular ?
		'nativescript-dev-webpack/load-application-css-angular' :
		'nativescript-dev-webpack/load-application-css-regular'
		'@nativescript/webpack/load-application-css-angular' :
		'@nativescript/webpack/load-application-css-regular'
		}")();
		${source}
		`;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -52,7 +52,7 @@ describe("css2jsonLoader", () => {
		it("inlines css2json loader in imports if option is provided", (done) => {
		const loaderContext = {
		callback: (error, source: string, map) => {
		expect(source).toContain(`global.registerModule("./custom.css", () => require("!nativescript-dev-webpack/css2json-loader?useForImports!./custom.css"))`);
		expect(source).toContain(`global.registerModule("./custom.css", () => require("!@nativescript/webpack/css2json-loader?useForImports!./custom.css"))`);
		expect(source).toContain(`{"type":"declaration","property":"background-color","value":"#7f9"}`);

		done();
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,7 @@ import { getOptions, urlToRequest } from "loader-utils";

		const betweenQuotesPattern = /('\|")(.*?)\1/;
		const unpackUrlPattern = /url\(([^\)]+)\)/;
		const inlineLoader = "!nativescript-dev-webpack/css2json-loader?useForImports!"
		const inlineLoader = "!@nativescript/webpack/css2json-loader?useForImports!"

		const loader: loader.Loader = function (content: string, map) {
		const options = getOptions(this) \|\| {};
Expand All		@@ -26,7 +26,7 @@ const loader: loader.Loader = function (content: string, map) {
		}
		});
		const str = JSON.stringify(ast, (k, v) => k === "position" ? undefined : v);
		this.callback(null, `${dependencies.join("\n")}module.exports = ${str};`, map);
Copy link Codex-Sep 28, 2020 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Is removing`map` here safe? Is this for sourcemap generation?
		this.callback(null, `${dependencies.join("\n")}module.exports = ${str};`);
		}

		function getImportRules(ast: Stylesheet): Import[] {
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,4 +1,4 @@
		import { setActivityCallbacks, AndroidActivityCallbacks } from "tns-core-modules/ui/frame";
		import { setActivityCallbacks, AndroidActivityCallbacks } from "@nativescript/core/ui/frame";

		@JavaProxy("org.myApp.MainActivity")
		class Activity extends androidx.appcompat.app.AppCompatActivity {
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,5 +1,5 @@
		import { NgModule, NO_ERRORS_SCHEMA } from "@angular/core";
		import { NativeScriptModule } from "nativescript-angular/nativescript.module";
		import { NativeScriptModule } from "@nativescript/angular";
		import { AppRoutingModule } from "./app.routing";
		import { AppComponent } from "./app.component";

Expand All		@@ -10,10 +10,10 @@ import { ItemDetailComponent } from "./item/item-detail.component";
		// import { PlayfulSpirit } from "./directive";

		// Uncomment and add to NgModule imports if you need to use two-way binding
		// import { NativeScriptFormsModule } from "nativescript-angular/forms";
		// import { NativeScriptFormsModule } from "@nativescript/angular";

		// Uncomment and add to NgModule imports if you need to use the HTTP wrapper
		// import { NativeScriptHttpModule } from "nativescript-angular/http";
		// import { NativeScriptHttpModule } from "@nativescript/angular";

		@NgModule({
		bootstrap: [
Expand Down