Merge branch 'release-v3.0.0-pre.0' into release

Author: Dexterp37

.circleci/config.yml

@@ -147,46 +147,6 @@ jobs:
           command: |
             export PATH=.:$PATH && npm --prefix ./samples/node run test
 
-  sample-qt-test:
-    docker:
-      - image: cimg/python:<< pipeline.parameters.python-version >>
-    steps:
-      - checkout
-      - install-node
-      - run:
-          name: Install JavaScript dependencies for Glean
-          command: npm --prefix ./glean install
-      - run:
-          name: Install Qt dependencies
-          command: |
-            sudo apt-get update
-            sudo apt-get install -y gcc g++ make cmake \
-              qtbase5-dev qt5-default qt5-qmake qttools5-dev-tools qtdeclarative5-dev \
-              qtdeclarative5-dev-tools qml-module-qttest qml-module-qtquick2 \
-              qml-module-qtquick-localstorage qml-module-qtquick-controls2
-            sudo apt-get install xvfb
-      - run:
-          name: Build and install Qt Glean.js library
-          command: |
-            npm --prefix ./glean run build:qt
-            cp -r glean/dist/qt/org/ samples/qt/src/App/org/
-      - run:
-          name: Build the Node.js Glean generated files sample
-          command: |
-            cd samples/qt
-            python3 -m venv venv
-            source venv/bin/activate
-            pip install -r requirements.txt
-            glean_parser translate src/App/metrics.yaml src/App/pings.yaml \
-              -f javascript -o src/App/generated \
-              --option platform=qt --option version="2.0"
-      - run:
-          name: Run Qt sample tests
-          command: |
-            cd samples/qt
-            qmake -r
-            QML_IMPORT_TRACE=1 xvfb-run make check
-
   browser-compat-smoke-tests:
     docker:
       - image: cimg/python:<< pipeline.parameters.python-version >>
@@ -253,9 +213,30 @@ jobs:
       - run:
           name: NPM Authentication
           command: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > glean/.npmrc
-      - run:
-          name: Publish to npm
-          command: export PATH=.:$PATH && (cd glean && npm publish --access public)
+      # This conditional matches the tag that contains 'pre', used
+      # to mark prerelease builds. Since CircleCI conditionals do
+      # not directly support 'else's, we need another conditional.
+      - when:
+          condition:
+            matches:
+              pattern: "^v.*-pre.*$"
+              value: << pipeline.git.tag >>
+          steps:
+            - run:
+                name: Publish to npm (prerelease)
+                command: export PATH=.:$PATH && (cd glean && npm publish --access public --tag prerelease)
+      # This conditional matches 'release': we won't tag the npm
+      # release in this case, because no 'pre' is found in the tag.
+      - when:
+          condition:
+            not:
+              matches:
+                pattern: "^v.*-pre.*$"
+                value: << pipeline.git.tag >>
+          steps:
+            - run:
+                name: Publish to npm
+                command: export PATH=.:$PATH && (cd glean && npm publish --access public)
       - run:
           name: Get ghr release tool
           command: |
@@ -265,14 +246,6 @@ jobs:
             echo "${GHR_SHA256} *${GHR}.tar.gz" | sha256sum -c -
             tar -xf "${GHR}.tar.gz"
             cp ./${GHR}/ghr ghr
-      - run:
-          name: Publish to Github
-          command: |
-            # Attach Qt build to release
-            npm --prefix ./glean install
-            npm --prefix ./glean run build:qt
-            tar -zcvf "glean/dist/glean_js-${CIRCLE_TAG}-qt.tar.gz" glean/dist/qt
-            ./ghr -u mozilla -replace ${CIRCLE_TAG} glean/dist/glean_js-${CIRCLE_TAG}-qt.tar.gz
 
 workflows:
   ci:
@@ -291,9 +264,6 @@ workflows:
       - sample-node-test:
           requires:
             - test
-      - sample-qt-test:
-          requires:
-            - test
       - hold:
           type: approval
           requires:
@@ -302,7 +272,6 @@ workflows:
             - test
             - sample-webext-test
             - sample-node-test
-            - sample-qt-test
           filters:
             branches:
               ignore:

.dictionary

@@ -61,6 +61,7 @@ md
 mdroettboom
 mozilla
 npm
+prerelease
 runtime
 schemas
 setRawNanos

.vscode/launch.json

@@ -88,7 +88,7 @@
         "--experimental-modules",
         "--experimental-specifier-resolution=node",
         "--loader=ts-node/esm",
-        "${workspaceFolder}/glean/tests/unit/core/metrics/timing_distribution.spec.ts"
+        "${file}"
       ],
       "console": "integratedTerminal"
     }

ARCHITECTURE.md

