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: yarn upgrade #2298

Draft
wants to merge 49 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
743e6dd
fix: πŸ› yarn version
DhariniJeeva May 16, 2024
3c677e1
fix: πŸ› workflow
DhariniJeeva May 16, 2024
45ca9ba
fix: πŸ› disableglobalcache in yarnc.yml
DhariniJeeva May 16, 2024
2325401
test: πŸ’ workflow
DhariniJeeva May 16, 2024
cb49e11
fix: πŸ› workflow
DhariniJeeva May 16, 2024
fad73b7
fix: πŸ› test
DhariniJeeva May 16, 2024
77a96bf
fix: πŸ› hashfiles format
DhariniJeeva May 16, 2024
c812985
fix: πŸ› format
DhariniJeeva May 16, 2024
5ec7d72
fix: πŸ› log
DhariniJeeva May 16, 2024
99746e0
chore: πŸ€– format
DhariniJeeva May 16, 2024
bebea40
fix: πŸ› save -always
DhariniJeeva May 16, 2024
b338f32
fix: πŸ› path
DhariniJeeva May 16, 2024
12d8255
fix: πŸ› remove cache step
DhariniJeeva May 16, 2024
a114cb5
fix: πŸ› add concurrently to package.json
DhariniJeeva May 17, 2024
930b6a8
chore: πŸ€– add checksum flag
DhariniJeeva May 20, 2024
81491f7
fix: πŸ› add res
DhariniJeeva May 20, 2024
f11d383
fix: πŸ› upgrade version
DhariniJeeva May 20, 2024
4c0387d
fix: πŸ› add packagemanger to all package.json
DhariniJeeva May 20, 2024
c195c26
chore: πŸ€– test
DhariniJeeva May 20, 2024
ba61598
chore: πŸ€– rebase main
DhariniJeeva Jun 18, 2024
5455813
Merge branch 'main' into test-workflow-yarn-upgrade
DhariniJeeva Jun 28, 2024
f0f1092
fix: πŸ› workflow
DhariniJeeva Jun 28, 2024
f0e41d1
chore: πŸ€– workflow
DhariniJeeva Jun 28, 2024
0a6ed16
fix: πŸ› checksum
DhariniJeeva Jun 28, 2024
b0b12f0
chore(onlyallw attr): :wq
DhariniJeeva Jun 28, 2024
dc33bb2
refactor(workflow): workflow
DhariniJeeva Jun 28, 2024
e75fc26
fix(mirage version): :wq
DhariniJeeva Jul 3, 2024
d924c1b
fix: :wq
DhariniJeeva Jul 3, 2024
2132030
chore(ember pollster update): ember pollster update
DhariniJeeva Jul 11, 2024
d12eff4
refactor: upgrade yarn
DhariniJeeva Jul 12, 2024
33620ae
Merge branch 'main' into test-workflow-yarn-upgrade
DhariniJeeva Jul 12, 2024
1ffac30
fix(copyright): copyright
DhariniJeeva Jul 12, 2024
88078fe
refactor(c): copywrite
DhariniJeeva Jul 12, 2024
34f632d
fix(babel run time pin version): babel runtime
DhariniJeeva Jul 12, 2024
c2e4fc5
fix(babel runtime): babel runtime
DhariniJeeva Jul 12, 2024
a51e635
fix(warnings): warnings
DhariniJeeva Jul 12, 2024
0af2ac7
fix(release): release
DhariniJeeva Jul 12, 2024
d193ad0
fix: fix copywrite headers
DhariniJeeva Jul 12, 2024
4b87fa9
fix(remove forge update): forge update
DhariniJeeva Jul 12, 2024
7574bab
fix: update cz version
DhariniJeeva Jul 13, 2024
f3be3fe
fix: add prestart to start script
DhariniJeeva Jul 15, 2024
02b32f7
Merge branch 'main' into test-workflow-yarn-upgrade
DhariniJeeva Jul 15, 2024
38de003
fix: yarn
DhariniJeeva Jul 15, 2024
7317200
fix: ember cli version
DhariniJeeva Jul 15, 2024
6984255
fix: sass dep pin
DhariniJeeva Jul 15, 2024
445fcfa
fix: add core-util-is dep
DhariniJeeva Jul 15, 2024
6a0d13c
fix: more dep
DhariniJeeva Jul 15, 2024
8b6f18e
fix: add has module
DhariniJeeva Jul 15, 2024
94f385f
fix: ember-cli
DhariniJeeva Jul 15, 2024
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
1 change: 1 addition & 0 deletions .copywrite.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ project {
"**/coverage/**",
"ui/desktop/electron-app/out/**",
"ui/desktop/electron-app/ember-dist/**",
"**/.yarn/**"
]
}
13 changes: 8 additions & 5 deletions .github/workflows/monorepo-validate.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name: Validate Monorepo
on: pull_request
jobs:

