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.

Sign up for GitHub

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

Upgrade embroider deps #261

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

Upgrade embroider deps #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f1d2a3
Upgrade embroider deps
ynotdraw Aug 23, 2023
289b484
upgrade deps
NullVoxPopuli Aug 23, 2023
cf11dbb
rollup-plugin-ts requires a broserslist entry that isn't false
NullVoxPopuli Aug 23, 2023
99978e1
fixed it
NullVoxPopuli Aug 23, 2023
f7756c0
Full build success
NullVoxPopuli Aug 23, 2023
dd95d94
Fix lints
NullVoxPopuli Aug 23, 2023
fe31702
Fix type checking
NullVoxPopuli Aug 23, 2023
d258315
Merge pull request #262 from NullVoxPopuli/nvp/embroider-upgrade
ynotdraw Aug 23, 2023
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
6 changes: 3 additions & 3 deletions docs-app/app/assets/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
/**
* postcss-import doesn't follow "exports" entries in package.json
*/
@import '@crowdstrike/ember-oss-docs/dist/styles/tailwind-extensions.css';
@import '@crowdstrike/ember-oss-docs/dist/styles/docfy-overrides.css';
@import '@crowdstrike/ember-oss-docs/dist/styles/hljs.css';
@import '@crowdstrike/ember-oss-docs/styles/tailwind-extensions.css';
@import '@crowdstrike/ember-oss-docs/styles/docfy-overrides.css';
@import '@crowdstrike/ember-oss-docs/styles/hljs.css';
Comment on lines +8 to +10
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NullVoxPopuli the problem with this now is that if you visit https://e164cf93.ember-toucan-core.pages.dev/, you'll see the CSS not being applied. Do we need to tell Webpack about this by adding a CSS Loader of sorts?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's possible that https://github.com/CrowdStrike/ember-oss-docs/blob/main/ember-oss-docs/package.json#L167 needs to be expanded to differentiate between js and css.
otherwise, it wouldn't be too farfetched to include ./dist/styles in exports so that both webpack and the css-loader are happy.

it turns out googling exports and webpack together is really hard, due to CJS 😅

Some back and forth with AI suggested using resolve.alias, but that's less fun. may work tho

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, alternatively, these 3 files could be imported in a js file.

2 changes: 1 addition & 1 deletion docs-app/app/templates/application.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{page-title "ember-toucan-core"}}
{{(page-title "ember-toucan-core")}}

