-
Notifications
You must be signed in to change notification settings - Fork 16
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
Add option to load .cjs config file #83
Merged
Merged
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
31f7b42
Add option to load .cjs config file
revmischa 10e69b0
CJS test
revmischa 796ee6a
Create CJS config dir
revmischa 6529971
tables
revmischa 9590891
cjs config file
revmischa 10b86ab
Update snapshot
revmischa 34ce1b6
don't type-check cjs
revmischa 23aebdd
setup CJS path
revmischa File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
const tables = require("./tables"); | ||
|
||
module.exports = { | ||
tables: () => tables, | ||
basePort: 10500, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
module.exports = [ | ||
{ | ||
TableName: "files", | ||
KeySchema: [{ AttributeName: "id", KeyType: "HASH" }], | ||
AttributeDefinitions: [{ AttributeName: "id", AttributeType: "S" }], | ||
ProvisionedThroughput: { | ||
ReadCapacityUnits: 1, | ||
WriteCapacityUnits: 1, | ||
}, | ||
}, | ||
{ | ||
TableName: "images", | ||
KeySchema: [{ AttributeName: "url", KeyType: "HASH" }], | ||
AttributeDefinitions: [{ AttributeName: "url", AttributeType: "S" }], | ||
ProvisionedThroughput: { | ||
ReadCapacityUnits: 1, | ||
WriteCapacityUnits: 1, | ||
}, | ||
data: [ | ||
{ | ||
url: "https://something.com/something/image.jpg", | ||
width: 100, | ||
height: 200, | ||
}, | ||
{ | ||
url: "https://something.com/something/image2.jpg", | ||
width: 150, | ||
height: 250, | ||
}, | ||
], | ||
}, | ||
]; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import { join } from "path"; | ||
import base from "../jest.base"; | ||
|
||
export default { | ||
...base, | ||
setupFiles: [join(__dirname, "setups/setupCjs.ts")], | ||
setupFilesAfterEnv: [join(__dirname, "setups/setupAdvancedEnv.ts")], | ||
displayName: { | ||
name: "cjs", | ||
color: "yellow", | ||
}, | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
import { join } from "path"; | ||
import { setup } from "../../src"; | ||
|
||
// Setup with the config dir | ||
setup(join(__dirname, "../configs/javascript")); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
{ | ||
"extends": "./tsconfig.json", | ||
"include": ["**/*.js", "**/*.ts", ".jest/**/*.js", ".eslintrc.js"] | ||
"include": ["**/*.js", "**/*.ts", "**/*.cjs", ".jest/**/*.js", ".eslintrc.js"] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should probably name this
.cjs
to actually test the CJS feature?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok
I don't really understand how the tests are being run
Eslint is yelling at me:
I couldn't find what to change to make it happy
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need to add "*.cjs" to the
tsconfig.esllint.json
at the root of the repo. Atm I think it only includes.js
and.ts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The idea here is we want to ensure that
.cjs
configs do actually work and don't regress