Skip to content

Commit

Permalink
Fix build (#1100)
Browse files Browse the repository at this point in the history
* Update test-app

* Update docs

* Update eslint-plugin-prettier

* Fix lint

* Update pnpm-lock.yaml

* pnpm dedupe

* Resolve peer issues (#1101)

---------

Co-authored-by: NullVoxPopuli <[email protected]>
  • Loading branch information
RobbieTheWagner and NullVoxPopuli committed Sep 6, 2023
1 parent 52a0e21 commit 6c7ada0
Show file tree
Hide file tree
Showing 14 changed files with 1,545 additions and 1,337 deletions.
1 change: 1 addition & 0 deletions docs/.gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# compiled output
/dist/
/declarations/

# dependencies
/node_modules/
Expand Down
2 changes: 1 addition & 1 deletion docs/config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "5.0.0",
"version": "5.2.1",
"blueprints": [
{
"name": "app",
Expand Down
28 changes: 17 additions & 11 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,19 @@
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"start": "ember serve",
"start": "concurrently 'ember serve' 'pnpm _syncPnpm --watch' --names 'serve,sync deps'",
"test": "concurrently \"npm:lint\" \"npm:test:*\" --names \"lint,test:\"",
"test:ember": "ember test"
"test:ember": "ember test",
"_syncPnpm": "DEBUG=sync-pnpm pnpm sync-dependencies-meta-injected"
},
"dependencies": {
"ember-math-helpers": "workspace:*"
},
"dependenciesMeta": {
"ember-math-helpers": {
"injected": true
}
},
"devDependencies": {
"@babel/core": "7.22.11",
"@babel/eslint-parser": "^7.22.11",
Expand All @@ -37,17 +43,17 @@
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.0",
"@embroider/compat": "^3.2.1",
"@embroider/core": "^3.0.2",
"@embroider/webpack": "^3.0.0",
"@embroider/core": "^3.2.1",
"@embroider/webpack": "^3.1.5",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"autoprefixer": "^10.4.15",
"broccoli-asset-rev": "^3.0.0",
"concurrently": "^8.2.1",
"cssnano": "^6.0.1",
"ember-auto-import": "^2.6.3",
"ember-cli": "~5.0.0",
"ember-cli-app-version": "^6.0.0",
"ember-cli": "~5.2.1",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^8.0.0",
"ember-cli-clean-css": "^2.0.0",
"ember-cli-dependency-checker": "^3.3.2",
Expand All @@ -59,7 +65,6 @@
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-data": "~5.1.1",
"ember-dynamic-render-template": "^0.0.6",
"ember-fetch": "^8.1.2",
"ember-load-initializers": "^2.1.2",
Expand All @@ -73,19 +78,20 @@
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-n": "^16.0.2",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-qunit": "^8.0.0",
"loader.js": "^4.7.0",
"pnpm-sync-dependencies-meta-injected": "^0.0.9",
"postcss": "^8.4.28",
"postcss-loader": "^7.3.3",
"prettier": "^2.8.8",
"prettier": "^3.0.2",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"stylelint": "^15.10.3",
"stylelint-config-standard": "^34.0.0",
"stylelint-prettier": "^3.0.0",
"stylelint-prettier": "^4.0.2",
"tailwindcss": "^3.3.3",
"tracked-built-ins": "^3.1.1",
"tracked-built-ins": "^3.2.0",
"webpack": "^5.88.2"
},
"ember": {
Expand Down
2 changes: 1 addition & 1 deletion docs/postcss.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if (env === 'production') {
plugins.push(
require('cssnano')({
preset: 'default',
})
}),
);
}

Expand Down
4 changes: 2 additions & 2 deletions ember-math-helpers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@
"eslint-plugin-import": "2.28.1",
"eslint-plugin-json": "3.1.0",
"eslint-plugin-node": "11.1.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-simple-import-sort": "10.0.0",
"prettier": "^2.8.8",
"prettier": "^3.0.2",
"rollup": "^3.28.1"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions ember-math-helpers/src/helpers/random.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export function random(params, { decimals } = DEFAULT_OPTS) {
const [upperBound] = params;

return +(Math.random() * upperBound).toFixed(
max(0, min(MAX_DECIMALS, decimals))
max(0, min(MAX_DECIMALS, decimals)),
);
}

Expand All @@ -64,7 +64,7 @@ export function random(params, { decimals } = DEFAULT_OPTS) {
}

return +(lowerBound + Math.random() * (upperBound - lowerBound)).toFixed(
max(0, min(MAX_DECIMALS, decimals))
max(0, min(MAX_DECIMALS, decimals)),
);
}

Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,9 @@
"patchedDependencies": {
"[email protected]": "patches/[email protected]"
}
},
"volta": {
"node": "18.17.1",
"pnpm": "8.7.1"
}
}
Loading

0 comments on commit 6c7ada0

Please sign in to comment.