Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: ensure project uses npm as package manager #140

Merged
merged 8 commits into from
Oct 20, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ jobs:
run: |
npm ci

- name: Retrieve API Key for Validation API
- name: Retrieve API Key for Validation API and run tests
shell: bash
working-directory: packages/otelbin-validation
env:
Expand Down
3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
*.md
coverage
.storybook/public/mockServiceWorker.js
packages/otelbin-validation
packages/otelbin-validation
packages/otelbin-validation-image
2 changes: 1 addition & 1 deletion jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const config: Config = {
"^.+\\.ts?$": "ts-jest",
},
transformIgnorePatterns: ["<rootDir>/node_modules/"],
testPathIgnorePatterns: ["packages/otelbin-validation/*"],
testPathIgnorePatterns: ["packages/otelbin-validation/*", "packages/otelbin-validation-image/*"],
};

export default config;
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"homepage": "https://github.com/dash0hq/otelbin#readme",
"devDependencies": {
"@types/aws-lambda": "^8.10.122",
"aws-lambda": "^1.0.7",
"esbuild": "^0.19.4"
},
"dependencies": {
"aws-lambda": "^1.0.7",
"@expo/spawn-async": "^1.7.2",
"js-yaml": "^4.1.0"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/otelbin-validation/.eslintrc.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 2 additions & 7 deletions packages/otelbin-validation/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions packages/otelbin-validation/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 0 additions & 24 deletions packages/otelbin-validation/.mergify.yml

This file was deleted.

2 changes: 0 additions & 2 deletions packages/otelbin-validation/.npmignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion packages/otelbin-validation/.projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions packages/otelbin-validation/.projen/files.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions packages/otelbin-validation/.projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 12 additions & 1 deletion packages/otelbin-validation/.projenrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,18 @@ const project = new awscdk.AwsCdkTypeScriptApp({
defaultReleaseBranch: 'main',
name: 'otelbin-validation',
deps: ['aws-lambda'],
devDeps: ['@jest/globals', '@types/aws-lambda', 'esbuild'],
devDeps: ['@jest/globals', '@types/aws-lambda', 'axios', 'esbuild'],
github: false, // Skip GitHub integration, as this CDK app is not in the repo's root
packageManager: 'npm',
eslintOptions: {
ignorePatterns: [
'*.js',
'*.d.ts',
'node_modules/',
'*.generated.ts',
'coverage',
'src/images/otelcol-validator/',
],
},
});
project.synth();
Loading