dependencies:
name: Install dependencies
runs-on: ubuntu-latest
Expand All @@ -10,14 +9,18 @@ jobs:
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
id: node-modules-cache
with:
path: '**/node_modules'
path: "**/node_modules"
key: node-modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
node-modules-
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
node-version: 20
- run: yarn install
# - name: Run install
# uses: borales/actions-yarn@v4
# with:
# cmd: install # will run `yarn install` command

compliance:
name: License Compliance
Expand All @@ -28,7 +31,7 @@ jobs:
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
id: node-modules-cache
with:
path: '**/node_modules'
path: "**/node_modules"
key: node-modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
node-modules-
Expand All @@ -47,7 +50,7 @@ jobs:
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
id: node-modules-cache
with:
path: '**/node_modules'
path: "**/node_modules"
key: node-modules-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
node-modules-
Expand All @@ -66,7 +69,7 @@ jobs:
- uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
id: node-modules-cache
with:
path: '**/node_modules'
path: "**/node_modules"
key: node-modules-${{ hashFiles('**/yarn.lock') }}
- uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
with:
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,12 @@ yarn-error.log
# Ignore all local history of files
.history
.ionide

# yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
894 changes: 894 additions & 0 deletions .yarn/releases/yarn-4.3.1.cjs

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Copyright (c) HashiCorp, Inc.
# SPDX-License-Identifier: BUSL-1.1

cacheFolder: .yarn/cache

checksumBehavior: ignore

compressionLevel: mixed

enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.3.1.cjs
8 changes: 8 additions & 0 deletions addons/api/mirage/models/scope.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/**
* Copyright (c) HashiCorp, Inc.
* SPDX-License-Identifier: BUSL-1.1
*/

import Model from './base';

