Ensure style compilation works properly with ember-cli >= 3.18 #934
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -738,6 +738,21 @@ export default class V1Addon { | |
| private buildAddonStyles(built: IntermediateBuild) { | ||
| let addonStylesTree = this.addonStylesTree(); | ||
| if (addonStylesTree) { | ||
| if (this.app.hasCompiledStyles) { | ||
| // >= [email protected] store css files in <addon-name/__COMPILED_STYLES__ | ||
| // and for embroider to work correctly need to be moved back to `/` | ||
| // | ||
| // speaking with @rwjblue the ember-cli build is now frozen, and it is | ||
| // ok to assume that after the above version no changes will occur | ||
| // makings this work-around safe. | ||
| // | ||
| // additional context: https://github.com/embroider-build/embroider/pull/934/files#r695269976 | ||
| addonStylesTree = buildFunnel(addonStylesTree, { | ||
| srcDir: `${this.name}/__COMPILED_STYLES__`, | ||
| destDir: '/', | ||
| }); | ||
| } | ||
|
|
||
| let discoveredFiles: string[] = []; | ||
| let tree = new ObserveTree(addonStylesTree, outputPath => { | ||
| discoveredFiles = walkSync(outputPath, { globs: ['**/*.css'], directories: false }); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,6 +20,8 @@ import mapKeys from 'lodash/mapKeys'; | |
| import SynthesizeTemplateOnlyComponents from './synthesize-template-only-components'; | ||
| import { isEmberAutoImportDynamic } from './detect-babel-plugins'; | ||
| import prepHtmlbarsAstPluginsForUnwrap from './prepare-htmlbars-ast-plugins'; | ||
| import { readFileSync } from 'fs'; | ||
| import semver from 'semver'; | ||
|
|
||
| // This controls and types the interface between our new world and the classic | ||
| // v1 app instance. | ||
|
|
@@ -97,6 +99,11 @@ export default class V1App { | |
| return dirname(emberCLIPackage); | ||
| } | ||
|
|
||
| @Memoize() | ||
| get hasCompiledStyles() { | ||
| return semver.gte(JSON.parse(readFileSync(`${this.emberCLILocation}/package.json`, 'utf8')).version, '3.18.0'); | ||
|
There was a problem hiding this comment. @rwjblue I'm open to suggestions to detecting this in a different way... There was a problem hiding this comment. Ya this seems good to me, especially since we already have the |
||
| } | ||
|
|
||
| private requireFromEmberCLI(specifier: string) { | ||
| // eslint-disable-next-line @typescript-eslint/no-require-imports | ||
| return require(resolve.sync(specifier, { basedir: this.emberCLILocation })); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ | |
| resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea" | ||
| integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w== | ||
|
|
||
| "@babel/core@^7.0.0", "@babel/core@^7.1.0", "@babel/core@^7.1.6", "@babel/core@^7.10.2", "@babel/core@^7.12.0", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.12.9", "@babel/core@^7.13.8", "@babel/core@^7.14.5", "@babel/core@^7.3.4", "@babel/core@^7.7.7", "@babel/core@^7.8.7": | ||
| version "7.14.5" | ||
| resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.5.tgz#d281f46a9905f07d1b3bf71ead54d9c7d89cb1e3" | ||
| integrity sha512-RN/AwP2DJmQTZSfiDaD+JQQ/J99KsIpOCfBE5pL+5jJSt7nI3nYGoAXZu+ffYSQ029NLs2DstZb+eR81uuARgg== | ||
|
|
@@ -4791,7 +4791,7 @@ broccoli-babel-transpiler@^6.5.0: | |
| rsvp "^4.8.2" | ||
| workerpool "^2.3.0" | ||
|
|
||
| broccoli-babel-transpiler@^7.2.0, broccoli-babel-transpiler@^7.3.0, broccoli-babel-transpiler@^7.6.0, broccoli-babel-transpiler@^7.8.0: | ||
| version "7.8.0" | ||
| resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e" | ||
| integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q== | ||
|
|
@@ -7829,8 +7829,7 @@ ember-cli-is-package-missing@^1.0.0: | |
| resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390" | ||
| integrity sha1-bmGEyvuSY13ZPKbJRrEEKS1OM5A= | ||
|
|
||
| "ember-cli-latest@npm:ember-cli@latest": | ||
| version "3.26.1" | ||
| resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.26.1.tgz#43e924454f1fcff6157863925d0eb33bfa593c24" | ||
| integrity sha512-jJ0kMob21A/HIqkDNWQMZnnpadjS/xaBlv1RU1NoCUi+3Lqpt9esDT9cK0QCFp9vh4zfU4BEBNYkMN/SiQMaGg== | ||
|
|
@@ -8120,100 +8119,6 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2: | |
| semver "^7.3.4" | ||
| silent-error "^1.1.1" | ||
|
|
||
| ember-cli@~3.27.0: | ||
| version "3.27.0" | ||
| resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.27.0.tgz#8ccf9db51d7b462f86210b853d086a4543605c34" | ||
|
|
@@ -13405,17 +13310,6 @@ [email protected]: | |
| lodash.merge "^4.6.0" | ||
| markdown-it "^8.3.1" | ||
|
|
||
| [email protected]: | ||
| version "0.2.1" | ||
| resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.2.1.tgz#670fd5ea824a7dcaa1591dcbeef28bf70aff1705" | ||
|
|
@@ -13427,17 +13321,6 @@ [email protected]: | |
| lodash.merge "^4.6.2" | ||
| markdown-it "^8.3.1" | ||
|
|
||
| markdown-it@^11.0.0: | ||
| version "11.0.1" | ||
| resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.1.tgz#b54f15ec2a2193efa66dda1eb4173baea08993d6" | ||
|
|
@@ -14149,7 +14032,7 @@ npm-package-arg@^6.1.1: | |
| semver "^5.6.0" | ||
| validate-npm-package-name "^3.0.0" | ||
|
|
||
| npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1: | ||
| version "8.1.4" | ||
| resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.4.tgz#8001cdbc4363997b8ef6c6cf7aaf543c5805879d" | ||
| integrity sha512-xLokoCFqj/rPdr3LvcdDL6Kj6ipXGEDHD/QGpzwU6/pibYUOXmp5DBmg76yukFyx4ZDbrXNOTn+BPyd8TD4Jlw== | ||
|
|
@@ -15045,7 +14928,7 @@ promise-retry@^1.1.1: | |
| err-code "^1.0.0" | ||
| retry "^0.10.0" | ||
|
|
||
| promise.hash.helper@^1.0.6, promise.hash.helper@^1.0.7: | ||
| version "1.0.7" | ||
| resolved "https://registry.yarnpkg.com/promise.hash.helper/-/promise.hash.helper-1.0.7.tgz#2f39d8495df40dcdfbc1d5be9e9e56efeae7f180" | ||
| integrity sha512-0qhWYyCV9TYDMSooYw1fShIb7R6hsWYja7JLqbeb1MvHqDTvP/uy/R1RsyVqDi6GCiHOI4G5p2Hpr3IA+/l/+Q== | ||
|
|
@@ -15808,7 +15691,7 @@ [email protected]: | |
| resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" | ||
| integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= | ||
|
|
||
| resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.0, resolve@^1.14.2, resolve@^1.15.0, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1: | ||
| version "1.20.0" | ||
| resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" | ||
| integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
rather then detected this for each add-on, i memoize the result on the app instance and reuse said result for each addon's addon styles