@@ -40,10 +40,10 @@ storage. Each metric can have different [lifetimes](https://mozilla.github.io/gl
 and the SDK will manage its storage so that data does not remain in storage after it's lifetime is expired.
 
 The Glean SDK tries to do all of this is the least disruptive way possible to users. There are two separate
-implementations for the SDK based on the platform: async (QT, node, web extensions) and sync (browser). The implementation
+implementations for the SDK based on the platform: async (node, web extensions) and sync (browser). The implementation
 is set inside of Glean itself and is not configurable by the user.
 
-### async (Web Extensions, QT, Node)
+### async (Web Extensions, Node)
 
 All of the SDKs tasks are queued and executed asynchronously. The APIs exposed by the Glean SDK will only do
 the en-queuing of tasks, a quick synchronous operation. Internally, the Glean SDK will handle the
@@ -110,13 +110,6 @@ file that they are getting and not `core/glean.ts`.
 The main difference between each platform's file is that a different `Platform` implementation is
 imported per file.
 
-The Qt/QML entry point is the different one here. QML packages cannot be easily consumed through npm,
-so the QML entry point imports all of Glean's modules and exposes it through this entry point. That is
-what is done on the `qt.ts` file. The `qt.js` file is the file QML users actually interact with,
-it includes specific QML semantics and is copied to the final destination folder of the QML package
-as-is after Glean.js is compiled for the QML target. (See `bin/prepare-qml-module.sh` for more
-context.)
-
 ### `platform/`
 
 Some modules such as storage and uploader, cannot be written in such a way that works
@@ -131,7 +124,6 @@ It also makes testing easier, because the exact same suite of tests can be run f
 The storage module varies for each platform. The storage mechanism used by each platform is as follows:
 - `web` - [`localStorage`](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage)
 - `webext` - [`storage`](https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/API/storage)
-- `QT` - [`QtQuick.LocalStorage`](https://doc.qt.io/qt-6/qtquick-localstorage-qmlmodule.html)
 - `Node` - None, everything is stored in memory
 
 ### `plugins/`

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean.js/compare/v2.0.5...main)
+[Full changelog](https://github.com/mozilla/glean.js/compare/v3.0.0-pre.0...main)
+
+# v3.0.0-pre.0 (2023-11-10)
+
+[Full changelog](https://github.com/mozilla/glean.js/compare/v2.0.5...v3.0.0-pre.0)
+
+* [#1810](https://github.com/mozilla/glean.js/pull/1810): **BREAKING CHANGE**: Drop support for QT.
+* [#1811](https://github.com/mozilla/glean.js/pull/1811): Update `glean_parser` to `v10.0.3`.
 
 # v2.0.5 (2023-10-16)
 

automation/package-lock.json

@@ -19,11 +19,11 @@
   "author": "The Glean Team <glean-team@mozilla.com>",
   "license": "MPL-2.0",
   "devDependencies": {
-    "@octokit/request": "^8.1.2",
-    "browserstack-local": "^1.5.4",
+    "@octokit/request": "^8.1.4",
+    "browserstack-local": "^1.5.5",
     "geckodriver": "^4.2.1",
     "selenium-webdriver": "^4.4.0",
-    "webpack": "^5.88.2",
+    "webpack": "^5.89.0",
     "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.15.1"
   }

automation/package.json

@@ -9,7 +9,6 @@ import { fileURLToPath } from "url";
 import {
   getCustomLibSize,
   formatBytes,
-  getQtBundleSize,
   METRIC_TYPES,
   PLUGINS,
   PLATFORMS
@@ -67,8 +66,7 @@ try {
     const minSizesTable =
     `\n|| Size |\n`
     + `|--|--|\n`
-    + `${PLATFORMS.map(platform => `|${platform}|**${sizes[platform].baseSize}**|`).join("\n")}\n`
-    + `|QML|**${formatBytes(getQtBundleSize())}**|\n`;
+    + `${PLATFORMS.map(platform => `|${platform}|**${sizes[platform].baseSize}**|`).join("\n")}\n`;
 
     const createSizesTableHeader = title => {
       return `\n|${title}| ${PLATFORMS.map(platform => `${platform}|`).join("")}\n`

automation/size/docs.js

@@ -9,13 +9,10 @@ import {
   PLUGINS,
   getCustomLibSize,
   formatBytes,
-  executeCmd,
-  getQtBundleSize
+  executeCmd
 } from "./utils.js";
 
 async function buildStatsMap() {
-
-  const qtBundleStats = getQtBundleSize();
   return [
     {
       name: "Web Extension",
@@ -31,11 +28,6 @@ async function buildStatsMap() {
       name: "Node.js",
       max: await getCustomLibSize("node", METRIC_TYPES, PLUGINS),
       min: await getCustomLibSize("node")
-    },
-    {
-      name: "Qt/QML",
-      max: qtBundleStats,
-      min: qtBundleStats
     }
   ];
 }

automation/size/report.js

@@ -82,8 +82,6 @@ export function executeCmd(cmd) {
  * Note: This function will use whatever `@mozilla/glean` package is linked at its runtime.
  *
  * @param {string} platform The platform to build for, supported platforms are: `web`, `webext` and `node`.
- *        The Qt build always has the same size because it always includes everything in it,
- *        so it is not supported here.
  * @param {[string]} metrics An array of metric types. Supported metrics types are listed in `METRIC_TYPES`.
  *        If not provided the final bundle won't contain any additional metric types.
  * @param {[string]} plugins An array of plugins. Supported plugins are listed in `PLUGINS`.
@@ -146,18 +144,3 @@ export async function getCustomLibSize(platform, metrics = [], plugins = []) {
     );
   });
 }
-
-/**
- * Gets the size of the Qt bundle directly from the Glean folder.
- *
- * Note: this function assumes the Qt bundle has been built over there.
- *
- * @returns The size in bytes of the Qt bundle.
- */
-export function getQtBundleSize() {
-  // The Qt bundle size is special, because the Qt build is not part of the @mozilla/glean npm package.
-  // It is already bundled and distributed with each new release on the Github releases page.
-  //
-  // In Qt, the bundle always contains all metric types and plugins, so there is no min/max.
-  return fs.statSync(path.resolve(__dirname, "../../glean/dist/qt/org/mozilla/Glean/glean.lib.js")).size;
-}