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.

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 ember-auto-import to latest in @embroider/addon-shim #959

Merged
merged 1 commit into from
Sep 3, 2021
Merged
Changes from all commits
Commits
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
upgrade ember-auto-import
stefanpenner committed Sep 3, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 1454b17cbb57523802d36021241505ce36d56c01
5 changes: 3 additions & 2 deletions packages/addon-shim/package.json
Original file line number Diff line number Diff line change
@@ -22,12 +22,13 @@
},
"dependencies": {
"@embroider/shared-internals": "^0.44.0",
"ember-auto-import": "^2.0.1",
"ember-auto-import": "^2.2.0",
"semver": "^7.3.5"
},
"devDependencies": {
"@types/semver": "^7.3.6",
"typescript": "~4.0.0"
"typescript": "~4.0.0",
"webpack": "^5"
},
"engines": {
"node": "12.* || 14.* || >= 16"
2 changes: 2 additions & 0 deletions packages/compat/tests/stage1.test.ts
Original file line number Diff line number Diff line change
@@ -80,6 +80,8 @@ describe('stage1 build', function () {
addon.linkPackage('@embroider/macros');
addon.linkPackage('ember-auto-import');

app.linkPackage('ember-auto-import');
app.linkPackage('webpack');
// our app will include an in-repo addon
app.pkg['ember-addon'] = {
paths: ['lib/in-repo-addon'],
1 change: 1 addition & 0 deletions packages/compat/tests/stage2.test.ts
Original file line number Diff line number Diff line change
@@ -218,6 +218,7 @@ describe('stage2 build', function () {
app = Project.emberNew();
app.addDependency('some-library', '1.0.0');
app.linkPackage('ember-auto-import');
app.linkPackage('webpack');
app.linkPackage('@embroider/sample-transforms');

merge(app.files, {
7 changes: 4 additions & 3 deletions packages/router/package.json
Original file line number Diff line number Diff line change
@@ -34,8 +34,8 @@
},
"devDependencies": {
"@ember/optional-features": "^0.7.0",
"@ember/test-helpers": "^2.4.2",
"@ember/string": "^1.0.0",
"@ember/test-helpers": "^2.4.2",
"@embroider/compat": "0.44.0",
"@embroider/core": "0.44.0",
"@embroider/test-support": "0.36.0",
@@ -51,7 +51,6 @@
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-sri": "^2.1.1",
"ember-template-lint": "^3.6.0",
"ember-cli-uglify": "^2.1.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
@@ -61,12 +60,14 @@
"ember-resolver": "^5.0.1",
"ember-source": "~3.26",
"ember-source-channel-url": "^1.1.0",
"ember-template-lint": "^3.6.0",
"ember-try": "^1.0.0",
"eslint-plugin-ember": "^7.0.0",
"eslint-plugin-node": "^9.0.1",
"loader.js": "^4.7.0",
"qunit": "^2.14.1",
"qunit-dom": "^1.6.0"
"qunit-dom": "^1.6.0",
"webpack": "^5"
},
"peerDependencies": {
"@embroider/core": "0.44.0",
5 changes: 3 additions & 2 deletions packages/util/package.json
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"cross-env": "^7.0.3",
"ember-auto-import": "^1.10.1",
"ember-auto-import": "^2.2.0",
"ember-cli": "~3.27.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-htmlbars": "^5.3.2",
@@ -75,7 +75,8 @@
"prettier": "^2.2.1",
"qunit": "^2.14.1",
"qunit-dom": "^1.6.0",
"typescript": "~4.0.0"
"typescript": "~4.0.0",
"webpack": "^5"
},
"engines": {
"node": "12.* || 14.* || >= 16"
5 changes: 3 additions & 2 deletions test-packages/fastboot-addon/package.json
Original file line number Diff line number Diff line change
@@ -32,7 +32,7 @@
"@glimmer/tracking": "^1.0.0",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.5.3",
"ember-auto-import": "^2.2.0",
"ember-cli": "~3.27.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-inject-live-reload": "^2.0.2",
@@ -54,7 +54,8 @@
"loader.js": "^4.7.0",
"npm-run-all": "^4.1.5",
"qunit": "^2.14.1",
"qunit-dom": "^1.6.0"
"qunit-dom": "^1.6.0",
"webpack": "^5"
},
"engines": {
"node": "10.* || >= 12"
7 changes: 4 additions & 3 deletions test-packages/sample-transforms/package.json
Original file line number Diff line number Diff line change
@@ -27,15 +27,14 @@
"@ember/test-helpers": "^2.4.2",
"@embroider/test-support": "0.36.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.11.2",
"ember-auto-import": "^2.2.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",
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-sri": "^2.1.1",
"ember-template-lint": "^3.6.0",
"ember-cli-uglify": "^2.1.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
@@ -45,12 +44,14 @@
"ember-resolver": "^5.0.1",
"ember-source": "~3.26",
"ember-source-channel-url": "^1.1.0",
"ember-template-lint": "^3.6.0",
"ember-try": "^1.0.0",
"eslint-plugin-ember": "^7.0.0",
"eslint-plugin-node": "^9.0.1",
"loader.js": "^4.7.0",
"qunit": "^2.14.1",
"qunit-dom": "^1.6.0"
"qunit-dom": "^1.6.0",
"webpack": "^5"
},
"engines": {
"node": "8.* || >= 10.*"
5 changes: 3 additions & 2 deletions test-packages/support/package.json
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
"babel-preset-env": "^1.7.0",
"broccoli": "^3.4.2",
"console-ui": "^3.0.0",
"ember-auto-import": "^1.2.21",
"ember-auto-import": "^2.2.0",
"ember-cli": "~3.27.0",
"ember-cli-babel": "^7.20.5",
"ember-cli-htmlbars": "^4.2.0",
@@ -24,7 +24,8 @@
"fs-extra": "^7.0.0",
"loader.js": "^4.7.0",
"lodash": "^4.17.10",
"qunit": "^2.14.1"
"qunit": "^2.14.1",
"webpack": "^5"
},
"volta": {
"extends": "../../package.json"
5 changes: 3 additions & 2 deletions tests/addon-template/package.json
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.11.2",
"ember-auto-import": "^2.2.0",
"ember-cli": "~3.27.0",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-inject-live-reload": "^2.0.2",
@@ -63,7 +63,8 @@
"npm-run-all": "^4.1.5",
"prettier": "^2.2.1",
"qunit": "^2.14.1",
"qunit-dom": "^1.6.0"
"qunit-dom": "^1.6.0",
"webpack": "^5"
},
"engines": {
"node": "10.* || >= 12"
7 changes: 4 additions & 3 deletions tests/app-template/package.json
Original file line number Diff line number Diff line change
@@ -28,13 +28,13 @@
"@ember/test-helpers": "^2.4.2",
"@embroider/compat": "0.44.0",
"@embroider/core": "0.44.0",
"@embroider/webpack": "0.44.0",
"@embroider/router": "0.44.0",
"@embroider/webpack": "0.44.0",
"@glimmer/component": "^1.0.4",
"@glimmer/tracking": "^1.0.4",
"babel-eslint": "^10.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.11.2",
"ember-auto-import": "^2.2.0",
"ember-cli": "~3.27.0",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.26.3",
@@ -62,7 +62,8 @@
"npm-run-all": "^4.1.5",
"prettier": "^2.2.1",
"qunit": "^2.14.1",
"qunit-dom": "^1.6.0"
"qunit-dom": "^1.6.0",
"webpack": "^5"
},
"engines": {
"node": "10.* || >= 12"
14 changes: 6 additions & 8 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -7136,7 +7136,7 @@ ember-asset-loader@^0.6.1:
object-assign "^4.1.0"
walk-sync "^1.1.3"

ember-auto-import@^1.10.1, ember-auto-import@^1.11.2, ember-auto-import@^1.2.21, ember-auto-import@^1.5.3:
ember-auto-import@^1.10.1, ember-auto-import@^1.11.2:
version "1.11.3"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.11.3.tgz#6e3384a7fbb163384a34546f2e902cd297b0e683"
integrity sha512-ekq/XCvsonESobFU30zjZ0I4XMy2E/2ZILCYWuQ1JdhcCSTYhnXDZcqRW8itUG7kbsPqAHT/XZ1LEZYm3seVwQ==
@@ -7171,25 +7171,24 @@ ember-auto-import@^1.10.1, ember-auto-import@^1.11.2, ember-auto-import@^1.2.21,
walk-sync "^0.3.3"
webpack "^4.43.0"

ember-auto-import@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.0.1.tgz#3c993f2cee3a93758029bbc903302a951bd9e3f8"
integrity sha512-quJbesruo7Z1tZ8faKSuSBMcNHgQYwVsod3mw3qZY2rHeQz/D1gmOm61HBvPBo4kM43FpKIL+lrzkQS8WIihZQ==
ember-auto-import@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.2.0.tgz#6206be37e676fb490f03dd20afab973d5abe9da9"
integrity sha512-ngluzmtV31mTY+1ceOnWfGUIgGyZt850xFncMX/14Dfx0OhXaUKBpFjKjIor/Cen4WEF+OrdgNJAjH3sM07o6w==
dependencies:
"@babel/core" "^7.1.6"
"@babel/plugin-proposal-class-properties" "^7.13.0"
"@babel/plugin-proposal-decorators" "^7.13.5"
"@babel/preset-env" "^7.10.2"
"@babel/traverse" "^7.1.6"
"@babel/types" "^7.1.6"
"@embroider/shared-internals" "^0.40.0"
babel-loader "^8.0.6"
babel-plugin-ember-modules-api-polyfill "^3.5.0"
babel-plugin-htmlbars-inline-precompile "^5.2.1"
babel-plugin-syntax-dynamic-import "^6.18.0"
broccoli-debug "^0.6.4"
broccoli-funnel "^3.0.8"
broccoli-merge-trees "^4.2.0"
broccoli-node-api "^1.7.0"
broccoli-plugin "^4.0.0"
broccoli-source "^3.0.0"
css-loader "^5.2.0"
@@ -7207,7 +7206,6 @@ ember-auto-import@^2.0.1:
rimraf "^2.6.2"
semver "^7.3.4"
style-loader "^2.0.0"
symlink-or-copy "^1.2.0"
typescript-memoize "^1.0.0-alpha.3"
walk-sync "^0.3.3"