diff --git a/.gitignore b/.gitignore index 0d96d9e327..3023e8b08f 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ local.log specs.log /test-report/ browserstack.err +package.tgz # https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored .pnp.* diff --git a/package.json b/package.json index 8adc5c0824..b4c4cf359e 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ ], "scripts": { "postinstall": "scripts/cli init_submodule", - "build": "lerna run build --stream", + "build": "lerna run build --stream && lerna run pack --stream", "build:bundle": "lerna run build:bundle --stream", "build:app": "cd test/app && rm -rf node_modules && yarn && yarn build", "format": "prettier --check .", diff --git a/packages/core/package.json b/packages/core/package.json index c19fa15305..2672f44fb3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -7,6 +7,7 @@ "types": "cjs/index.d.ts", "sideEffects": false, "scripts": { + "pack": "yarn pack", "build": "run-p build:cjs build:esm", "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json && yarn replace-build-env cjs", "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json && yarn replace-build-env esm", diff --git a/packages/logs/package.json b/packages/logs/package.json index 1d47a0870b..06d2038292 100644 --- a/packages/logs/package.json +++ b/packages/logs/package.json @@ -6,6 +6,7 @@ "module": "esm/entries/main.js", "types": "cjs/entries/main.d.ts", "scripts": { + "pack": "yarn pack", "build": "run-p build:cjs build:esm build:bundle", "build:bundle": "rm -rf bundle && SDK_SETUP=cdn webpack --mode=production", "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json && yarn replace-build-env cjs", diff --git a/packages/rum-core/package.json b/packages/rum-core/package.json index e4b5db7617..95df789f69 100644 --- a/packages/rum-core/package.json +++ b/packages/rum-core/package.json @@ -6,6 +6,7 @@ "module": "esm/index.js", "types": "cjs/index.d.ts", "scripts": { + "pack": "yarn pack", "build": "run-p build:cjs build:esm", "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json && yarn replace-build-env cjs", "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json && yarn replace-build-env esm", diff --git a/packages/rum-react/package.json b/packages/rum-react/package.json index 3a9e06416a..6390ca7c2f 100644 --- a/packages/rum-react/package.json +++ b/packages/rum-react/package.json @@ -6,6 +6,7 @@ "module": "esm/entries/main.js", "types": "cjs/entries/main.d.ts", "scripts": { + "pack": "yarn pack", "build": "run-p build:cjs build:esm", "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json --noCheck", "build:esm": "rm -rf esm && tsc -p tsconfig.esm.json --noCheck", diff --git a/packages/rum-slim/package.json b/packages/rum-slim/package.json index 7b311764b3..b41aed60c6 100644 --- a/packages/rum-slim/package.json +++ b/packages/rum-slim/package.json @@ -6,6 +6,7 @@ "module": "esm/entries/main.js", "types": "cjs/entries/main.d.ts", "scripts": { + "pack": "yarn pack", "build": "run-p build:cjs build:esm build:bundle", "build:bundle": "rm -rf bundle && SDK_SETUP=cdn webpack --mode=production", "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json", diff --git a/packages/rum/package.json b/packages/rum/package.json index 93461b09d6..9b4d3a4d3b 100644 --- a/packages/rum/package.json +++ b/packages/rum/package.json @@ -6,6 +6,7 @@ "module": "esm/entries/main.js", "types": "cjs/entries/main.d.ts", "scripts": { + "pack": "yarn pack", "build": "run-p build:cjs build:esm build:bundle", "build:bundle": "rm -rf bundle && SDK_SETUP=cdn webpack --mode=production", "build:cjs": "rm -rf cjs && tsc -p tsconfig.cjs.json && yarn replace-build-env cjs", diff --git a/packages/worker/package.json b/packages/worker/package.json index db6f23ef05..fbfe5944a8 100644 --- a/packages/worker/package.json +++ b/packages/worker/package.json @@ -4,6 +4,7 @@ "license": "Apache-2.0", "main": "bundle/worker.js", "scripts": { + "pack": "yarn pack", "build": "rm -rf bundle && webpack --mode=production" }, "dependencies": { diff --git a/test/app/package.json b/test/app/package.json index fa6225a366..8daab2e050 100644 --- a/test/app/package.json +++ b/test/app/package.json @@ -7,16 +7,10 @@ "compat:ssr": "webpack --config ./webpack.ssr.js && node dist/app.js" }, "dependencies": { - "@datadog/browser-core": "portal:../../packages/core", - "@datadog/browser-logs": "portal:../../packages/logs", - "@datadog/browser-rum": "portal:../../packages/rum", - "@datadog/browser-rum-core": "portal:../../packages/rum-core" - }, - "resolutions": { - "@datadog/browser-core": "portal:../../packages/core", - "@datadog/browser-rum-core": "portal:../../packages/rum-core", - "@datadog/browser-rum": "portal:../../packages/rum", - "@datadog/browser-worker": "portal:../../packages/worker" + "@datadog/browser-core": "file:../../packages/core/package.tgz", + "@datadog/browser-logs": "file:../../packages/logs/package.tgz", + "@datadog/browser-rum": "file:../../packages/rum/package.tgz", + "@datadog/browser-rum-core": "file:../../packages/rum-core/package.tgz" }, "devDependencies": { "ts-loader": "6.2.1", diff --git a/test/app/yarn.lock b/test/app/yarn.lock index 4c6549fde1..aa492f49a5 100644 --- a/test/app/yarn.lock +++ b/test/app/yarn.lock @@ -5,15 +5,23 @@ __metadata: version: 8 cacheKey: 10c0 -"@datadog/browser-core@portal:../../packages/core::locator=app%40workspace%3A.": - version: 0.0.0-use.local - resolution: "@datadog/browser-core@portal:../../packages/core::locator=app%40workspace%3A." +"@datadog/browser-core@file:../../packages/core/package.tgz::locator=app%40workspace%3A.": + version: 6.2.1 + resolution: "@datadog/browser-core@file:../../packages/core/package.tgz#../../packages/core/package.tgz::hash=067fa5&locator=app%40workspace%3A." + checksum: 10c0/3c73271f7a102c1a92e456c025b97bd23969444607bd763170c92d97f6a258230a1a1bb606a73052cb4bc6293e3680549d5c535e9f69a32bfe4b5b88876e120e languageName: node - linkType: soft + linkType: hard -"@datadog/browser-logs@portal:../../packages/logs::locator=app%40workspace%3A.": - version: 0.0.0-use.local - resolution: "@datadog/browser-logs@portal:../../packages/logs::locator=app%40workspace%3A." +"@datadog/browser-core@npm:6.2.1": + version: 6.2.1 + resolution: "@datadog/browser-core@npm:6.2.1" + checksum: 10c0/78217a2f0e2202145ad51eefa96d5851300c2d232283a9fc24b8f31bdd6f84872959264ae529b8481c2b8c2bba6ce6c7b3d293efbe1d98ed9198b2b5bdab9ac2 + languageName: node + linkType: hard + +"@datadog/browser-logs@file:../../packages/logs/package.tgz::locator=app%40workspace%3A.": + version: 6.2.1 + resolution: "@datadog/browser-logs@file:../../packages/logs/package.tgz#../../packages/logs/package.tgz::hash=1763ea&locator=app%40workspace%3A." dependencies: "@datadog/browser-core": "npm:6.2.1" peerDependencies: @@ -21,20 +29,31 @@ __metadata: peerDependenciesMeta: "@datadog/browser-rum": optional: true + checksum: 10c0/ca84ca82ae339c8f97a02be30a7bf5645e6f79d810d9e0ce5253cc8b72873335d813a5a3b4a7af5b2af1c7bce39a33c437850094aa2e554395d8c50020d2509c languageName: node - linkType: soft + linkType: hard -"@datadog/browser-rum-core@portal:../../packages/rum-core::locator=app%40workspace%3A.": - version: 0.0.0-use.local - resolution: "@datadog/browser-rum-core@portal:../../packages/rum-core::locator=app%40workspace%3A." +"@datadog/browser-rum-core@file:../../packages/rum-core/package.tgz::locator=app%40workspace%3A.": + version: 6.2.1 + resolution: "@datadog/browser-rum-core@file:../../packages/rum-core/package.tgz#../../packages/rum-core/package.tgz::hash=e8e8a8&locator=app%40workspace%3A." dependencies: "@datadog/browser-core": "npm:6.2.1" + checksum: 10c0/6c570e4948d4fe711252e17559902c7088b057d22b6f01cb57eaba99949dc3c015c95a561480efd8e0932aaaaf1a2b888088ff2d10a46d52904f58c29c32d85f languageName: node - linkType: soft + linkType: hard -"@datadog/browser-rum@portal:../../packages/rum::locator=app%40workspace%3A.": - version: 0.0.0-use.local - resolution: "@datadog/browser-rum@portal:../../packages/rum::locator=app%40workspace%3A." +"@datadog/browser-rum-core@npm:6.2.1": + version: 6.2.1 + resolution: "@datadog/browser-rum-core@npm:6.2.1" + dependencies: + "@datadog/browser-core": "npm:6.2.1" + checksum: 10c0/68f0807c75b898c9253c19aa9023796ec5115120c833f460fc3de4c02b809153e7ebdff301e41f0c0952361a3e058a0a7f1bc311f5e6ac73c0532221b75d9075 + languageName: node + linkType: hard + +"@datadog/browser-rum@file:../../packages/rum/package.tgz::locator=app%40workspace%3A.": + version: 6.2.1 + resolution: "@datadog/browser-rum@file:../../packages/rum/package.tgz#../../packages/rum/package.tgz::hash=5420f8&locator=app%40workspace%3A." dependencies: "@datadog/browser-core": "npm:6.2.1" "@datadog/browser-rum-core": "npm:6.2.1" @@ -43,8 +62,9 @@ __metadata: peerDependenciesMeta: "@datadog/browser-logs": optional: true + checksum: 10c0/fef98e20733f50f687b7908cd6602b8ec390c9c7ae16c38ad5aa36f66a87866ec4ba69f42ad359e14a5f4e9331fd95bfe7272d627a4e745dcbe9ad60cf65894f languageName: node - linkType: soft + linkType: hard "@jridgewell/gen-mapping@npm:^0.3.5": version: 0.3.5 @@ -352,10 +372,10 @@ __metadata: version: 0.0.0-use.local resolution: "app@workspace:." dependencies: - "@datadog/browser-core": "portal:../../packages/core" - "@datadog/browser-logs": "portal:../../packages/logs" - "@datadog/browser-rum": "portal:../../packages/rum" - "@datadog/browser-rum-core": "portal:../../packages/rum-core" + "@datadog/browser-core": "file:../../packages/core/package.tgz" + "@datadog/browser-logs": "file:../../packages/logs/package.tgz" + "@datadog/browser-rum": "file:../../packages/rum/package.tgz" + "@datadog/browser-rum-core": "file:../../packages/rum-core/package.tgz" ts-loader: "npm:6.2.1" typescript: "npm:3.8.2" webpack: "npm:5.94.0"