Skip to content

Commit b7986b9

Browse files
RobbieTheWagnerRobbieTheWagner
authored
yarn -> pnpm, make @ember/string a peerDep (#363)
* yarn -> pnpm * Make necessary updates to make pnpm work * Update ember-try.js * Update ember-try.js * Update ember-try.js
1 parent 95833ed commit b7986b9

23 files changed

+13223
-10924
lines changed

‎.ember-cli‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
{
2-
/**
3-
Ember CLI sends analytics information by default. The data is completely
4-
anonymous, but there are times when you might want to disable this behavior.
5-
6-
Setting `disableAnalytics` to true will prevent any data from being sent.
7-
*/
8-
"disableAnalytics": false,
9-
102
/**
113
Setting `isTypeScriptProject` to true will force the blueprint generators to generate TypeScript
124
rather than JavaScript by default, when a TypeScript version of a given blueprint is available.

‎.eslintignore‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,14 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
5+
/declarations/
66
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
127

138
# misc
149
/coverage/
1510
!.*
1611
.*/
17-
.eslintcache
1812

1913
# ember-try
2014
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

‎.github/workflows/ci.yml‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,40 @@ jobs:
1818
timeout-minutes: 10
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
22+
- uses: pnpm/action-setup@v4
23+
with:
24+
version: 10
2225
- name: Install Node
23-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2427
with:
25-
node-version: 20.x
26-
cache: yarn
28+
node-version: 20
29+
cache: pnpm
2730
- name: Install Dependencies
28-
run: yarn install --frozen-lockfile
31+
run: pnpm install --frozen-lockfile
2932
- name: Lint
30-
run: yarn lint
33+
run: pnpm lint
3134
- name: Run Tests
32-
run: yarn test:ember
35+
run: pnpm test:ember
3336

3437
floating:
3538
name: "Floating Dependencies"
3639
runs-on: ubuntu-latest
3740
timeout-minutes: 10
3841

3942
steps:
40-
- uses: actions/checkout@v3
41-
- uses: actions/setup-node@v3
43+
- uses: actions/checkout@v4
44+
- uses: pnpm/action-setup@v4
45+
with:
46+
version: 10
47+
- uses: actions/setup-node@v4
4248
with:
43-
node-version: 20.x
44-
cache: yarn
49+
node-version: 20
50+
cache: pnpm
4551
- name: Install Dependencies
46-
run: yarn install --no-lockfile
52+
run: pnpm install --no-lockfile
4753
- name: Run Tests
48-
run: yarn test:ember
54+
run: pnpm test:ember
4955

5056
try-scenarios:
5157
name: ${{ matrix.try-scenario }}
@@ -60,20 +66,25 @@ jobs:
6066
- ember-lts-3.28
6167
- ember-lts-4.4
6268
- ember-lts-4.8
69+
- ember-lts-4.12
70+
- ember-lts-5.4
6371
- ember-release
6472
- ember-beta
6573
- ember-canary
6674
- embroider-safe
6775
- embroider-optimized
6876

6977
steps:
70-
- uses: actions/checkout@v3
78+
- uses: actions/checkout@v4
79+
- uses: pnpm/action-setup@v4
80+
with:
81+
version: 10
7182
- name: Install Node
72-
uses: actions/setup-node@v3
83+
uses: actions/setup-node@v4
7384
with:
74-
node-version: 20.x
75-
cache: yarn
85+
node-version: 20
86+
cache: pnpm
7687
- name: Install Dependencies
77-
run: yarn install --frozen-lockfile
88+
run: pnpm install --frozen-lockfile
7889
- name: Run Tests
7990
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}

‎.gitignore‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,21 @@
1-
# See https://help.github.com/ignore-files/ for more about ignoring files.
2-
31
# compiled output
42
/dist/
5-
/tmp/
3+
/declarations/
64

75
# dependencies
8-
/bower_components/
96
/node_modules/
107

118
# misc
129
/.env*
1310
/.pnp*
14-
/.sass-cache
1511
/.eslintcache
16-
/connect.lock
1712
/coverage/
18-
/libpeerconnection.log
1913
/npm-debug.log*
2014
/testem.log
2115
/yarn-error.log
2216

2317
# ember-try
2418
/.node_modules.ember-try/
25-
/bower.json.ember-try
2619
/npm-shrinkwrap.json.ember-try
2720
/package.json.ember-try
2821
/package-lock.json.ember-try

‎.npmignore‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
/dist/
33
/tmp/
44

5-
# dependencies
6-
/bower_components/
7-
85
# misc
9-
/.bowerrc
106
/.editorconfig
117
/.ember-cli
128
/.env*
@@ -23,18 +19,18 @@
2319
/.template-lintrc.js
2420
/.travis.yml
2521
/.watchmanconfig
26-
/bower.json
2722
/CONTRIBUTING.md
2823
/ember-cli-build.js
2924
/testem.js
3025
/tests/
26+
/tsconfig.declarations.json
27+
/tsconfig.json
3128
/yarn-error.log
3229
/yarn.lock
3330
.gitkeep
3431

3532
# ember-try
3633
/.node_modules.ember-try/
37-
/bower.json.ember-try
3834
/npm-shrinkwrap.json.ember-try
3935
/package.json.ember-try
4036
/package-lock.json.ember-try

‎.prettierignore‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,13 @@
11
# unconventional js
22
/blueprints/*/files/
3-
/vendor/
43

54
# compiled output
65
/dist/
7-
/tmp/
8-
9-
# dependencies
10-
/bower_components/
11-
/node_modules/
126

137
# misc
148
/coverage/
159
!.*
16-
.eslintcache
17-
.lint-todo/
10+
.*/
1811

1912
# ember-try
2013
/.node_modules.ember-try/
21-
/bower.json.ember-try
22-
/npm-shrinkwrap.json.ember-try
23-
/package.json.ember-try
24-
/package-lock.json.ember-try
25-
/yarn.lock.ember-try

‎.watchmanconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"ignore_dirs": ["tmp", "dist"]
2+
"ignore_dirs": ["dist"]
33
}