<App>
<:topBar>
Expand Down
93 changes: 45 additions & 48 deletions docs-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,84 +25,81 @@
"test:ember": "ember test",
"_syncPnpm": "pnpm sync-dependencies-meta-injected"
},
"devDependencyComments": {
"@embroider/core": "Had to pin to v2.0.2 as the other versions of embroider break our builds due to the beta-y nature of releases of embroider. We will upgrade to the latest version as part of https://github.com/CrowdStrike/ember-toucan-core/issues/210"
},
"devDependencies": {
"@babel/core": "^7.19.6",
"@babel/eslint-parser": "^7.19.1",
"@crowdstrike/ember-toucan-styles": "^2.0.1",
"@babel/core": "^7.22.10",
"@babel/eslint-parser": "^7.22.10",
"@crowdstrike/ember-toucan-styles": "^2.0.2",
"@crowdstrike/tailwind-toucan-base": "^4.0.0",
"@docfy/core": "^0.6.0",
"@docfy/ember": "^0.6.0",
"@ember/optional-features": "^2.0.0",
"@ember/string": "^3.0.1",
"@ember/test-helpers": "^3.1.0",
"@embroider/compat": "^2.0.0",
"@embroider/core": "2.1.1",
"@embroider/webpack": "^2.0.0",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.0",
"@embroider/compat": "^3.2.1",
"@embroider/core": "3.2.1",
"@embroider/webpack": "^3.1.5",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glint/core": "^1.0.2",
"@glint/environment-ember-loose": "^1.0.2",
"@glint/environment-ember-template-imports": "^1.0.2",
"@glint/template": "^1.0.2",
"@glint/core": "^1.1.0",
"@glint/environment-ember-loose": "^1.1.0",
"@glint/environment-ember-template-imports": "^1.1.0",
"@glint/template": "^1.1.0",
"@html-next/vertical-collection": "^4.0.0",
"@nullvoxpopuli/eslint-configs": "^3.0.4",
"@tailwindcss/typography": "^0.5.7",
"@tsconfig/ember": "^2.0.0",
"@types/dompurify": "^3.0.0",
"@types/ember": "^4.0.1",
"@types/ember-resolver": "^5.0.11",
"@types/ember__application": "^4.0.2",
"@types/ember__array": "^4.0.2",
"@types/ember__component": "^4.0.10",
"@types/ember__controller": "^4.0.1",
"@types/ember__debug": "^4.0.1",
"@types/ember__destroyable": "^4.0.0",
"@types/ember__engine": "^4.0.2",
"@types/ember__error": "^4.0.0",
"@types/ember__object": "^4.0.4",
"@types/ember__owner": "^4.0.0",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.11",
"@types/ember__runloop": "^4.0.1",
"@types/ember__service": "^4.0.0",
"@types/ember": "^4.0.4",
"@types/ember-resolver": "^9.0.0",
"@types/ember__application": "^4.0.6",
"@types/ember__array": "^4.0.4",
"@types/ember__component": "^4.0.15",
"@types/ember__controller": "^4.0.6",
"@types/ember__debug": "^4.0.4",
"@types/ember__destroyable": "^4.0.2",
"@types/ember__engine": "^4.0.5",
"@types/ember__error": "^4.0.3",
"@types/ember__object": "^4.0.6",
"@types/ember__owner": "^4.0.5",
"@types/ember__polyfills": "^4.0.2",
"@types/ember__routing": "^4.0.13",
"@types/ember__runloop": "^4.0.4",
"@types/ember__service": "^4.0.3",
"@types/ember__string": "^3.0.9",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__utils": "^4.0.1",
"@types/qunit": "^2.19.3",
"@types/ember__template": "^4.0.2",
"@types/ember__test": "^4.0.2",
"@types/ember__utils": "^4.0.3",
"@types/qunit": "^2.19.6",
"autoprefixer": "^10.4.12",
"broccoli-asset-rev": "^3.0.0",
"chai": "^4.3.7",
"concurrently": "^8.0.0",
"cssnano": "^6.0.0",
"ember-auto-import": "^2.4.2",
"ember-auto-import": "^2.6.3",
"ember-changeset": "^4.1.2",
"ember-changeset-validations": "^4.1.1",
"ember-cli": "~5.2.0",
"ember-cli-app-version": "^6.0.1",
"ember-cli-babel": "^7.26.11",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-dependency-checker": "^3.3.2",
"ember-cli-deprecation-workflow": "^2.1.0",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-htmlbars": "^6.3.0",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-fetch": "^8.1.2",
"ember-headless-form": "1.0.0-beta.3",
"ember-headless-form-changeset": "1.0.0-beta.1",
"ember-load-initializers": "^2.1.2",
"ember-page-title": "^8.0.0-beta.0",
"ember-page-title": "^8.0.0",
"ember-qunit": "^7.0.0",
"ember-resolver": "^11.0.0",
"ember-resolver": "^11.0.1",
"ember-source": "~5.2.0",
"ember-template-imports": "^3.1.2",
"ember-template-lint": "^5.8.0",
"ember-template-imports": "^3.4.2",
"ember-template-lint": "^5.11.2",
"eslint": "^8.32.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-ember": "^11.8.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-qunit": "^7.3.1",
Expand All @@ -112,9 +109,9 @@
"postcss-import": "^15.0.0",
"postcss-loader": "^7.0.1",
"prettier": "^3.0.1",
"prettier-plugin-ember-template-tag": "^1.0.0",
"prettier-plugin-ember-template-tag": "^1.0.2",
"prettier-plugin-tailwindcss": "^0.5.0",
"qunit": "^2.19.1",
"qunit": "^2.19.4",
"qunit-dom": "^2.0.0",
"tailwindcss": "^3.1.8",
"typescript": "^5.0.0",
Expand All @@ -132,15 +129,15 @@
"@crowdstrike/ember-toucan-core": "workspace:*",
"@crowdstrike/ember-toucan-form": "workspace:*",
"@ember/test-waiters": "^3.0.2",
"@embroider/router": "^2.0.0",
"@embroider/router": "^2.1.3",
"dompurify": "^3.0.0",
"ember-browser-services": "^4.0.4",
"ember-modifier": "^4.1.0",
"ember-resources": "^6.0.0",
"ember-velcro": "^2.1.0",
"ember-velcro": "^2.1.1",
"highlight.js": "^11.6.0",
"highlightjs-glimmer": "^2.0.0",
"tracked-built-ins": "^3.1.0"
"tracked-built-ins": "^3.1.1"
},
"dependenciesMeta": {
"@crowdstrike/ember-toucan-core": {
Expand Down
74 changes: 37 additions & 37 deletions packages/ember-toucan-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,71 +42,71 @@
"tailwindcss": "^2.2.15 || ^3.0.0"
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.22.10",
"@embroider/addon-shim": "^1.0.0",
"@floating-ui/dom": "^1.4.2",
"ember-velcro": "^2.1.0"
"ember-velcro": "^2.1.1"
},
"devDependencies": {
"@babel/core": "^7.17.0",
"@babel/eslint-parser": "^7.19.1",
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-decorators": "^7.17.0",
"@babel/plugin-syntax-decorators": "^7.17.0",
"@babel/preset-typescript": "^7.18.6",
"@crowdstrike/ember-toucan-styles": "^2.0.1",
"@ember/test-helpers": "^3.1.0",
"@embroider/addon-dev": "^3.0.0",
"@babel/core": "^7.22.10",
"@babel/eslint-parser": "^7.22.10",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.22.10",
"@babel/plugin-syntax-decorators": "^7.22.10",
"@babel/preset-typescript": "^7.22.5",
"@crowdstrike/ember-toucan-styles": "^2.0.2",
"@ember/test-helpers": "^3.2.0",
"@embroider/addon-dev": "^4.1.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glint/core": "^1.0.2",
"@glint/environment-ember-loose": "^1.0.2",
"@glint/environment-ember-template-imports": "^1.0.2",
"@glint/template": "^1.0.2",
"@glint/core": "^1.1.0",
"@glint/environment-ember-loose": "^1.1.0",
"@glint/environment-ember-template-imports": "^1.1.0",
"@glint/template": "^1.1.0",
"@nullvoxpopuli/eslint-configs": "^3.0.4",
"@tsconfig/ember": "^2.0.0",
"@types/ember": "^4.0.0",
"@types/ember__application": "^4.0.0",
"@types/ember__array": "^4.0.0",
"@types/ember__component": "^4.0.0",
"@types/ember__controller": "^4.0.0",
"@types/ember__debug": "^4.0.0",
"@types/ember__engine": "^4.0.0",
"@types/ember__error": "^4.0.0",
"@types/ember": "^4.0.4",
"@types/ember__application": "^4.0.6",
"@types/ember__array": "^4.0.4",
"@types/ember__component": "^4.0.15",
"@types/ember__controller": "^4.0.6",
"@types/ember__debug": "^4.0.4",
"@types/ember__engine": "^4.0.5",
"@types/ember__error": "^4.0.3",
"@types/ember__helper": "^4.0.2",
"@types/ember__modifier": "^4.0.3",
"@types/ember__object": "^4.0.0",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.0",
"@types/ember__runloop": "^4.0.0",
"@types/ember__service": "^4.0.0",
"@types/ember__modifier": "^4.0.5",
"@types/ember__object": "^4.0.6",
"@types/ember__polyfills": "^4.0.2",
"@types/ember__routing": "^4.0.13",
"@types/ember__runloop": "^4.0.4",
"@types/ember__service": "^4.0.3",
"@types/ember__string": "^3.16.0",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__utils": "^4.0.0",
"@types/ember__template": "^4.0.2",
"@types/ember__test": "^4.0.2",
"@types/ember__utils": "^4.0.3",
"@typescript-eslint/eslint-plugin": "^5.30.5",
"@typescript-eslint/parser": "^5.30.5",
"autoprefixer": "^10.0.2",
"concurrently": "^8.0.0",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-htmlbars": "^6.3.0",
"ember-source": "~5.2.0",
"ember-template-imports": "^3.4.2",
"ember-template-lint": "^5.8.0",
"ember-template-lint": "^5.11.2",
"eslint": "^8.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^11.8.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"fractal-page-object": "^0.4.1",
"postcss": "^8.2.14",
"prettier": "^3.0.1",
"prettier-plugin-ember-template-tag": "^1.0.0",
"prettier-plugin-ember-template-tag": "^1.0.2",
"prettier-plugin-tailwindcss": "^0.5.0",
"rollup": "^3.12.1",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-glimmer-template-tag": "^0.4.1",
"rollup-plugin-ts": "^3.0.2",
"rollup-plugin-ts": "^3.4.4",
"tailwindcss": "^2.2.15",
"typescript": "^5.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/ember-toucan-core/rollup.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default {
// compile TypeScript to latest JavaScript, including Babel transpilation
typescript({
transpiler: 'babel',
browserslist: false,
browserslist: ['last 1 chrome versions'],
// Reasoning for this being set to true: https://github.com/NullVoxPopuli/rollup-plugin-glimmer-template-tag/#configure-rollup-plugin-ts-ts-only
transpileOnly: true,
}),
Expand Down
72 changes: 36 additions & 36 deletions packages/ember-toucan-form/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,72 +43,72 @@
"tailwindcss": "^2.2.15 || ^3.0.0"
},
"dependencies": {
"@babel/runtime": "^7.20.7",
"@babel/runtime": "^7.22.10",
"@embroider/addon-shim": "^1.0.0",
"ember-modifier": "^4.1.0"
},
"devDependencies": {
"@babel/core": "^7.17.0",
"@babel/eslint-parser": "^7.19.1",
"@babel/plugin-proposal-class-properties": "^7.16.7",
"@babel/plugin-proposal-decorators": "^7.17.0",
"@babel/plugin-syntax-decorators": "^7.17.0",
"@babel/preset-typescript": "^7.18.6",
"@babel/core": "^7.22.10",
"@babel/eslint-parser": "^7.22.10",
"@babel/plugin-proposal-class-properties": "^7.18.6",
"@babel/plugin-proposal-decorators": "^7.22.10",
"@babel/plugin-syntax-decorators": "^7.22.10",
"@babel/preset-typescript": "^7.22.5",
"@crowdstrike/ember-toucan-core": "workspace:*",
"@crowdstrike/ember-toucan-styles": "^2.0.1",
"@ember/test-helpers": "^3.1.0",
"@embroider/addon-dev": "^3.0.0",
"@crowdstrike/ember-toucan-styles": "^2.0.2",
"@ember/test-helpers": "^3.2.0",
"@embroider/addon-dev": "^4.1.0",
"@glimmer/component": "^1.1.2",
"@glimmer/tracking": "^1.1.2",
"@glint/core": "^1.0.2",
"@glint/environment-ember-loose": "^1.0.2",
"@glint/environment-ember-template-imports": "^1.0.2",
"@glint/template": "^1.0.2",
"@glint/core": "^1.1.0",
"@glint/environment-ember-loose": "^1.1.0",
"@glint/environment-ember-template-imports": "^1.1.0",
"@glint/template": "^1.1.0",
"@nullvoxpopuli/eslint-configs": "^3.0.4",
"@tsconfig/ember": "^2.0.0",
"@types/ember": "^4.0.0",
"@types/ember__application": "^4.0.0",
"@types/ember__array": "^4.0.0",
"@types/ember__component": "^4.0.0",
"@types/ember__controller": "^4.0.0",
"@types/ember__debug": "^4.0.0",
"@types/ember__engine": "^4.0.0",
"@types/ember__error": "^4.0.0",
"@types/ember": "^4.0.4",
"@types/ember__application": "^4.0.6",
"@types/ember__array": "^4.0.4",
"@types/ember__component": "^4.0.15",
"@types/ember__controller": "^4.0.6",
"@types/ember__debug": "^4.0.4",
"@types/ember__engine": "^4.0.5",
"@types/ember__error": "^4.0.3",
"@types/ember__helper": "^4.0.2",
"@types/ember__modifier": "^4.0.3",
"@types/ember__object": "^4.0.0",
"@types/ember__polyfills": "^4.0.0",
"@types/ember__routing": "^4.0.0",
"@types/ember__runloop": "^4.0.0",
"@types/ember__service": "^4.0.0",
"@types/ember__modifier": "^4.0.5",
"@types/ember__object": "^4.0.6",
"@types/ember__polyfills": "^4.0.2",
"@types/ember__routing": "^4.0.13",
"@types/ember__runloop": "^4.0.4",
"@types/ember__service": "^4.0.3",
"@types/ember__string": "^3.16.0",
"@types/ember__template": "^4.0.0",
"@types/ember__test": "^4.0.0",
"@types/ember__utils": "^4.0.0",
"@types/ember__template": "^4.0.2",
"@types/ember__test": "^4.0.2",
"@types/ember__utils": "^4.0.3",
"@typescript-eslint/eslint-plugin": "^5.30.5",
"@typescript-eslint/parser": "^5.30.5",
"autoprefixer": "^10.0.2",
"concurrently": "^8.0.0",
"ember-cli-htmlbars": "^6.1.1",
"ember-cli-htmlbars": "^6.3.0",
"ember-headless-form": "^1.0.0-beta.3",
"ember-source": "~5.2.0",
"ember-template-imports": "^3.4.2",
"ember-template-lint": "^5.8.0",
"ember-template-lint": "^5.11.2",
"eslint": "^8.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-ember": "^11.8.0",
"eslint-plugin-ember": "^11.11.1",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.0.0",
"fractal-page-object": "^0.4.1",
"postcss": "^8.2.14",
"prettier": "^3.0.1",
"prettier-plugin-ember-template-tag": "^1.0.0",
"prettier-plugin-ember-template-tag": "^1.0.2",
"prettier-plugin-tailwindcss": "^0.5.0",
"rollup": "^3.12.1",
"rollup-plugin-copy": "^3.4.0",
"rollup-plugin-glimmer-template-tag": "^0.4.1",
"rollup-plugin-ts": "^3.0.2",
"rollup-plugin-ts": "^3.4.4",
"tailwindcss": "^2.2.15",
"typescript": "^5.0.0"
},
Expand Down
Loading