Bug 1686678 - Reorganize code in core/ and platform/ submodules (#72)

Author: Beatriz Rizental

.circleci/config.yml

@@ -14,10 +14,10 @@ jobs:
       - checkout
       - run:
           name: Install Javascript dependencies
-          command: npm install
+          command: npm --prefix ./glean install
       - run:
           name: Run linter
-          command: npm run lint
+          command: npm --prefix ./glean run lint
 
   unit-tests:
     docker:
@@ -32,10 +32,10 @@ jobs:
             sudo apt install firefox-trunk
       - run:
           name: Install Javascript dependencies
-          command: npm install
+          command: npm --prefix ./glean install
       - run:
           name: Run unit tests
-          command: export PATH=.:$PATH && npm run test
+          command: export PATH=.:$PATH && npm --prefix ./glean run test
 
   check-size:
     docker:
@@ -59,8 +59,8 @@ jobs:
             export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
             [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
             nvm install node
-            npm install
-            npm run build:qt
+            npm --prefix ./glean install
+            npm --prefix ./glean run build
       - run:
           name: Verify no Javascript errors found in Qt
           command: bin/qt-js-check.sh

.eslintignore renamed to glean/.eslintignore

@@ -4,16 +4,14 @@
   "description": "An implementation of the Glean SDK, a modern cross-platform telemetry client, for Javascript environments.",
   "main": "./dist/glean.js",
   "scripts": {
-    "test": "npm run build:test-webext && npm run test:unit",
-    "test:debug": "ts-mocha \"tests/**/*.spec.ts\" --paths -p ./tsconfig.json --recursive --inspect-brk",
-    "test:unit": "ts-mocha \"tests/**/*.spec.ts\" --paths -p ./tsconfig.json  --recursive --timeout 0",
+    "test": "npm run test:core && npm run test:platform",
+    "test:core": "ts-mocha \"tests/core/**/*.spec.ts\" --paths -p ./tsconfig.json  --recursive",
+    "test:platform": "npm run build:test-webext && ts-mocha \"tests/platform/**/*.spec.ts\" --paths -p ./tsconfig.json  --recursive --timeout 0",
+    "build:test-webext": "cd tests/platform/utils/webext/sample/ && npm install && npm run build:xpi",
     "lint": "eslint . --ext .ts,.js,.json --max-warnings=0",
     "fix": "eslint . --ext .ts,.js,.json --fix",
-    "build:webext": "webpack --config webpack.config.webext.js --mode production",
-    "dev:webext": "webpack --watch --config webpack.config.webext.js --mode development --devtool inline-source-map",
-    "build:qt": "webpack --config webpack.config.qt.js --mode production",
-    "dev:qt": "webpack --watch --config webpack.config.qt.js --mode development  --devtool inline-source-map",
-    "build:test-webext": "cd tests/utils/webext/sample/ && npm install && npm run build:xpi"
+    "build": "webpack --config webpack.config.js --mode production",
+    "dev": "webpack --watch --config webpack.config.js --mode development --devtool inline-source-map"
   },
   "repository": {
     "type": "git",

.eslintrc renamed to glean/.eslintrc

@@ -2,8 +2,8 @@
  * 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 { DEFAULT_TELEMETRY_ENDPOINT } from "./constants";
-import { validateURL } from "utils";
+import { DEFAULT_TELEMETRY_ENDPOINT } from "core/constants";
+import { validateURL } from "core/utils";
 
 /**
  * Lists Glean's debug options.

copyright.template.txt renamed to glean/copyright.template.txt

@@ -2,7 +2,7 @@
  * 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 { version } from "../package.json";
+import { version } from "../../package.json";
 
 export const GLEAN_SCHEMA_VERSION = 1;
 

package-lock.json renamed to glean/package-lock.json

@@ -2,7 +2,7 @@
  * 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 { generateUUIDv4 } from "utils";
+import { generateUUIDv4 } from "core/utils";
 
 // The possible states a dispatcher instance can be in.
 export const enum DispatcherState {