Fix webpack exclude

NathanaelA · NathanaelA · commit 150a3e793797 · 2021-08-28T11:54:01.000-05:00
diff --git a/demo/app/app.css b/demo/app/app.css
@@ -24,18 +24,26 @@ The following CSS rule changes the font size of all Buttons that have the
 
 Page {
   background-color: lightgrey;
+  color: black;
 }
 button {
   font-size: 20;
   horizontal-align: center;
 }
 
 .one {
-  background-color: greenyellow;
+  background-color: black;
+  color: white;
 }
 
 .two {
-  background-color: cyan;
+  background-color: lightgrey;
+  color: black;
+}
+
+.entry {
+  background-color: lightgrey;
+  color: black;
 }
 
 .copyright {
diff --git a/demo/app/main-page.xml b/demo/app/main-page.xml
@@ -11,7 +11,7 @@
             </Repeater>
         </ScrollView>
         <GridLayout row="1" rows="*,auto" columns="*,auto" class="border" >
-            <TextField id="entry" hint="Type a new name" text=""/>
+            <TextField class="entry" id="entry" hint="Type a new name" text=""/>
             <Button id="go" col="1" text="Add" tap="addNewName"/>
             <Label row="1" colSpan="2"  text="(c) 2015-2021, Master Technology" class="copyright" android:tap="openMT"/>
         </GridLayout>
diff --git a/demo/package.json b/demo/package.json
@@ -1,10 +1,10 @@
 {
-  "name": "@nativescript/template-hello-world",
+  "name": "nativescript-sqlite-demo",
   "main": "app/app.js",
-  "version": "8.0.3",
-  "author": "NativeScript Team <oss@nativescript.org>",
-  "description": "NativeScript Application",
-  "license": "SEE LICENSE IN <your-license-filename>",
+  "version": "8.0.0",
+  "author": "Nathan Anderson <nathan@master.technology",
+  "description": "SQLite Demo App",
+  "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
@@ -18,29 +18,17 @@
     "jsconfig.json"
   ],
   "keywords": [
-    "nstudio",
     "nativescript",
-    "mobile",
-    "{N}",
-    "tns",
-    "template"
+    "SQLite",
+    "Master Technology"
   ],
-  "repository": "<fill-your-repository-here>",
-  "bugs": {
-    "url": "https://github.com/NativeScript/NativeScript/issues"
-  },
-  "homepage": "https://github.com/NativeScript/nativescript-app-templates",
   "dependencies": {
     "@nativescript/core": "~8.0.0",
     "@nativescript/theme": "~3.0.1",
-    "nativescript-sqlite": "file:../src",
-    "nativescript-sqlite-commercial": "file:../commercial",
-    "nativescript-sqlite-encrypted": "file:../encrypted"
+    "nativescript-sqlite": "file:../src"
   },
   "devDependencies": {
     "@nativescript/android": "8.0.0",
     "@nativescript/webpack": "^5.0.0-beta.16"
-  },
-  "private": "true",
-  "readme": "NativeScript Application"
+  }
 }
diff --git a/src/changelog b/src/changelog
@@ -42,3 +42,4 @@ v2.7.0  - Add NS 8 Webpack support
 v2.8.0  - Fixes for Webpack / Webworkers
 v2.8.1  - More fixes for WebWorker/Webpacking issues
 v2.8.2  - Fixes for iOS 14.5+ issues on opening database
+v2.8.3  - Add missing Commercial feature exclusion to Webpack 5
diff --git a/src/nativescript.webpack.js b/src/nativescript.webpack.js
@@ -33,6 +33,7 @@ module.exports = webpack => {
         if (!fs.existsSync(dirname+"/nativescript-sqlite-commercial")) {
             console.warn("NativeScript-SQLite Commercial not detected, disabling support!");
             externals.push('nativescript-sqlite-commercial');
+            externals.push('nativescript-sqlite-commercial/commercial-multi');
         } else {
             hasCom = true;
         }
diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-sqlite",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "description": "A sqlite NativeScript module for Android and iOS",
   "main": "sqlite",
   "nativescript": {

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ module.exports = webpack => {`
`33`	`33`	`if (!fs.existsSync(dirname+"/nativescript-sqlite-commercial")) {`
`34`	`34`	`console.warn("NativeScript-SQLite Commercial not detected, disabling support!");`
`35`	`35`	`externals.push('nativescript-sqlite-commercial');`
	`36`	`+ externals.push('nativescript-sqlite-commercial/commercial-multi');`
`36`	`37`	`} else {`
`37`	`38`	`hasCom = true;`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-sqlite",`
`3`		`- "version": "2.8.2",`
	`3`	`+ "version": "2.8.3",`
`4`	`4`	`"description": "A sqlite NativeScript module for Android and iOS",`
`5`	`5`	`"main": "sqlite",`
`6`	`6`	`"nativescript": {`