Bump engine.io and socket.io

.github/workflows/node.js.yml

@@ -0,0 +1,34 @@
+name: Node.js CI
+
+on:
+  push:
+    branches: [ 'mococn*' ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [12.x, 14.x, 16.x]
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+
+    - name: Install dependencies
+      run: npm install
+
+    - name: Karma-mocha
+      run: npm run testmc:unit
+
+    - name: Upload test logs
+      uses: actions/upload-artifact@v3
+      with:
+        name: test-logs-${{ matrix.node-version }}
+        path: logs/

.github/workflows/webpack.yml

@@ -0,0 +1,46 @@
+name: NodeJS with Webpack
+
+on:
+  push:
+    branches: [ 'mococn*' ]
+
+jobs:
+  build:
+    environment: prod
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [16.x]
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 128
+
+    - name: Fetch necessary tags
+      run: git fetch --depth=1 origin 'refs/tags/firefox-*b:refs/tags/firefox-*b'
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v3
+      with:
+        node-version: ${{ matrix.node-version }}
+        cache: 'npm'
+
+    - name: Install dependencies
+      run: npm install
+
+    - name: Webpack
+      env:
+        NODE_ENV: production
+        SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+        SENTRY_SAMPLE_RATE: ${{ secrets.SENTRY_SAMPLE_RATE }}
+      run: |
+        git describe --dirty
+        npx webpack -c webpack.china.config.js --mode production
+
+    - name: Upload built files
+      uses: actions/upload-artifact@v3
+      with:
+        name: prod
+        path: dist/

common/Actions.jsm

@@ -81,6 +81,9 @@ for (const type of [
   "HANDOFF_SEARCH_TO_AWESOMEBAR",
   "HIDE_PRIVACY_INFO",
   "INIT",
+  "MOCOCN_PREFS_INITIAL_VALUES",
+  "MOCOCN_PREF_CHANGED",
+  "MOCOCN_SET_PREF",
   "NEW_TAB_INIT",
   "NEW_TAB_INITIAL_STATE",
   "NEW_TAB_LOAD",
@@ -299,8 +302,9 @@ function UserEvent(data) {
  * @return {object} An AlsoToMain action
  */
 function DiscoveryStreamUserEvent(data) {
+  // `DISCOVERY_STREAM_USER_EVENT` available since Fx 105, see https://bugzil.la/1779636
   return AlsoToMain({
-    type: actionTypes.DISCOVERY_STREAM_USER_EVENT,
+    type: (typeof OffscreenCanvas === "function" ? actionTypes.DISCOVERY_STREAM_USER_EVENT : actionTypes.TELEMETRY_USER_EVENT),
     data,
   });
 }

common/Reducers.jsm

@@ -36,6 +36,10 @@ const INITIAL_STATE = {
     // The list of available search shortcuts.
     searchShortcuts: [],
   },
+  MoCoCNPrefs: {
+    initialized: false,
+    values: {},
+  },
   Prefs: {
     initialized: false,
     values: { featureConfig: {} },
@@ -293,6 +297,20 @@ function Dialog(prevState = INITIAL_STATE.Dialog, action) {
   }
 }
 
+function MoCoCNPrefs(prevState = INITIAL_STATE.MoCoCNPrefs, action) {
+  let newValues;
+  switch (action.type) {
+    case at.MOCOCN_PREFS_INITIAL_VALUES:
+      return Object.assign({}, prevState, {initialized: true, values: action.data});
+    case at.MOCOCN_PREF_CHANGED:
+      newValues = Object.assign({}, prevState.values);
+      newValues[action.data.name] = action.data.value;
+      return Object.assign({}, prevState, {values: newValues});
+    default:
+      return prevState;
+  }
+}
+
 function Prefs(prevState = INITIAL_STATE.Prefs, action) {
   let newValues;
   switch (action.type) {
@@ -843,6 +861,7 @@ const reducers = {
   App,
   ASRouter,
   Snippets,
+  MoCoCNPrefs,
   Prefs,
   Dialog,
   Sections,

content-src/activity-stream.jsx

@@ -2,14 +2,58 @@
  * 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/. */
 
+import "content-src/styles/activity-stream-mac.scss";
+import "content-src/styles/mococn.scss";
+
+import "mococn/fluent-web";
+
+import "gecko-dev/contentSearchUI";
+import "gecko-dev/contentSearchHandoffUI";
+import "gecko-dev/contentTheme";
+
 import { actionCreators as ac, actionTypes as at } from "common/Actions.jsm";
 import { Base } from "content-src/components/Base/Base";
 import { DetectUserSessionStart } from "content-src/lib/detect-user-session-start";
-import { initStore } from "content-src/lib/init-store";
+import { initStore, initMoCoCNPrefs } from "content-src/lib/init-store";
 import { Provider } from "react-redux";
 import React from "react";
 import ReactDOM from "react-dom";
 import { reducers } from "common/Reducers.jsm";
+import * as Sentry from "@sentry/react";
+
+if (SENTRY_DSN) {
+  Sentry.init({
+    beforeSend(event, hint) {
+      try {
+        if (
+          hint &&
+          hint.originalException &&
+          hint.originalException.message === "Element is not a row"
+        ) {
+          let [arg0] = event.extra.arguments;
+          if (
+            arg0.type === "mouseout" && [
+              "table#searchSuggestionTable.contentSearchSuggestionTable",
+              "table.contentSearchOneOffsTable.contentSearchSuggestionsContainer",
+            ].includes(arg0.target)
+          ) {
+            return null;
+          }
+        }
+      } catch (ex) {
+        global.console.error(ex);
+      }
+      return event;
+    },
+    denyUrls: [
+      /^moz-extension:\/\//i,
+    ],
+    dsn: SENTRY_DSN,
+    environment: SENTRY_ENVIRONMENT,
+    release: SENTRY_RELEASE,
+    sampleRate: SENTRY_SAMPLE_RATE,
+  });
+}
 
 export const NewTab = ({ store }) => (
   <Provider store={store}>
@@ -19,6 +63,7 @@ export const NewTab = ({ store }) => (
 
 export function renderWithoutState() {
   const store = initStore(reducers);
+  initMoCoCNPrefs(store);
   new DetectUserSessionStart(store).sendEventOrAddListener();
 
   // If this document has already gone into the background by the time we've reached
@@ -48,7 +93,21 @@ export function renderWithoutState() {
 
 export function renderCache(initialState) {
   const store = initStore(reducers, initialState);
+  initMoCoCNPrefs(store);
   new DetectUserSessionStart(store).sendEventOrAddListener();
 
   ReactDOM.hydrate(<NewTab store={store} />, document.getElementById("root"));
 }
+
+// Equivalent to that from data/content/newtab-render.js ?
+renderWithoutState();
+
+if ("serviceWorker" in navigator) {
+  window.addEventListener("load", () => {
+    navigator.serviceWorker.register("service-worker.js").then(registration => {
+      global.console.log("SW registered: ", registration);
+    }).catch(registrationError => {
+      global.console.log("SW registration failed: ", registrationError);
+    });
+  });
+}

content-src/asrouter/asrouter-utils.js

@@ -20,7 +20,13 @@ export const ASRouterUtils = {
     if (global.ASRouterMessage) {
       return global.ASRouterMessage(action);
     }
-    throw new Error(`Unexpected call:\n${JSON.stringify(action, null, 3)}`);
+
+    // `window.ASRouterMessage` might be undefined on Fx 84+, as a result
+    // of not up-to-date extension, see https://bugzil.la/1614465
+    global.console.error(
+      new Error(`Unexpected call:\n${JSON.stringify(action, null, 3)}`)
+    );
+    return global.Promise.resolve({ message: {} });
   },
   blockById(id, options) {
     return ASRouterUtils.sendMessage({

content-src/asrouter/templates/template-manifest.jsx

@@ -2,23 +2,11 @@
  * 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/. */
 
-import { EOYSnippet } from "./EOYSnippet/EOYSnippet";
-import { FXASignupSnippet } from "./FXASignupSnippet/FXASignupSnippet";
-import { NewsletterSnippet } from "./NewsletterSnippet/NewsletterSnippet";
-import {
-  SendToDeviceSnippet,
-  SendToDeviceScene2Snippet,
-} from "./SendToDeviceSnippet/SendToDeviceSnippet";
 import { SimpleBelowSearchSnippet } from "./SimpleBelowSearchSnippet/SimpleBelowSearchSnippet";
 import { SimpleSnippet } from "./SimpleSnippet/SimpleSnippet";
 
 // Key names matching schema name of templates
 export const SnippetsTemplates = {
   simple_snippet: SimpleSnippet,
-  newsletter_snippet: NewsletterSnippet,
-  fxa_signup_snippet: FXASignupSnippet,
-  send_to_device_snippet: SendToDeviceSnippet,
-  send_to_device_scene2_snippet: SendToDeviceScene2Snippet,
-  eoy_snippet: EOYSnippet,
   simple_below_search_snippet: SimpleBelowSearchSnippet,
 };