Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,29 +124,6 @@ jobs:
command: |
export PATH=.:$PATH && npm --prefix ./samples/browser/webext run test

sample-node-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 JavaScript dependencies for the Node.js sample
command: |
npm --prefix ./samples/node install
npm --prefix ./samples/node run link:glean
- run:
name: Build the Node.js Glean generated files sample
command: |
npm --prefix ./samples/node run glean
- run:
name: Run Node.js sample test
command: |
export PATH=.:$PATH && npm --prefix ./samples/node run test

browser-compat-smoke-tests:
docker:
- image: cimg/python:<< pipeline.parameters.python-version >>
Expand Down Expand Up @@ -240,17 +217,13 @@ workflows:
- sample-webext-test:
requires:
- test
- sample-node-test:
requires:
- test
- hold:
type: approval
requires:
- lint
- build
- test
- sample-webext-test
- sample-node-test
filters:
branches:
ignore:
Expand Down
4 changes: 0 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,6 @@ updates:
directory: "/samples/browser/web"
schedule:
interval: "monthly"
- package-ecosystem: "npm"
directory: "/samples/node"
schedule:
interval: "monthly"
- package-ecosystem: "npm"
directory: "/glean/tests/unit/platform/utils/webext/sample"
schedule:
Expand Down
7 changes: 3 additions & 4 deletions ARCHITECTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ An end-to-end data collection platform developed by Mozilla and primarily target
Glean provides multiple client SDKs for different programming languages and platforms.
One of the aspects that guide Glean SDK development is cross-platform consistency and the Glean
JavaScript SDK is no exception to that. It is built to work on multiple JavaScript platforms --
websites, web extensions, Node.js and QML as of the time of writing -- and to be easily extendable
websites, and web extensions as of the time of writing -- and to be easily extendable
to other platforms as well.

The Glean JavaScript SDK is the latest addition to the family of Glean SDKs. The other Glean SDKs,
Expand All @@ -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 (node, web extensions) and sync (browser). The implementation
implementations for the SDK based on the platform: async (web extensions) and sync (browser). The implementation
is set inside of Glean itself and is not configurable by the user.

### async (Web Extensions, Node)
### async (Web Extensions)

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
Expand Down Expand Up @@ -124,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)
- `Node` - None, everything is stored in memory

### `plugins/`

Expand Down
5 changes: 0 additions & 5 deletions automation/size/report.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,6 @@ async function buildStatsMap() {
name: "Website",
max: await getCustomLibSize("web", METRIC_TYPES, PLUGINS),
min: await getCustomLibSize("web")
},
{
name: "Node.js",
max: await getCustomLibSize("node", METRIC_TYPES, PLUGINS),
min: await getCustomLibSize("node")
}
];
}
Expand Down
4 changes: 2 additions & 2 deletions automation/size/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const METRIC_TYPES = [

export const PLUGINS = [ "encryption" ];

export const PLATFORMS = [ "web", "webext", "node" ];
export const PLATFORMS = [ "web", "webext" ];

const UNITS = ["bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
/**
Expand Down Expand Up @@ -81,7 +81,7 @@ 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`.
* @param {string} platform The platform to build for, supported platforms are: `web`, and `webext`.
* @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`.
Expand Down
4 changes: 1 addition & 3 deletions automation/size/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

export default (platform, entry) => {
const target = platform === "node" ? "node"
: ["webext", "web"].includes(platform) ? "web"
: null;
const target = ["webext", "web"].includes(platform) ? "web" : null;

return {
target,
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Runs all necessary lints on the code. This includes:

Runs unit and integration test on the `@mozilla/glean` library.

### `sample-webext-test`, `sample-node-test`
### `sample-webext-test`

Runs unit tests on the Glean.js sample apps.

Expand Down
4 changes: 0 additions & 4 deletions docs/reference/compat.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,3 @@ as Chromium based browsers.
## Web Extensions

> TODO: see [Bug 1752549](https://bugzilla.mozilla.org/show_bug.cgi?id=1752549)

## Node.js

> TODO: see [Bug 1752548](https://bugzilla.mozilla.org/show_bug.cgi?id=1752548)
4 changes: 0 additions & 4 deletions glean/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"./plugins/*": "./dist/plugins/*.js",
"./uploader": "./dist/core/upload/uploader.js",
"./testing": "./dist/core/testing/index.js",
"./node": "./dist/entry/node.js",
"./webext": "./dist/entry/webext.js",
"./web": "./dist/entry/web.js"
},
Expand All @@ -21,9 +20,6 @@
"webext": [
"./dist/types/entry/webext.d.ts"
],
"node": [
"./dist/types/entry/node.d.ts"
],
"web": [
"./dist/types/entry/web.d.ts"
],
Expand Down
9 changes: 0 additions & 9 deletions glean/src/entry/node.ts

This file was deleted.

23 changes: 0 additions & 23 deletions glean/src/platform/node/index.ts

This file was deleted.

48 changes: 0 additions & 48 deletions glean/src/platform/node/platform_info.ts

This file was deleted.

64 changes: 0 additions & 64 deletions glean/src/platform/node/uploader.ts

This file was deleted.

59 changes: 0 additions & 59 deletions glean/tests/unit/platform/node/uploader.spec.ts

This file was deleted.

1 change: 0 additions & 1 deletion glean/tsconfig/lib.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"include": [
"../src/core/**/*.ts",
"../src/plugins/*.ts",
"../src/entry/node.ts",
"../src/entry/webext.ts",
"../src/entry/web.ts"
],
Expand Down
1 change: 0 additions & 1 deletion glean/tsconfig/types.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"include": [
"../src/core/**/*.ts",
"../src/plugins/*.ts",
"../src/entry/node.ts",
"../src/entry/web.ts",
"../src/entry/webext.ts"
],
Expand Down
Loading