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

Deps #231

Merged
merged 4 commits into from
Apr 29, 2024
Merged

Deps #231

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
3 changes: 0 additions & 3 deletions .eslintignore

This file was deleted.

4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

To maintain a high standard of quality in our releases, before merging every pull request we ask that you've completed the following:

- [ ] Forked the repo and created your branch from `master`
- [ ] Forked the repo and created your branch from `main`
- [ ] Made sure tests pass (run `npm it` from the repo root)
- [ ] Expanded test coverage related to your changes:
- [ ] Added and/or updated unit tests (if appropriate)
Expand All @@ -15,7 +15,7 @@ To maintain a high standard of quality in our releases, before merging every pul
- [ ] Summarized your changes in `changelog.md`
- [ ] Linked to any related issues, PRs, etc. below that may relate to, consume, or necessitate these changes

Please also be sure to completed the CLA (if you haven't already).
Please also be sure to completed the CLA. If you haven't already, you'll be prompted to do so after submitting your PR.

Learn more about [contributing to Architect here](https://arc.codes/intro/community).

Expand Down
15 changes: 11 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ jobs:
# Go
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}

Expand All @@ -40,7 +40,14 @@ jobs:
- name: Install
run: npm install

- name: Test (Node.js <= 16.x)
if: matrix.node-version <= '16.x'
run: npm run test:nolint
env:
CI: true

- name: Test
if: matrix.node-version > '16.x'
run: npm test
env:
CI: true
Expand All @@ -67,10 +74,10 @@ jobs:
# Go
steps:
- name: Check out repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: lts/*
registry-url: https://registry.npmjs.org/
Expand Down
8 changes: 8 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

---

## [4.0.5] 2024-03-25

### Changed

- Updated dependencies

---

## [4.0.4] 2024-03-25

### Changed
Expand Down
2 changes: 1 addition & 1 deletion chars/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ module.exports = {
start,
done,
warn,
err
err,
}
1 change: 0 additions & 1 deletion check-creds/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
* - Thus, sometimes it's ok to use dummy creds, but sometimes we need to halt (via this util)
*/
module.exports = function checkAwsCredentials (params, callback) {
// eslint-disable-next-line
let awsLite = require('@aws-lite/client')
let { inventory } = params

Expand Down
12 changes: 12 additions & 0 deletions eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const arc = require('@architect/eslint-config')

module.exports = [
...arc,
{
ignores: [
'coverage',
'node_modules',
'test/mock/src',
],
},
]
2 changes: 1 addition & 1 deletion fingerprint/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module.exports = function fingerprint (params, callback) {
try {
fs.rmSync(staticJson, { force: true })
}
catch (err) {
catch {
let msg = `Error removing ${filename} file, please remove it manually or static asset calls may be broken`
update.warn(msg)
}
Expand Down
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"url": "git+https://github.com/architect/utils.git"
},
"scripts": {
"test:nolint": "npm run test:unit:updater && npm run test:unit",
"test": "npm run lint && npm run test:unit:updater && npm run test:unit",
"test:unit": "cross-env tape 'test/**/*-test.js' | tap-arc",
"test:unit:updater": "cross-env tape test/updater/test.js | tap-arc",
Expand All @@ -20,20 +21,20 @@
"author": "Brian LeRoux <[email protected]>",
"license": "Apache-2.0",
"dependencies": {
"@aws-lite/client": "^0.20.0",
"@aws-lite/client": "^0.21.1",
"chalk": "4.1.2",
"glob": "~10.3.10",
"glob": "~10.3.12",
"path-sort": "~0.1.0",
"restore-cursor": "3.1.0",
"run-series": "~1.1.9",
"run-waterfall": "~1.1.7",
"sha": "~3.0.0"
},
"devDependencies": {
"@architect/eslint-config": "~2.1.2",
"@architect/inventory": "~4.0.3",
"@architect/eslint-config": "~3.0.0",
"@architect/inventory": "~4.0.4",
"cross-env": "~7.0.3",
"eslint": "~8.57.0",
"eslint": "~9.1.1",
"proxyquire": "~2.1.3",
"sinon": "~17.0.1",
"tap-arc": "1.1.0",
Expand Down
4 changes: 2 additions & 2 deletions test/fingerprint/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let globStub = sinon.stub().callsFake(() => [])
let glob = { globSync: globStub }
let shaStub = sinon.stub(sha, 'get').callsFake((file, callback) => callback(null, 'df330f3f12')) // Fake hash
let fingerprint = proxyquire('../../fingerprint', {
'glob': glob
'glob': glob,
})

let params = () => ({
Expand Down Expand Up @@ -165,7 +165,7 @@ test('fingerprint does does not generate static.json when set to external', t =>
// Globbing
globStub.resetBehavior()
globStub.callsFake(() => [
pathToUnix(join(process.cwd(), 'public', 'index.html'))
pathToUnix(join(process.cwd(), 'public', 'index.html')),
])
// Static manifest
let fsStub = sinon.stub(fs, 'writeFile').callsFake((dest, data, callback) => {
Expand Down
4 changes: 2 additions & 2 deletions updater/lib.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let printer = {
},
// Write to console, add single extra line to buffer while running
restoreCursor: () => restore(),
write: t => out.write(t + '\033[1A' + '\n')
write: t => out.write(t + '\033[1A' + '\n'),
}
printer.hideCursor = () => printer.write('\u001B[?25l')

Expand All @@ -31,5 +31,5 @@ let spinner = { frames, timing }

module.exports = {
printer,
spinner
spinner,
}