From d6cb7a765aebe2dbe95a163b4b0507bdce36f87e Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Mon, 23 Aug 2021 15:51:46 -0600 Subject: [PATCH 1/4] =?UTF-8?q?Bump=20test-packages/support=E2=80=99s=20to?= =?UTF-8?q?=20known=20failing=20version=20of=20ember-cli=20for=20debugging?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test-packages/support/package.json | 2 +- yarn.lock | 145 ++++++++++++++++++++++++++++- 2 files changed, 143 insertions(+), 4 deletions(-) diff --git a/test-packages/support/package.json b/test-packages/support/package.json index e723491a0..b8272b6ad 100644 --- a/test-packages/support/package.json +++ b/test-packages/support/package.json @@ -14,7 +14,7 @@ "broccoli": "^3.4.2", "console-ui": "^3.0.0", "ember-auto-import": "^1.2.21", - "ember-cli": "~3.17.0", + "ember-cli": "~3.18.0", "ember-cli-babel": "^7.20.5", "ember-cli-htmlbars": "^4.2.0", "ember-resolver": "^7.0.0", diff --git a/yarn.lock b/yarn.lock index 40488d1fa..bd77fe769 100644 --- a/yarn.lock +++ b/yarn.lock @@ -630,7 +630,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.14.5", "@babel/plugin-transform-modules-amd@^7.7.5": +"@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.14.5", "@babel/plugin-transform-modules-amd@^7.7.5", "@babel/plugin-transform-modules-amd@^7.8.3": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7" integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g== @@ -3253,6 +3253,11 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" +"@xmldom/xmldom@^0.7.1": + version "0.7.2" + resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.2.tgz#d920079e66806b2626b5311955f6a7c4bed1cba8" + integrity sha512-t/Zqo0ewes3iq6zGqEqJNUWI27Acr3jkmSUNp6E3nl0Z2XbtqAG5XYqPNLdYonILmhcxANsIidh69tHzjXtuRg== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -8214,6 +8219,100 @@ ember-cli@~3.17.0: watch-detector "^1.0.0" yam "^1.0.0" +ember-cli@~3.18.0: + version "3.18.0" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.18.0.tgz#fdee530b156f752a97e75b832d97a8616f1cab4d" + integrity sha512-I/9ps0AI6BDjUm9/M1to96kc6d2yAYZ/ApX+teDTwFqZBVX3cE6EASfRWw14/Y3nPSI8wXo3aviYBYs6KMWgqA== + dependencies: + "@babel/core" "^7.8.7" + "@babel/plugin-transform-modules-amd" "^7.8.3" + amd-name-resolver "^1.3.1" + babel-plugin-module-resolver "^4.0.0" + bower-config "^1.4.1" + bower-endpoint-parser "0.2.2" + broccoli "^3.3.3" + broccoli-amd-funnel "^2.0.1" + broccoli-babel-transpiler "^7.4.0" + broccoli-builder "^0.18.14" + broccoli-concat "^3.7.4" + broccoli-config-loader "^1.0.1" + broccoli-config-replace "^1.1.2" + broccoli-debug "^0.6.5" + broccoli-funnel "^2.0.2" + broccoli-funnel-reducer "^1.0.0" + broccoli-merge-trees "^3.0.2" + broccoli-middleware "^2.1.1" + broccoli-slow-trees "^3.0.1" + broccoli-source "^3.0.0" + broccoli-stew "^3.0.0" + calculate-cache-key-for-tree "^2.0.0" + capture-exit "^2.0.0" + chalk "^3.0.0" + ci-info "^2.0.0" + clean-base-url "^1.0.0" + compression "^1.7.4" + configstore "^5.0.1" + console-ui "^3.1.1" + core-object "^3.1.5" + dag-map "^2.0.2" + diff "^4.0.2" + ember-cli-is-package-missing "^1.0.0" + ember-cli-lodash-subset "^2.0.1" + ember-cli-normalize-entity-name "^1.0.0" + ember-cli-preprocess-registry "^3.3.0" + ember-cli-string-utils "^1.1.0" + ember-source-channel-url "^2.0.1" + ensure-posix-path "^1.1.1" + execa "^1.0.0" + exit "^0.1.2" + express "^4.17.1" + filesize "^6.1.0" + find-up "^4.1.0" + find-yarn-workspace-root "^1.2.1" + fs-extra "^8.1.0" + fs-tree-diff "^2.0.1" + get-caller-file "^2.0.5" + git-repo-info "^2.1.1" + glob "^7.1.6" + heimdalljs "^0.2.6" + heimdalljs-fs-monitor "^0.2.3" + heimdalljs-graph "^1.0.0" + heimdalljs-logger "^0.1.10" + http-proxy "^1.18.0" + inflection "^1.12.0" + is-git-url "^1.0.0" + isbinaryfile "^4.0.4" + js-yaml "^3.13.1" + json-stable-stringify "^1.0.1" + leek "0.0.24" + lodash.template "^4.5.0" + markdown-it "^10.0.0" + markdown-it-terminal "0.1.1" + minimatch "^3.0.4" + morgan "^1.9.1" + nopt "^3.0.6" + npm-package-arg "^8.0.1" + p-defer "^3.0.0" + portfinder "^1.0.25" + promise-map-series "^0.3.0" + promise.hash.helper "^1.0.6" + quick-temp "^0.1.8" + resolve "^1.15.1" + resolve-package-path "^2.0.0" + sane "^4.1.0" + semver "^7.1.3" + silent-error "^1.1.1" + sort-package-json "^1.40.0" + symlink-or-copy "^1.3.1" + temp "0.9.1" + testem "^3.0.2" + tiny-lr "^1.1.1" + tree-sync "^2.0.0" + uuid "^7.0.2" + walk-sync "^2.0.2" + watch-detector "^1.0.0" + yam "^1.0.0" + ember-cli@~3.27.0: version "3.27.0" resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.27.0.tgz#8ccf9db51d7b462f86210b853d086a4543605c34" @@ -12126,7 +12225,7 @@ isbinaryfile@^3.0.3: dependencies: buffer-alloc "^1.2.0" -isbinaryfile@^4.0.6: +isbinaryfile@^4.0.4, isbinaryfile@^4.0.6: version "4.0.8" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== @@ -16405,7 +16504,7 @@ sort-object-keys@^1.1.3: resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45" integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg== -sort-package-json@^1.39.1, sort-package-json@^1.44.0, sort-package-json@^1.48.0: +sort-package-json@^1.39.1, sort-package-json@^1.40.0, sort-package-json@^1.44.0, sort-package-json@^1.48.0: version "1.50.0" resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.50.0.tgz#19fc109fe23bd157bd03c8e572fa3251a52467d8" integrity sha512-qZpqhMU9XTntebgAgc4hv/D6Fzhh7kFnwvV6a7+q8y8J5JoaDqPYQnvXPf7BBqG95tdE8X6JVNo7/jDzcbdfUg== @@ -17120,6 +17219,41 @@ testem@^3.0.1, testem@^3.1.0, testem@^3.2.0: tmp "0.0.33" xmldom "^0.6.0" +testem@^3.0.2: + version "3.4.3" + resolved "https://registry.yarnpkg.com/testem/-/testem-3.4.3.tgz#ed13abb9632622cec17b285bf9aa0a9cc6c02024" + integrity sha512-x8P+urqzwv+K8eJo6/kavSLtwgLr59AINkIG+CIVmWy2DDtC8xt9J+4n8G6PETcSXIO3cSUTt63QWTgDGGBVnA== + dependencies: + "@xmldom/xmldom" "^0.7.1" + backbone "^1.1.2" + bluebird "^3.4.6" + charm "^1.0.0" + commander "^2.6.0" + compression "^1.7.4" + consolidate "^0.15.1" + execa "^1.0.0" + express "^4.10.7" + fireworm "^0.7.0" + glob "^7.0.4" + http-proxy "^1.13.1" + js-yaml "^3.2.5" + lodash.assignin "^4.1.0" + lodash.castarray "^4.4.0" + lodash.clonedeep "^4.4.1" + lodash.find "^4.5.1" + lodash.uniqby "^4.7.0" + mkdirp "^0.5.1" + mustache "^3.0.0" + node-notifier "^9.0.1" + npmlog "^4.0.0" + printf "^0.6.1" + rimraf "^2.4.4" + socket.io "^4.1.2" + spawn-args "^0.2.0" + styled_string "0.0.1" + tap-parser "^7.0.0" + tmp "0.0.33" + text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -17809,6 +17943,11 @@ uuid@^3.3.2, uuid@^3.4.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" + integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== + v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0, v8-compile-cache@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" From 13b587d30e702cb94593ffe4a2818878115d1446 Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Tue, 24 Aug 2021 16:33:52 -0600 Subject: [PATCH 2/4] =?UTF-8?q?[BUGFIX]=20Handle=20ember-cli=20>=3D=203.18?= =?UTF-8?q?=E2=80=99s=20=5F=5FCOMPILED=5FSTYLES=5F=5F=20dir=20layout=20cha?= =?UTF-8?q?nge?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ember 3.18 moves add-on styles into `/__COMPILED_STYLES`, this isn’t compatible with embroider, so we move it back… --- packages/compat/src/v1-addon.ts | 15 +++ packages/compat/src/v1-app.ts | 7 ++ test-packages/sample-transforms/package.json | 2 +- yarn.lock | 100 +------------------ 4 files changed, 26 insertions(+), 98 deletions(-) diff --git a/packages/compat/src/v1-addon.ts b/packages/compat/src/v1-addon.ts index 96df29052..078f09dc3 100644 --- a/packages/compat/src/v1-addon.ts +++ b/packages/compat/src/v1-addon.ts @@ -738,6 +738,21 @@ export default class V1Addon { private buildAddonStyles(built: IntermediateBuild) { let addonStylesTree = this.addonStylesTree(); if (addonStylesTree) { + if (this.app.hasCompiledStyles) { + // >= ember-cli@4.18 store css files in { discoveredFiles = walkSync(outputPath, { globs: ['**/*.css'], directories: false }); diff --git a/packages/compat/src/v1-app.ts b/packages/compat/src/v1-app.ts index 8dcdb88a4..d8a92f7c3 100644 --- a/packages/compat/src/v1-app.ts +++ b/packages/compat/src/v1-app.ts @@ -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'); + } + private requireFromEmberCLI(specifier: string) { // eslint-disable-next-line @typescript-eslint/no-require-imports return require(resolve.sync(specifier, { basedir: this.emberCLILocation })); diff --git a/test-packages/sample-transforms/package.json b/test-packages/sample-transforms/package.json index c258bcc23..f155e08af 100644 --- a/test-packages/sample-transforms/package.json +++ b/test-packages/sample-transforms/package.json @@ -28,7 +28,7 @@ "@embroider/test-support": "0.36.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.11.2", - "ember-cli": "~3.17.0", + "ember-cli": "~3.18.0", "ember-cli-dependency-checker": "^3.1.0", "ember-cli-eslint": "^5.1.0", "ember-cli-htmlbars": "^4.3.1", diff --git a/yarn.lock b/yarn.lock index bd77fe769..7841dc739 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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.4", "@babel/core@^7.8.7": +"@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== @@ -8125,100 +8125,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.17.0: - version "3.17.0" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.17.0.tgz#d846027c01f1835c7903b6bff073c2a80885202e" - integrity sha512-0GVer7AyV/g8hclbD64FmsNkULQ0N1pEQytB+utuJl8c6NFU4EUMJL7NyM/NRd7rzupMMR1jwzhxYTCY50ZRcg== - dependencies: - "@babel/core" "^7.8.4" - "@babel/plugin-transform-modules-amd" "^7.7.5" - amd-name-resolver "^1.3.1" - babel-plugin-module-resolver "^4.0.0" - bower-config "^1.4.1" - bower-endpoint-parser "0.2.2" - broccoli "^3.3.3" - broccoli-amd-funnel "^2.0.1" - broccoli-babel-transpiler "^7.4.0" - broccoli-builder "^0.18.14" - broccoli-concat "^3.7.4" - broccoli-config-loader "^1.0.1" - broccoli-config-replace "^1.1.2" - broccoli-debug "^0.6.5" - broccoli-funnel "^2.0.2" - broccoli-funnel-reducer "^1.0.0" - broccoli-merge-trees "^3.0.2" - broccoli-middleware "^2.1.1" - broccoli-slow-trees "^3.0.1" - broccoli-source "^3.0.0" - broccoli-stew "^3.0.0" - calculate-cache-key-for-tree "^2.0.0" - capture-exit "^2.0.0" - chalk "^3.0.0" - ci-info "^2.0.0" - clean-base-url "^1.0.0" - compression "^1.7.4" - configstore "^5.0.1" - console-ui "^3.1.1" - core-object "^3.1.5" - dag-map "^2.0.2" - diff "^4.0.1" - ember-cli-is-package-missing "^1.0.0" - ember-cli-lodash-subset "^2.0.1" - ember-cli-normalize-entity-name "^1.0.0" - ember-cli-preprocess-registry "^3.3.0" - ember-cli-string-utils "^1.1.0" - ember-source-channel-url "^2.0.1" - ensure-posix-path "^1.0.2" - execa "^1.0.0" - exit "^0.1.2" - express "^4.16.4" - filesize "^4.2.0" - find-up "^4.1.0" - find-yarn-workspace-root "^1.2.1" - fs-extra "^8.1.0" - fs-tree-diff "^2.0.1" - get-caller-file "^2.0.5" - git-repo-info "^2.1.1" - glob "^7.1.4" - heimdalljs "^0.2.6" - heimdalljs-fs-monitor "^0.2.3" - heimdalljs-graph "^1.0.0" - heimdalljs-logger "^0.1.10" - http-proxy "^1.18.0" - inflection "^1.12.0" - is-git-url "^1.0.0" - isbinaryfile "^3.0.3" - js-yaml "^3.13.1" - json-stable-stringify "^1.0.1" - leek "0.0.24" - lodash.template "^4.5.0" - markdown-it "^10.0.0" - markdown-it-terminal "0.1.1" - minimatch "^3.0.4" - morgan "^1.9.1" - nopt "^3.0.6" - npm-package-arg "^8.0.0" - p-defer "^3.0.0" - portfinder "^1.0.25" - promise-map-series "^0.3.0" - promise.hash.helper "^1.0.2" - quick-temp "^0.1.8" - resolve "^1.15.1" - resolve-package-path "^2.0.0" - sane "^4.1.0" - semver "^6.3.0" - silent-error "^1.1.1" - sort-package-json "^1.39.1" - symlink-or-copy "^1.3.1" - temp "0.9.1" - testem "^3.0.1" - tiny-lr "^1.1.1" - tree-sync "^2.0.0" - uuid "^3.4.0" - walk-sync "^2.0.2" - watch-detector "^1.0.0" - yam "^1.0.0" - ember-cli@~3.18.0: version "3.18.0" resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.18.0.tgz#fdee530b156f752a97e75b832d97a8616f1cab4d" @@ -14248,7 +14154,7 @@ npm-package-arg@^6.1.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.1: +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== @@ -15144,7 +15050,7 @@ promise-retry@^1.1.1: err-code "^1.0.0" retry "^0.10.0" -promise.hash.helper@^1.0.2, promise.hash.helper@^1.0.6, promise.hash.helper@^1.0.7: +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== From 61fb0160d69079c275efd2184a3c4a4d5585f429 Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Fri, 27 Aug 2021 07:25:18 -0600 Subject: [PATCH 3/4] =?UTF-8?q?bump=20remaining=20ember-cli=E2=80=99s=20to?= =?UTF-8?q?=20latest?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test-packages/sample-transforms/package.json | 2 +- test-packages/support/package.json | 2 +- tests/app-template/package.json | 2 +- yarn.lock | 174 +------------------ 4 files changed, 9 insertions(+), 171 deletions(-) diff --git a/test-packages/sample-transforms/package.json b/test-packages/sample-transforms/package.json index f155e08af..d8a54ff67 100644 --- a/test-packages/sample-transforms/package.json +++ b/test-packages/sample-transforms/package.json @@ -28,7 +28,7 @@ "@embroider/test-support": "0.36.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.11.2", - "ember-cli": "~3.18.0", + "ember-cli": "~3.27.0", "ember-cli-dependency-checker": "^3.1.0", "ember-cli-eslint": "^5.1.0", "ember-cli-htmlbars": "^4.3.1", diff --git a/test-packages/support/package.json b/test-packages/support/package.json index b8272b6ad..4030791d9 100644 --- a/test-packages/support/package.json +++ b/test-packages/support/package.json @@ -14,7 +14,7 @@ "broccoli": "^3.4.2", "console-ui": "^3.0.0", "ember-auto-import": "^1.2.21", - "ember-cli": "~3.18.0", + "ember-cli": "~3.27.0", "ember-cli-babel": "^7.20.5", "ember-cli-htmlbars": "^4.2.0", "ember-resolver": "^7.0.0", diff --git a/tests/app-template/package.json b/tests/app-template/package.json index e86a9af07..623eaf046 100644 --- a/tests/app-template/package.json +++ b/tests/app-template/package.json @@ -35,7 +35,7 @@ "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "ember-auto-import": "^1.11.2", - "ember-cli": "~3.26.0", + "ember-cli": "~3.27.0", "ember-cli-app-version": "^5.0.0", "ember-cli-babel": "^7.26.3", "ember-cli-dependency-checker": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index 7841dc739..c0d60ba58 100644 --- a/yarn.lock +++ b/yarn.lock @@ -630,7 +630,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.14.5", "@babel/plugin-transform-modules-amd@^7.7.5", "@babel/plugin-transform-modules-amd@^7.8.3": +"@babel/plugin-transform-modules-amd@^7.10.4", "@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.14.5", "@babel/plugin-transform-modules-amd@^7.7.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7" integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g== @@ -3253,11 +3253,6 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@xmldom/xmldom@^0.7.1": - version "0.7.2" - resolved "https://registry.yarnpkg.com/@xmldom/xmldom/-/xmldom-0.7.2.tgz#d920079e66806b2626b5311955f6a7c4bed1cba8" - integrity sha512-t/Zqo0ewes3iq6zGqEqJNUWI27Acr3jkmSUNp6E3nl0Z2XbtqAG5XYqPNLdYonILmhcxANsIidh69tHzjXtuRg== - "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -4796,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.4.0, broccoli-babel-transpiler@^7.6.0, broccoli-babel-transpiler@^7.8.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== @@ -7834,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", ember-cli@~3.26.0: - name ember-cli-latest +"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== @@ -8125,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.18.0: - version "3.18.0" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.18.0.tgz#fdee530b156f752a97e75b832d97a8616f1cab4d" - integrity sha512-I/9ps0AI6BDjUm9/M1to96kc6d2yAYZ/ApX+teDTwFqZBVX3cE6EASfRWw14/Y3nPSI8wXo3aviYBYs6KMWgqA== - dependencies: - "@babel/core" "^7.8.7" - "@babel/plugin-transform-modules-amd" "^7.8.3" - amd-name-resolver "^1.3.1" - babel-plugin-module-resolver "^4.0.0" - bower-config "^1.4.1" - bower-endpoint-parser "0.2.2" - broccoli "^3.3.3" - broccoli-amd-funnel "^2.0.1" - broccoli-babel-transpiler "^7.4.0" - broccoli-builder "^0.18.14" - broccoli-concat "^3.7.4" - broccoli-config-loader "^1.0.1" - broccoli-config-replace "^1.1.2" - broccoli-debug "^0.6.5" - broccoli-funnel "^2.0.2" - broccoli-funnel-reducer "^1.0.0" - broccoli-merge-trees "^3.0.2" - broccoli-middleware "^2.1.1" - broccoli-slow-trees "^3.0.1" - broccoli-source "^3.0.0" - broccoli-stew "^3.0.0" - calculate-cache-key-for-tree "^2.0.0" - capture-exit "^2.0.0" - chalk "^3.0.0" - ci-info "^2.0.0" - clean-base-url "^1.0.0" - compression "^1.7.4" - configstore "^5.0.1" - console-ui "^3.1.1" - core-object "^3.1.5" - dag-map "^2.0.2" - diff "^4.0.2" - ember-cli-is-package-missing "^1.0.0" - ember-cli-lodash-subset "^2.0.1" - ember-cli-normalize-entity-name "^1.0.0" - ember-cli-preprocess-registry "^3.3.0" - ember-cli-string-utils "^1.1.0" - ember-source-channel-url "^2.0.1" - ensure-posix-path "^1.1.1" - execa "^1.0.0" - exit "^0.1.2" - express "^4.17.1" - filesize "^6.1.0" - find-up "^4.1.0" - find-yarn-workspace-root "^1.2.1" - fs-extra "^8.1.0" - fs-tree-diff "^2.0.1" - get-caller-file "^2.0.5" - git-repo-info "^2.1.1" - glob "^7.1.6" - heimdalljs "^0.2.6" - heimdalljs-fs-monitor "^0.2.3" - heimdalljs-graph "^1.0.0" - heimdalljs-logger "^0.1.10" - http-proxy "^1.18.0" - inflection "^1.12.0" - is-git-url "^1.0.0" - isbinaryfile "^4.0.4" - js-yaml "^3.13.1" - json-stable-stringify "^1.0.1" - leek "0.0.24" - lodash.template "^4.5.0" - markdown-it "^10.0.0" - markdown-it-terminal "0.1.1" - minimatch "^3.0.4" - morgan "^1.9.1" - nopt "^3.0.6" - npm-package-arg "^8.0.1" - p-defer "^3.0.0" - portfinder "^1.0.25" - promise-map-series "^0.3.0" - promise.hash.helper "^1.0.6" - quick-temp "^0.1.8" - resolve "^1.15.1" - resolve-package-path "^2.0.0" - sane "^4.1.0" - semver "^7.1.3" - silent-error "^1.1.1" - sort-package-json "^1.40.0" - symlink-or-copy "^1.3.1" - temp "0.9.1" - testem "^3.0.2" - tiny-lr "^1.1.1" - tree-sync "^2.0.0" - uuid "^7.0.2" - walk-sync "^2.0.2" - watch-detector "^1.0.0" - yam "^1.0.0" - ember-cli@~3.27.0: version "3.27.0" resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.27.0.tgz#8ccf9db51d7b462f86210b853d086a4543605c34" @@ -12131,7 +12031,7 @@ isbinaryfile@^3.0.3: dependencies: buffer-alloc "^1.2.0" -isbinaryfile@^4.0.4, isbinaryfile@^4.0.6: +isbinaryfile@^4.0.6: version "4.0.8" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf" integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w== @@ -13410,17 +13310,6 @@ markdown-it-terminal@0.1.0: lodash.merge "^4.6.0" markdown-it "^8.3.1" -markdown-it-terminal@0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.1.tgz#7665d28a97f6f7f61f8738304d409a8505620192" - integrity sha512-8v4pHGEh7eiw+UbD28PRyrpu+WrnRR/HefC6NRs+Ttbk1ZQoOY6ViMrkZcdO9Y+PoBsfxNsmiJZtG9BRHEGZ2A== - dependencies: - ansi-styles "^3.0.0" - cardinal "^1.0.0" - cli-table "^0.3.1" - lodash.merge "^4.6.2" - markdown-it "^8.3.1" - markdown-it-terminal@0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.2.1.tgz#670fd5ea824a7dcaa1591dcbeef28bf70aff1705" @@ -13432,17 +13321,6 @@ markdown-it-terminal@0.2.1: lodash.merge "^4.6.2" markdown-it "^8.3.1" -markdown-it@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc" - integrity sha512-YWOP1j7UbDNz+TumYP1kpwnP0aEa711cJjrAQrzd0UXlbJfc5aAq0F/PZHjiioqDC1NKgvIMX+o+9Bk7yuM2dg== - dependencies: - argparse "^1.0.7" - entities "~2.0.0" - linkify-it "^2.0.0" - mdurl "^1.0.1" - uc.micro "^1.0.5" - markdown-it@^11.0.0: version "11.0.1" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-11.0.1.tgz#b54f15ec2a2193efa66dda1eb4173baea08993d6" @@ -15813,7 +15691,7 @@ resolve@1.1.7: 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.15.1, 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: +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== @@ -16410,7 +16288,7 @@ sort-object-keys@^1.1.3: resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45" integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg== -sort-package-json@^1.39.1, sort-package-json@^1.40.0, sort-package-json@^1.44.0, sort-package-json@^1.48.0: +sort-package-json@^1.39.1, sort-package-json@^1.44.0, sort-package-json@^1.48.0: version "1.50.0" resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.50.0.tgz#19fc109fe23bd157bd03c8e572fa3251a52467d8" integrity sha512-qZpqhMU9XTntebgAgc4hv/D6Fzhh7kFnwvV6a7+q8y8J5JoaDqPYQnvXPf7BBqG95tdE8X6JVNo7/jDzcbdfUg== @@ -17125,41 +17003,6 @@ testem@^3.0.1, testem@^3.1.0, testem@^3.2.0: tmp "0.0.33" xmldom "^0.6.0" -testem@^3.0.2: - version "3.4.3" - resolved "https://registry.yarnpkg.com/testem/-/testem-3.4.3.tgz#ed13abb9632622cec17b285bf9aa0a9cc6c02024" - integrity sha512-x8P+urqzwv+K8eJo6/kavSLtwgLr59AINkIG+CIVmWy2DDtC8xt9J+4n8G6PETcSXIO3cSUTt63QWTgDGGBVnA== - dependencies: - "@xmldom/xmldom" "^0.7.1" - backbone "^1.1.2" - bluebird "^3.4.6" - charm "^1.0.0" - commander "^2.6.0" - compression "^1.7.4" - consolidate "^0.15.1" - execa "^1.0.0" - express "^4.10.7" - fireworm "^0.7.0" - glob "^7.0.4" - http-proxy "^1.13.1" - js-yaml "^3.2.5" - lodash.assignin "^4.1.0" - lodash.castarray "^4.4.0" - lodash.clonedeep "^4.4.1" - lodash.find "^4.5.1" - lodash.uniqby "^4.7.0" - mkdirp "^0.5.1" - mustache "^3.0.0" - node-notifier "^9.0.1" - npmlog "^4.0.0" - printf "^0.6.1" - rimraf "^2.4.4" - socket.io "^4.1.2" - spawn-args "^0.2.0" - styled_string "0.0.1" - tap-parser "^7.0.0" - tmp "0.0.33" - text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -17849,11 +17692,6 @@ uuid@^3.3.2, uuid@^3.4.0: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== -uuid@^7.0.2: - version "7.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b" - integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg== - v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0, v8-compile-cache@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" From a04ee3fc7eff9eacf45cd28bf93752255498575a Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Fri, 27 Aug 2021 12:54:43 -0600 Subject: [PATCH 4/4] Update packages/compat/src/v1-addon.ts Co-authored-by: Robert Jackson --- packages/compat/src/v1-addon.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/compat/src/v1-addon.ts b/packages/compat/src/v1-addon.ts index 078f09dc3..0aeb5dfcf 100644 --- a/packages/compat/src/v1-addon.ts +++ b/packages/compat/src/v1-addon.ts @@ -739,11 +739,11 @@ export default class V1Addon { let addonStylesTree = this.addonStylesTree(); if (addonStylesTree) { if (this.app.hasCompiledStyles) { - // >= ember-cli@4.18 store css files in = ember-cli@3.18 store css files in