‎CONTRIBUTING.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22

33
## Installation
44

5-
* `git clone <repository-url>`
6-
* `cd ember-cli-string-helpers`
7-
* `yarn install`
5+
- `git clone <repository-url>`
6+
- `cd ember-cli-string-helpers`
7+
- `pnpm install`
88

99
## Linting
1010

11-
* `yarn lint`
12-
* `yarn lint:fix`
11+
- `pnpm lint`
12+
- `pnpm lint:fix`
1313

1414
## Running tests
1515

16-
* `ember test` – Runs the test suite on the current Ember version
17-
* `ember test --server` – Runs the test suite in "watch mode"
18-
* `ember try:each` – Runs the test suite against multiple Ember versions
16+
- `pnpm test` – Runs the test suite on the current Ember version
17+
- `pnpm test:ember --server` – Runs the test suite in "watch mode"
18+
- `pnpm test:ember-compatibility` – Runs the test suite against multiple Ember versions
1919

2020
## Running the dummy application
2121

22-
* `ember serve`
23-
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
22+
- `pnpm start`
23+
- Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2424

2525
For more information on using ember-cli, visit [https://cli.emberjs.com/release/](https://cli.emberjs.com/release/).

‎package.json‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -22,70 +22,72 @@
2222
},
2323
"scripts": {
2424
"build": "ember build --environment=production",
25-
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
25+
"lint": "concurrently \"pnpm:lint:*(!fix)\" --names \"lint:\"",
2626
"lint:css": "stylelint \"**/*.css\"",
27-
"lint:css:fix": "concurrently \"npm:lint:css -- --fix\"",
28-
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
27+
"lint:css:fix": "concurrently \"pnpm:lint:css -- --fix\"",
28+
"lint:fix": "concurrently \"pnpm:lint:*:fix\" --names \"fix:\"",
2929
"lint:hbs": "ember-template-lint .",
3030
"lint:hbs:fix": "ember-template-lint . --fix",
3131
"lint:js": "eslint . --cache",
3232
"lint:js:fix": "eslint . --fix",
3333
"start": "ember serve",
34-
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
34+
"test": "concurrently \"pnpm:lint\" \"pnpm:test:*\" --names \"lint,test:\"",
3535
"test:ember": "ember test",
3636
"test:ember-compatibility": "ember try:each"
3737
},
3838
"bugs": "https://github.com/adopted-ember-addons/ember-cli-string-helpers/issues",
3939
"homepage": "https://github.com/adopted-ember-addons/ember-cli-string-helpers",
4040
"dependencies": {
41-
"ember-cli-babel": "^7.26.11",
42-
"ember-cli-htmlbars": "^6.2.0"
41+
"@babel/core": "^7.25.2",
42+
"ember-cli-babel": "^8.2.0",
43+
"ember-cli-htmlbars": "^6.3.0"
4344
},
4445
"devDependencies": {
45-
"@babel/eslint-parser": "^7.21.3",
46+
"@babel/eslint-parser": "^7.25.1",
4647
"@babel/helper-function-name": "^7.24.7",
47-
"@babel/plugin-proposal-decorators": "^7.21.0",
48-
"@ember/optional-features": "^2.0.0",
49-
"@ember/string": "^3.0.1",
48+
"@babel/plugin-proposal-decorators": "^7.24.7",
49+
"@ember/optional-features": "^2.1.0",
50+
"@ember/string": "^3.1.1",
5051
"@ember/test-helpers": "^5.2.2",
51-
"@embroider/test-setup": "^3.0.0",
52+
"@embroider/test-setup": "^4.0.0",
5253
"@glimmer/component": "^1.1.2",
5354
"@glimmer/tracking": "^1.1.2",
5455
"broccoli-asset-rev": "^3.0.0",
55-
"concurrently": "^8.0.1",
56-
"ember-auto-import": "^2.6.3",
57-
"ember-cli": "~4.12.3",
58-
"ember-cli-dependency-checker": "^3.3.1",
56+
"concurrently": "^8.2.2",
57+
"ember-auto-import": "^2.8.1",
58+
"ember-cli": "~5.12.0",
59+
"ember-cli-clean-css": "^3.0.0",
60+
"ember-cli-dependency-checker": "^3.3.2",
5961
"ember-cli-inject-live-reload": "^2.1.0",
6062
"ember-cli-sri": "^2.1.1",
6163
"ember-cli-terser": "^4.0.2",
6264
"ember-exam": "^9.1.0",
6365
"ember-load-initializers": "^2.1.2",
64-
"ember-page-title": "^7.0.0",
65-
"ember-qunit": "^8.0.0",
66-
"ember-resolver": "^10.0.0",
67-
"ember-source": "~4.12.0",
66+
"ember-page-title": "^8.2.3",
67+
"ember-qunit": "^8.1.0",
68+
"ember-resolver": "^12.0.1",
69+
"ember-source": "~5.12.0",
6870
"ember-source-channel-url": "^3.0.0",
69-
"ember-template-lint": "^5.7.2",
70-
"ember-try": "^2.0.0",
71-
"ember-welcome-page": "^7.0.1",
72-
"eslint": "^8.37.0",
73-
"eslint-config-prettier": "^8.8.0",
74-
"eslint-plugin-ember": "^11.5.0",
75-
"eslint-plugin-n": "^15.7.0",
76-
"eslint-plugin-prettier": "^4.2.1",
77-
"eslint-plugin-qunit": "^7.3.4",
71+
"ember-template-lint": "^6.0.0",
72+
"ember-try": "^3.0.0",
73+
"eslint": "^8.57.1",
74+
"eslint-config-prettier": "^9.1.0",
75+
"eslint-plugin-ember": "^12.2.1",
76+
"eslint-plugin-n": "^16.6.2",
77+
"eslint-plugin-prettier": "^5.2.1",
78+
"eslint-plugin-qunit": "^8.1.2",
7879
"loader.js": "^4.7.0",
79-
"prettier": "^2.8.7",
80-
"qunit": "^2.19.4",
81-
"qunit-dom": "^2.0.0",
82-
"stylelint": "^15.4.0",
83-
"stylelint-config-standard": "^32.0.0",
84-
"stylelint-prettier": "^3.0.0",
85-
"webpack": "^5.78.0"
80+
"prettier": "^3.3.3",
81+
"qunit": "^2.22.0",
82+
"qunit-dom": "^3.2.1",
83+
"stylelint": "^15.11.0",
84+
"stylelint-config-standard": "^34.0.0",
85+
"stylelint-prettier": "^4.1.0",
86+
"webpack": "^5.95.0"
8687
},
8788
"peerDependencies": {
88-
"ember-source": "^4.0.0"
89+
"@ember/string": ">= 3.1.1",
90+
"ember-source": ">= 3.28.0"
8991
},
9092
"engines": {
9193
"node": ">= 20"

0 commit comments

Comments
 (0)