Skip to content

Commit

Permalink
Updated project configurations (#144)
Browse files Browse the repository at this point in the history 
* chore: Downstreamed changes from ember-cli and @embroider/addon-blueprint

* chore: Added changeset

---------

Co-authored-by: ijlee2 <ijlee2@users.noreply.github.com>
  • Loading branch information
@ijlee2
ijlee2 and ijlee2 authored Apr 26, 2024
1 parent cd0368d commit eb3c9fb
Show file tree
Hide file tree
Showing 20 changed files with 63 additions and 69 deletions.
13 changes: 13 additions & 0 deletions .changeset/plenty-apes-train.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"ember-codemod-remove-ember-css-modules": patch
"my-app-with-ember-css-modules": patch
"embroider-css-modules": patch
"test-app-for-embroider-css-modules": patch
"type-css-modules": patch
"test-app-for-my-v2-addon": patch
"my-v1-addon": patch
"my-v2-addon": patch
"my-app": patch
---

Downstreamed changes from ember-cli and @embroider/addon-blueprint
8 changes: 4 additions & 4 deletions docs/my-app-with-ember-css-modules/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
},
"scripts": {
"_build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"app/**/*.css\" --cache",
"lint:css:fix": "stylelint \"app/**/*.css\" --fix",
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:css": "stylelint 'app/**/*.css' --cache",
"lint:css:fix": "stylelint 'app/**/*.css' --fix",
"lint:dependency": "ember dependency-lint",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
Expand Down
8 changes: 4 additions & 4 deletions docs/my-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"app/**/*.css\" --cache",
"lint:css:fix": "stylelint \"app/**/*.css\" --fix",
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:css": "stylelint 'app/**/*.css' --cache",
"lint:css:fix": "stylelint 'app/**/*.css' --fix",
"lint:dependency": "ember dependency-lint",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
Expand Down
8 changes: 4 additions & 4 deletions docs/my-v1-addon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
},
"scripts": {
"build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\" --cache",
"lint:css:fix": "stylelint \"**/*.css\" --fix",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:css": "stylelint '**/*.css' --cache",
"lint:css:fix": "stylelint '**/*.css' --fix",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
Expand Down
2 changes: 0 additions & 2 deletions docs/my-v2-addon/.eslintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@

# misc
/coverage/
!.*
.*/
10 changes: 2 additions & 8 deletions docs/my-v2-addon/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,8 @@
/node_modules/

# misc
/.env*
/.pnp*
/.eslintcache
/.stylelintcache
/coverage/
/npm-debug.log*
/testem.log
/yarn-error.log

# broccoli-debug
/DEBUG/
# npm/pnpm/yarn pack output
*.tgz
2 changes: 0 additions & 2 deletions docs/my-v2-addon/.prettierignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@

# misc
/coverage/
!.*
.*/
1 change: 1 addition & 0 deletions docs/my-v2-addon/.stylelintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@
/blueprints/*/files/

# compiled output
/declarations/
/dist/
14 changes: 7 additions & 7 deletions docs/my-v2-addon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@
"dist"
],
"scripts": {
"build": "concurrently \"npm:build:*\" --names \"build:\"",
"build": "concurrently 'pnpm:build:*' --names 'build:'",
"build:js": "rollup --config",
"build:types": "glint --declaration",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"**/*.css\" --cache",
"lint:css:fix": "stylelint \"**/*.css\" --fix",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:css": "stylelint '**/*.css' --cache",
"lint:css:fix": "stylelint '**/*.css' --fix",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"prelint:types": "type-css-modules --src src",
"lint:types": "glint",
"prepack": "rollup --config",
"start": "concurrently \"npm:start:*\" --names \"start:\"",
"prepack": "concurrently 'pnpm:build:*'",
"start": "concurrently 'pnpm:start:*' --names 'start:'",
"start:js": "rollup --config --watch --no-watch.clearScreen",
"start:types": "glint --declaration --watch",
"test": "echo 'A v2 addon does not have tests, run tests in tests/my-v2-addon'"
Expand Down
3 changes: 3 additions & 0 deletions docs/my-v2-addon/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"allowImportingTsExtensions": true,
"allowJs": true,
"declarationDir": "declarations",
"emitDeclarationOnly": true,
"noEmit": false,
"noEmitOnError": false,
"rootDir": "./src",
"skipLibCheck": true
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"author": "Isaac J. Lee",
"type": "module",
"scripts": {
"build": "concurrently 'npm:build:*'",
"build": "concurrently 'pnpm:build:*'",
"build:embroider-css-modules": "pnpm --filter embroider-css-modules build",
"build:my-app": "pnpm --filter my-app build",
"build:my-v2-addon": "pnpm --filter my-v2-addon build",
Expand All @@ -20,7 +20,7 @@
"prepare": "pnpm --filter './packages/**' --filter my-v2-addon build",
"release:changelog": "changeset version",
"release:publish": "pnpm build && changeset publish",
"start": "concurrently 'npm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
"start": "concurrently 'pnpm:start:*' --restart-after 5000 --prefix-colors cyan,white,yellow",
"start:embroider-css-modules": "pnpm --filter embroider-css-modules start",
"start:my-app": "pnpm --filter my-app start",
"start:my-v2-addon": "pnpm --filter my-v2-addon start",
Expand Down
4 changes: 2 additions & 2 deletions packages/ember-codemod-remove-ember-css-modules/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
],
"scripts": {
"build": "./build.sh --production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"lint:types": "tsc --noEmit",
Expand Down
2 changes: 0 additions & 2 deletions packages/embroider-css-modules/.eslintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,3 @@

# misc
/coverage/
!.*
.*/
17 changes: 2 additions & 15 deletions packages/embroider-css-modules/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,8 @@
/node_modules/

# misc
/.env*
/.pnp*
/.eslintcache
/.stylelintcache
/coverage/
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

# broccoli-debug
/DEBUG/
# npm/pnpm/yarn pack output
*.tgz
3 changes: 1 addition & 2 deletions packages/embroider-css-modules/.prettierignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@
/blueprints/*/files/

# compiled output
/declarations/
/dist/

# misc
/coverage/
!.*
.*/
10 changes: 5 additions & 5 deletions packages/embroider-css-modules/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@
"dist"
],
"scripts": {
"build": "concurrently \"npm:build:*\" --names \"build:\"",
"build": "concurrently 'pnpm:build:*' --names 'build:'",
"build:js": "rollup --config",
"build:types": "glint --declaration",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"lint:types": "glint",
"prepack": "rollup --config",
"start": "concurrently \"npm:start:*\" --names \"start:\"",
"prepack": "concurrently 'pnpm:build:*'",
"start": "concurrently 'pnpm:start:*' --names 'start:'",
"start:js": "rollup --config --watch --no-watch.clearScreen",
"start:types": "glint --declaration --watch",
"test": "echo 'A v2 addon does not have tests, run tests in tests/embroider-css-modules'"
Expand Down
3 changes: 3 additions & 0 deletions packages/embroider-css-modules/tsconfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
"allowImportingTsExtensions": true,
"allowJs": true,
"declarationDir": "declarations",
"emitDeclarationOnly": true,
"noEmit": false,
"noEmitOnError": false,
"rootDir": "./src",
"skipLibCheck": true
},
Expand Down
4 changes: 2 additions & 2 deletions packages/type-css-modules/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
],
"scripts": {
"build": "./build.sh --production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:js": "eslint . --cache",
"lint:js:fix": "eslint . --fix",
"lint:types": "tsc --noEmit",
Expand Down
8 changes: 4 additions & 4 deletions tests/embroider-css-modules/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
},
"scripts": {
"_build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"app/**/*.css\" --cache",
"lint:css:fix": "stylelint \"app/**/*.css\" --fix",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:css": "stylelint 'app/**/*.css' --cache",
"lint:css:fix": "stylelint 'app/**/*.css' --fix",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
Expand Down
8 changes: 4 additions & 4 deletions tests/my-v2-addon/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
},
"scripts": {
"_build": "ember build --environment=production",
"lint": "concurrently \"npm:lint:*(!fix)\" --names \"lint:\"",
"lint:css": "stylelint \"app/**/*.css\" --cache",
"lint:css:fix": "stylelint \"app/**/*.css\" --fix",
"lint:fix": "concurrently \"npm:lint:*:fix\" --names \"fix:\"",
"lint": "concurrently 'pnpm:lint:*(!fix)' --names 'lint:'",
"lint:css": "stylelint 'app/**/*.css' --cache",
"lint:css:fix": "stylelint 'app/**/*.css' --fix",
"lint:fix": "concurrently 'pnpm:lint:*:fix' --names 'fix:'",
"lint:hbs": "ember-template-lint .",
"lint:hbs:fix": "ember-template-lint . --fix",
"lint:js": "eslint . --cache",
Expand Down

0 comments on commit eb3c9fb

Please sign in to comment.