Skip to content

Commit

Permalink
chore: use experimental directory
Browse files Browse the repository at this point in the history
  • Loading branch information
dyladan committed Sep 8, 2021
1 parent f131f3d commit 2f53dfe
Show file tree
Hide file tree
Showing 216 changed files with 142 additions and 139 deletions.
31 changes: 13 additions & 18 deletions .github/workflows/unit-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node_version }}

- name: Use lerna-stable.json
run: cp lerna-stable.json lerna.json

- name: restore lerna
id: cache
Expand Down Expand Up @@ -62,9 +59,6 @@ jobs:
- name: Permission Setup
run: sudo chmod -R 777 /github /__w

- name: Use lerna-stable.json
run: cp lerna-stable.json lerna.json

- name: restore lerna
uses: actions/cache@v2
id: cache
Expand Down Expand Up @@ -104,33 +98,33 @@ jobs:
- uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node_version }}

- name: Use lerna-experimental.json
run: cp lerna-experimental.json lerna.json

- name: restore lerna
id: cache
uses: actions/cache@v2
with:
path: |
node_modules
*/*/node_modules
key: node-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}
experimental/node_modules
experimental/packages/*/node_modules
key: node-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('experimental/**/package.json') }}

- name: Bootstrap
if: steps.cache.outputs.cache-hit != 'true'
working-directory: experimental
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
- name: Build 🔧
working-directory: experimental
run: |
npm run update-ts-references
npm run compile
- name: Unit tests
working-directory: experimental
run: npm run test
- name: Report Coverage
working-directory: experimental
run: npm run codecov
if: ${{ matrix.node_version == '14' }}
browser-tests-experimental:
Expand All @@ -145,30 +139,31 @@ jobs:
- name: Permission Setup
run: sudo chmod -R 777 /github /__w

- name: Use lerna-experimental.json
run: cp lerna-experimental.json lerna.json

- name: restore lerna
uses: actions/cache@v2
id: cache
with:
path: |
node_modules
*/*/node_modules
experimental/node_modules
experimental/packages/*/node_modules
key: browser-tests-experimental-${{ runner.os }}-${{ matrix.node_version }}-${{ hashFiles('**/package.json') }}

- name: Bootstrap
if: steps.cache.outputs.cache-hit != 'true'
working-directory: experimental
run: |
npm install --ignore-scripts
npx lerna bootstrap --no-ci --hoist --nohoist='zone.js'
- name: Build 🔧
working-directory: experimental
run: |
npm run update-ts-references
npm run compile
- name: Unit tests
working-directory: experimental
run: npm run test:browser
- name: Report Coverage
working-directory: experimental
run: npm run codecov:browser
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,3 @@ package.json.lerna_backup
#IDEA
.idea
*.iml

# Symlink lerna-experimental.json or lerna-stable.json
lerna.json
8 changes: 8 additions & 0 deletions experimental/lerna.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"lerna": "3.13.4",
"version": "0.25.0",
"npmClient": "npm",
"packages": [
"packages/*"
]
}
1 change: 1 addition & 0 deletions experimental/package.json
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"build": "npm run compile",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
"prewatch": "node ../../../scripts/version-update.js"
},
"keywords": [
"opentelemetry",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.esm.json",
"extends": "../../../tsconfig.base.esm.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.es5.json",
"extends": "../../../tsconfig.es5.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"tdd": "karma start",
"test:browser": "nyc karma start --single-run",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
"prewatch": "node ../../../scripts/version-update.js"
},
"keywords": [
"fetch",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.esm.json",
"extends": "../../../tsconfig.base.esm.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "tsc --build --watch",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
"prewatch": "node ../../../scripts/version-update.js"
},
"keywords": [
"opentelemetry",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "tsc --build --watch",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
"prewatch": "node ../../../scripts/version-update.js"
},
"keywords": [
"opentelemetry",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"codecov:browser": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"tdd": "karma start",
"test:browser": "nyc karma start --single-run",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
"prewatch": "node ../../../scripts/version-update.js"
},
"keywords": [
"opentelemetry",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.esm.json",
"extends": "../../../tsconfig.base.esm.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@
"tdd:browser": "karma start",
"test": "nyc ts-mocha -p tsconfig.json 'test/**/*.test.ts' --exclude 'test/browser/**/*.ts'",
"test:browser": "nyc karma start --single-run",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
"prewatch": "node ../../../scripts/version-update.js"
},
"keywords": [
"opentelemetry",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.esm.json",
"extends": "../../../tsconfig.base.esm.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"codecov": "nyc report --reporter=json && codecov -f coverage/*.json -p ../../",
"lint": "eslint . --ext .ts",
"lint:fix": "eslint . --ext .ts --fix",
"version": "node ../../scripts/version-update.js",
"version": "node ../../../scripts/version-update.js",
"watch": "tsc --build --watch tsconfig.json tsconfig.esm.json",
"precompile": "lerna run version --scope $(npm pkg get name) --include-filtered-dependencies",
"prewatch": "npm run precompile"
"prewatch": "node ../../../scripts/version-update.js"
},
"keywords": [
"opentelemetry",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"extends": "../../../tsconfig.base.esm.json",
"compilerOptions": {
"rootDir": "src",
"outDir": "build/esm",
"tsBuildInfoFile": "build/esm/tsconfig.esm.tsbuildinfo"
},
"include": [
"src/**/*.ts"
],
"references": [
{
"path": "../opentelemetry-api-metrics/tsconfig.esm.json"
}
]
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "../../tsconfig.base.json",
"extends": "../../../tsconfig.base.json",
"compilerOptions": {
"rootDir": ".",
"outDir": "build"
Expand All @@ -10,10 +10,7 @@
],
"references": [
{
"path": "../opentelemetry-core"
},
{
"path": "../opentelemetry-resources"
"path": "../opentelemetry-api-metrics"
}
]
}
27 changes: 27 additions & 0 deletions experimental/tsconfig.esm.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"extends": "../tsconfig.base.esm.json",
"files": [],
"references": [
{
"path": "packages/opentelemetry-api-metrics/tsconfig.esm.json"
},
{
"path": "packages/opentelemetry-instrumentation-fetch/tsconfig.esm.json"
},
{
"path": "packages/opentelemetry-instrumentation-grpc"
},
{
"path": "packages/opentelemetry-instrumentation-http"
},
{
"path": "packages/opentelemetry-instrumentation-xml-http-request/tsconfig.esm.json"
},
{
"path": "packages/opentelemetry-instrumentation/tsconfig.esm.json"
},
{
"path": "packages/opentelemetry-sdk-metrics-base/tsconfig.esm.json"
}
]
}
27 changes: 27 additions & 0 deletions experimental/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"extends": "../tsconfig.base.json",
"files": [],
"references": [
{
"path": "packages/opentelemetry-api-metrics"
},
{
"path": "packages/opentelemetry-instrumentation-fetch"
},
{
"path": "packages/opentelemetry-instrumentation-grpc"
},
{
"path": "packages/opentelemetry-instrumentation-http"
},
{
"path": "packages/opentelemetry-instrumentation-xml-http-request"
},
{
"path": "packages/opentelemetry-instrumentation"
},
{
"path": "packages/opentelemetry-sdk-metrics-base"
}
]
}
14 changes: 0 additions & 14 deletions lerna-experimental.json

This file was deleted.

Loading

0 comments on commit 2f53dfe

Please sign in to comment.