From 33274faf9bb68eb95cb3e2e095cd0cef84aa6fd7 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Wed, 3 Jul 2019 00:06:02 -0700
Subject: Remove custom extensions and use plugin as is

---
 app/build.gradle              | 22 +++++++++++++++++++++-
 app/src/web/package-lock.json | 41 +++++++++++------------------------------
 app/src/web/package.json      |  4 ++++
 3 files changed, 36 insertions(+), 31 deletions(-)

(limited to 'app')

diff --git a/app/build.gradle b/app/build.gradle
index 0f5188b7..b286a754 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,18 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
 apply plugin: 'com.getkeepsafe.dexcount'
 apply plugin: 'com.gladed.androidgitversion'
-apply plugin: FrostPlugin
+
+
+buildscript {
+    repositories {
+        jcenter()
+    }
+    dependencies {
+        classpath "com.moowork.gradle:gradle-node-plugin:${Versions.nodeGradle}"
+    }
+}
+
+apply plugin: com.moowork.gradle.node.NodePlugin
 
 apply from: '../spotless.gradle'
 group = APP_GROUP
@@ -168,6 +179,15 @@ android {
 
 }
 
+node {
+    download = true
+    nodeModulesDir = file("${project.projectDir}/src/web")
+}
+
+task frostWebGen(type: NpmTask) {
+    args = ['run', 'compile']
+}
+
 repositories {
     google()
     jcenter()
diff --git a/app/src/web/package-lock.json b/app/src/web/package-lock.json
index 8c7e9b78..1c7a7931 100644
--- a/app/src/web/package-lock.json
+++ b/app/src/web/package-lock.json
@@ -429,8 +429,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -448,13 +447,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -467,18 +464,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -581,8 +575,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -592,7 +585,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -605,20 +597,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -635,7 +624,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -708,8 +696,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -719,7 +706,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -795,8 +781,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -826,7 +811,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -844,7 +828,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -883,13 +866,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
diff --git a/app/src/web/package.json b/app/src/web/package.json
index fbdc2442..ef323afb 100644
--- a/app/src/web/package.json
+++ b/app/src/web/package.json
@@ -2,6 +2,10 @@
   "scripts": {
     "compile": "tsc -p tsconfig.json && sass --no-source-map --style compressed --update scss:assets/css"
   },
+  "license": "GPL-3.0",
+  "repository": {
+    "url": "https://github.com/AllanWang/Frost-for-Facebook"
+  },
   "dependencies": {
     "typescript": "^3.3.1",
     "sass": "^1.19.0"
-- 
cgit v1.2.3