📌 Use NPM version of gluon

trickypr · trickypr · commit 23e3cda45a4a · 2022-10-23T12:09:42.000+11:00
* 📌 Use NPM version of gluon

* ⬆️ Bump gluon to `1.0.0-rc.2`

* 📄 Add license headers

* 💚 License check no longer fixes by default
diff --git a/.github/workflows/addons.yml b/.github/workflows/addons.yml
@@ -16,7 +16,7 @@ jobs:
           submodules: recursive
 
       - name: Setup Gluon
-        run: yarn && yarn setupLink
+        run: yarn
 
       - name: Load config
         run: yarn gluon ci --brand ${GITHUB_REF##*/}
diff --git a/.github/workflows/alpha.yml b/.github/workflows/alpha.yml
@@ -19,9 +19,8 @@ jobs:
       - name: Setup gluon
         run: |
           yarn
-          yarn setupLink
 
-          cd gluon 
+          cd gluon
           npm i -g . --force
           cd ..
 
@@ -126,7 +125,7 @@ jobs:
 
       - name: Setup gluon
         run: |
-          yarn && yarn setupLink
+          yarn
 
       - name: Load gluon CI setup
         run: yarn gluon ci --brand alpha --display-version ${{ needs.build-data.outputs.version }}
@@ -212,7 +211,7 @@ jobs:
           key: ${{ runner.os }}-sccache
 
       - name: Setup gluon
-        run: yarn && yarn setupLink
+        run: yarn
 
       - name: Load gluon CI setup
         run: yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
@@ -273,7 +272,7 @@ jobs:
           git config --global user.name "TrickyPR"
 
       - name: Setup gluon
-        run: yarn && yarn setupLink
+        run: yarn
 
       - name: Load gluon CI setup
         run: yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
@@ -310,11 +309,6 @@ jobs:
         run: |
           yarn
 
-      - name: Build gluon
-        shell: bash --noprofile --norc -eo pipefail {0}
-        run: |
-          yarn setupLink:win
-
       - name: Load gluon CI setup
         run: yarn gluon ci -- --brand alpha --display-version ${{ needs.build-data.outputs.version }}
 
diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
@@ -17,7 +17,7 @@ jobs:
           submodules: recursive
 
       - name: Setup melon
-        run: yarn && yarn setupLink
+        run: yarn
 
       - name: Export release data
         id: data
@@ -115,7 +115,7 @@ jobs:
           ls /opt/wasi-sdk/share/wasi-sysroot
 
       - name: Setup melon
-        run: yarn && yarn setupLink
+        run: yarn
 
       - name: Download firefox source and dependancies
         run: yarn download
@@ -273,7 +273,7 @@ jobs:
           cargo --version
 
       - name: Setup melon
-        run: yarn && yarn setupLink
+        run: yarn
 
       - name: Download firefox source and dependancies
         run: yarn download
@@ -320,7 +320,7 @@ jobs:
           git config --global user.name "TrickyPR"
 
       - name: Setup melon
-        run: yarn && yarn setupLink
+        run: yarn
 
       - name: Download firefox source and dependancies
         run: yarn download
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
           submodules: recursive
 
       - name: Setup Melon
-        run: yarn && yarn setupLink
+        run: yarn
 
       - name: Check license
-        run: yarn licenseCheck --no-fix
+        run: yarn licenseCheck
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1 @@
 
-[submodule "melon"]
-	path = gluon
-	url = https://github.com/focus-browser/build
diff --git a/gluon b/gluon
diff --git a/package.json b/package.json
@@ -7,11 +7,9 @@
   "license": "MPL-2.0",
   "private": true,
   "dependencies": {
-    "melon-build": "^1.0.0-a.10"
+    "gluon-build": "^1.0.0-rc.2"
   },
   "scripts": {
-    "setupLink": "cd gluon && yarn && yarn build && yarn link && cd .. && yarn link gluon-build",
-    "setupLink:win": "cd gluon && yarn && yarn build:win && yarn link && cd .. && yarn link gluon-build",
     "build": "gluon build",
     "build:ui": "gluon build --ui",
     "bs": "yarn build && yarn start",
@@ -21,8 +19,6 @@
     "imp": "gluon import",
     "clearProfile": "rm -rf engine/obj-x86_64-pc-linux-gnu/tmp/profile-default",
     "download": "gluon download",
-    "rebuild": "cd gluon && yarn build && cd ..",
-    "rebuild:win": "cd gluon && yarn build:win && cd ..",
     "package": "gluon package",
     "ff-version": "gluon ff-version",
     "licenseCheck": "gluon license-check",
diff --git a/src/browser/base/content/aboutDialog.js b/src/browser/base/content/aboutDialog.js
@@ -1,3 +1,6 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 var { Services } = ChromeUtils.import('resource://gre/modules/Services.jsm')
 var { AppConstants } = ChromeUtils.import(
   'resource://gre/modules/AppConstants.jsm'
diff --git a/src/browser/components/welcome/migrate.dark.svg b/src/browser/components/welcome/migrate.dark.svg
@@ -1,3 +1,8 @@
+<!--
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   -->
 <svg width="806" height="196" viewBox="0 0 806 196" fill="none" xmlns="http://www.w3.org/2000/svg">
     <rect width="348" height="196" rx="8" fill="#4D4950" />
     <rect x="458" width="348" height="196" rx="8" fill="#6829A3" />
diff --git a/src/browser/components/welcome/migrate.light.svg b/src/browser/components/welcome/migrate.light.svg
@@ -1,3 +1,8 @@
+<!--
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   -->
 <svg width="806" height="196" viewBox="0 0 806 196" fill="none" xmlns="http://www.w3.org/2000/svg">
     <rect width="348" height="196" rx="8" fill="#BFBCC2" />
     <rect x="458" width="348" height="196" rx="8" fill="#C18CF2" />
diff --git a/src/browser/themes/osx/vibrancy.css b/src/browser/themes/osx/vibrancy.css
@@ -1,3 +1,8 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
 #main-window {
   background: transparent !important;
 }
diff --git a/src/toolkit/modules/ContextMenu.jsm b/src/toolkit/modules/ContextMenu.jsm
@@ -1,3 +1,6 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
 // @ts-check
 
 'use strict'
diff --git a/src/toolkit/themes/shared/icons/bookmark-outline.svg b/src/toolkit/themes/shared/icons/bookmark-outline.svg
@@ -1,3 +1,8 @@
+<!--
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   -->
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
 <!-- Created using Krita: https://krita.org -->
diff --git a/src/toolkit/themes/shared/icons/tab-falling-edge.svg b/src/toolkit/themes/shared/icons/tab-falling-edge.svg
@@ -1,3 +1,8 @@
+<!--
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   -->
 <svg width="8" height="8" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
     <path fill-rule="evenodd" clip-rule="evenodd" d="M16 16C7.16344 16 0 8.83656 0 0V16H16Z" fill="context-fill" />
 </svg>
diff --git a/src/toolkit/themes/shared/icons/tab-rising-edge.svg b/src/toolkit/themes/shared/icons/tab-rising-edge.svg
@@ -1,3 +1,8 @@
+<!--
+   - This Source Code Form is subject to the terms of the Mozilla Public
+   - License, v. 2.0. If a copy of the MPL was not distributed with this
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/.
+   -->
 <svg width="8" height="8" viewBox="0 0 16 16" fill="context-fill" xmlns="http://www.w3.org/2000/svg">
     <path fill-rule="evenodd" clip-rule="evenodd" d="M16 0V16H0C8.83656 16 16 8.83656 16 0Z" fill="context-fill" />
 </svg>
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1 @@`
`1`	`1`
`2`		`-[submodule "melon"]`
`3`		`- path = gluon`
`4`		`- url = https://github.com/focus-browser/build`