export default Model.extend({});
12 changes: 7 additions & 5 deletions addons/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@
},
"dependencies": {
"dexie": "^3.2.4",
"ember-auto-import": "^2.6.3",
"ember-auto-import": "^2.7.4",
"ember-can": "^4.2.0",
"ember-cli-babel": "^7.26.10",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-mirage": "^2.4.0",
"ember-cli-mirage": "^3.0.3",
"ember-data": "~4.12.0",
"ember-fetch": "^8.1.1",
"has": "^1.0.4",
"tracked-built-ins": "^3.1.1"
},
"devDependencies": {
Expand All @@ -41,6 +42,7 @@
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@embroider/test-setup": "^2.1.1",
"@faker-js/faker": "^8.0.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
Expand All @@ -64,13 +66,13 @@
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-n": "^16.3.1",
"eslint-plugin-qunit": "^8.0.1",
"@faker-js/faker": "^8.0.2",
"js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
"loader.js": "^4.7.0",
"miragejs": "^0.1.48",
"prettier": "^3.0.0",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"webpack": "^5.78.0"
"webpack": "^5.93.0"
},
"peerDependencies": {
"ember-source": ">4.0.0"
Expand Down
5 changes: 3 additions & 2 deletions addons/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"ember-simple-auth": "^4.2.2"
},
"devDependencies": {
"@babel/core": "^7.21.0",
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@ember/optional-features": "^2.0.0",
Expand All @@ -38,7 +39,7 @@
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.0.1",
"doctoc": "^2.2.0",
"ember-auto-import": "^2.6.3",
"ember-auto-import": "^2.7.4",
"ember-cli": "^4.12.2",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
Expand All @@ -64,7 +65,7 @@
"prettier": "^3.0.0",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"webpack": "^5.78.0"
"webpack": "^5.93.0"
},
"engines": {
"node": "18.* || 20.*"
Expand Down
11 changes: 7 additions & 4 deletions addons/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,25 @@
"doc:toc": "doctoc README.md"
},
"dependencies": {
"@babel/helpers": "^7.24.8",
"api": "*",
"auth": "*",
"ember-auto-import": "^2.6.3",
"ember-auto-import": "^2.7.4",
"ember-browser-services": "^4.0.3",
"ember-cli-babel": "^7.26.11",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-sass": "^11.0.1",
"ember-feature-flags": "^6.0.0",
"ember-intl": "^6.0.0-beta.6",
"ember-loading": "^2.0.0",
"ember-truth-helpers": "^3.0.0",
"ember-truth-helpers": "^4.0.3",
"filesize": "^10.0.7",
"intl-messageformat": "^10.5.14",
"intl-unofficial-duration-unit-format": "^3.1.0",
"sass": "^1.69.5"
"sass": "1.77.6"
},
"devDependencies": {
"@babel/core": "^7.21.0",
"@babel/eslint-parser": "^7.21.3",
"@babel/plugin-proposal-decorators": "^7.21.0",
"@ember/optional-features": "^2.0.0",
Expand Down Expand Up @@ -85,7 +88,7 @@
"qunit-dom": "^2.0.0",
"rose": "*",
"sinon": "^17.0.1",
"webpack": "^5.78.0"
"webpack": "^5.93.0"
},
"peerDependencies": {
"ember-source": "^4.0.0",
Expand Down
10 changes: 5 additions & 5 deletions addons/rose/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,18 @@
"@embroider/test-setup": "^2.1.1",
"@hashicorp/design-system-components": "^4.4.1",
"codemirror": "5.65.7",
"ember-auto-import": "^2.6.3",
"ember-auto-import": "^2.7.4",
"ember-cli-babel": "^7.26.11",
"ember-cli-clipboard": "^1.0.0",
"ember-cli-htmlbars": "^6.2.0",
"ember-cli-sass": "^11.0.1",
"ember-composable-helpers": "^5.0.0",
"ember-focus-trap": "^1.0.1",
"ember-named-blocks-polyfill": "^0.2.5",
"ember-radio-button": "github:yapplabs/ember-radio-button.git#b2ab65f",
"ember-radio-button": "^3.0.0-beta.1",
"ember-uuid": "^2.1.0",
"jsonlint": "^1.6.3",
"sass": "^1.69.5"
"sass": "1.77.6"
},
"devDependencies": {
"@babel/core": "^7.18.5",
Expand Down Expand Up @@ -94,9 +94,9 @@
"react-dom": "^16",
"react-syntax-highlighter": "^15.5.0",
"stylelint": "^15.10.1",
"stylelint-config-prettier-scss": "^0.0.1",
"stylelint-config-prettier-scss": "^1.0.0",
"stylelint-config-standard-scss": "^11.0.0",
"webpack": "^5.78.0"
"webpack": "^5.93.0"
},
"peerDependencies": {
"ember-source": "^4.0.0"
Expand Down
32 changes: 6 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"addons/*",
"ui/*"
],
"nohoist": [
"installConfig.hoistingLimits": [
"**/electron**"
]
},
Expand Down Expand Up @@ -36,11 +36,12 @@
"test:addons-rose": "yarn --cwd addons/rose test",
"test:ui-admin": "yarn --cwd ui/admin test",
"test:ui-desktop": "yarn --cwd ui/desktop test",
"compliance:licenses": "license-checker --onlyAllow 'Apache*;Apache License, Version 2.0;Apache-2.0;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;BUSL-1.1;Public Domain;Python-2.0;Unicode-TOU;Unlicense;WTFPL' --excludePackages 'boundary-ui;admin@0.0.0;desktop@0.0.0;base64-js@0.0.2;cycle@1.0.3;cldr-core@43.1.0;make-plural@7.2.0;@hashicorp/ember-asciinema-player@0.0.0;path-scurry@1.10.1'",
"compliance:licenses": "license-checker --onlyAllow 'Apache*;Apache License, Version 2.0;Apache-2.0;Unicode-DFS-2016;Apache 2.0;Artistic-2.0;BSD;BSD-3-Clause;CC-BY-3.0;CC-BY-4.0;CC0-1.0;ISC;MIT;MPL-2.0;BUSL-1.1;Public Domain;Python-2.0;Unicode-TOU;Unlicense;WTFPL;BlueOak-1.0.0' --excludePackages 'boundary-ui;admin@0.0.0;desktop@0.0.0;base64-js@0.0.2;cycle@1.0.3;cldr-core@43.1.0;make-plural@7.2.0;@hashicorp/ember-asciinema-player@0.0.0;path-scurry@1.10.1'",
"doc:toc": "doctoc README.md",
"prepare": "husky install"
},
"devDependencies": {
"concurrently": "^8.2.2",
"cz-conventional-changelog": "^3.1.0",
"doctoc": "^2.2.0",
"git-cz": "^4.8.0",
Expand All @@ -50,29 +51,7 @@
},
"resolutions": {
"request": "^2.88.0",
"loader-utils": "^2.0.4",
"**/ember-electron/**/minimatch": "^3.0.5",
"**/babel-core/json5": "^2.2.2",
"**/react-syntax-highlighter/refractor/prismjs": "^1.27.0",
"**/nomnom/underscore": "^1.12.1",
"**/remark-parse/trim": "^1.0.1",
"**/react-dev-utils/browserslist": "^4.16.5",
"**/pretty-bytes/meow/trim-newlines": "^3.0.1",
"**/ember-cli/**/clean-css-promise/clean-css": "^4.1.11",
"**/bower-config/minimist": "^1.2.6",
"**/commitizen/minimist": "^1.2.6",
"**/ember-intl/broccoli-merge-files/fast-glob/glob-parent": "^5.1.2",
"**/watchpack/watchpack-chokidar2/chokidar/glob-parent": "^5.1.2",
"**/core/ember-inline-svg/**/nth-check": "^2.0.1",
"**/snapdragon/base/cache-base/**/set-value": "^4.0.1",
"**/jsprim/json-schema": "^0.4.0",
"**/ember-cli/markdown-it-terminal/markdown-it": "^12.3.2",
"**/ember-cli-mirage/@embroider/macros": "^1.0.0",
"**/ember-electron/**/got": "^11.8.6",
"**/ember-cli/**/ansi-html": "^0.0.9",
"**/ember-cli/testem/fireworm/async": "^2.6.4",
"**/desktop/@doyensec/electronegativity/winston/async": "^2.6.4",
"**/@hashicorp/design-system-components/ember-stargate": "^0.6.0"
"loader-utils": "^2.0.4"
},
"config": {
"commitizen": {
Expand All @@ -81,5 +60,6 @@
},
"engines": {
"node": "18.* || 20.*"
}
},
"packageManager": "yarn@4.3.1"
}
10 changes: 6 additions & 4 deletions ui/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"posttest": "ember coverage-merge && yarn clean:coverage"
},
"dependencies": {
"@babel/runtime": "7.12.18",
"ember-named-blocks-polyfill": "^0.2.5",
"lodash": "^4.17.21"
},
Expand All @@ -55,7 +56,7 @@
"@ember/render-modifiers": "^2.0.4",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^2.9.3",
"@embroider/macros": "^1.13.1",
"@embroider/macros": "^1.16.5",
"@faker-js/faker": "^8.0.2",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
Expand All @@ -67,7 +68,7 @@
"core": "*",
"doctoc": "^2.2.0",
"ember-a11y-testing": "^4.2.0",
"ember-auto-import": "^2.6.3",
"ember-auto-import": "^2.7.4",
"ember-cli": "^4.12.2",
"ember-cli-app-version": "^6.0.0",
"ember-cli-babel": "^7.26.11",
Expand All @@ -85,7 +86,7 @@
"ember-load-initializers": "^2.1.2",
"ember-modifier": "^4.1.0",
"ember-page-title": "^7.0.0",
"ember-pollster": "https://github.com/hashicorp/ember-pollster.git#718db797382b04aca281216319885c5ff625f539",
"ember-pollster": "https://github.com/hashicorp/ember-pollster.git#f80834d184048a6a9c7c46f52fcf80553c61e5e2",
"ember-qunit": "^6.2.0",
"ember-resolver": "^10.0.0",
"ember-source": "~4.12.0",
Expand All @@ -98,13 +99,14 @@
"eslint-plugin-qunit": "^8.0.1",
"js-bexpr": "hashicorp/js-bexpr#9b4a4b54d85eba67fdfc0990133d1518d890b1e1",
"loader.js": "^4.7.0",
"postcss": "^8.4.31",
"prettier": "^3.0.0",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"rose": "*",
"sinon": "^14.0.0",
"stylelint": "^15.10.1",
"stylelint-config-prettier-scss": "^0.0.1",
"stylelint-config-prettier-scss": "^1.0.0",
"stylelint-config-standard-scss": "^11.0.0",
"tracked-built-ins": "^3.1.1",
"webpack": "^5.78.0"
Expand Down
1 change: 0 additions & 1 deletion ui/desktop/.stylelintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ module.exports = {
'max-nesting-depth': 4,
'selector-max-compound-selectors': 4,
'scss/at-extend-no-missing-placeholder': null,
'function-parentheses-space-inside': null,
'property-no-vendor-prefix': null,
'at-rule-no-vendor-prefix': null,
// This is often limited by the DOM and we want to order our declarations by our own standard
Expand Down
10 changes: 10 additions & 0 deletions ui/desktop/electron-app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,13 @@ ember-test/

# Autoupdate
nextVersion/


# yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
Loading