DEV: Upgrade to Ember 3.28

This commit is contained in:
David Taylor 2022-07-18 10:14:37 +01:00
parent 086fb6d6cf
commit 13bc2f1f39
31 changed files with 849 additions and 178 deletions

View File

@ -0,0 +1,18 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.28.5",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome"]
}
]
}
]
}

View File

@ -9,5 +9,6 @@ module.exports = function (defaults) {
},
});
return app.toTree();
const { maybeEmbroider } = require("@embroider/test-setup");
return maybeEmbroider(app);
};

View File

@ -16,16 +16,17 @@
},
"dependencies": {
"ember-auto-import": "^2.4.2",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^6.1.0",
"webpack": "^5.73.0",
"xss": "^1.0.13"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.25.3",
"ember-cli": "~3.28.5",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
@ -33,7 +34,7 @@
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.15.0",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
"loader.js": "^4.7.0"
},

View File

@ -0,0 +1,18 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.28.5",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome"]
}
]
}
]
}

View File

@ -1,6 +1,7 @@
"use strict";
const getChannelURL = require("ember-source-channel-url");
const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
module.exports = async function () {
return {
@ -22,6 +23,30 @@ module.exports = async function () {
},
},
},
{
name: "ember-lts-3.20",
npm: {
devDependencies: {
"ember-source": "~3.20.5",
},
},
},
{
name: "ember-lts-3.24",
npm: {
devDependencies: {
"ember-source": "~3.24.3",
},
},
},
{
name: "ember-lts-3.28",
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
},
},
{
name: "ember-release",
npm: {
@ -79,11 +104,16 @@ module.exports = async function () {
}),
},
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
ember: {
edition: "classic",
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};

View File

@ -9,5 +9,19 @@ module.exports = function (defaults) {
},
});
return app.toTree();
/*
This build file specifies the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/
const { maybeEmbroider } = require("@embroider/test-setup");
return maybeEmbroider(app, {
skipBabel: [
{
package: "qunit",
},
],
});
};

View File

@ -22,7 +22,7 @@
"@uppy/utils": "^4.0.5",
"@uppy/xhr-upload": "^2.0.7",
"ember-auto-import": "^2.4.2",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^6.1.0",
"ember-resolver": "^8.0.3",
"handlebars": "^4.7.0",
@ -31,16 +31,17 @@
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.25.3",
"ember-cli": "~3.28.5",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-terser": "^4.0.2",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.1",
"ember-source": "~3.15.0",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
"loader.js": "^4.7.0"
},

View File

@ -0,0 +1,18 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.28.5",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome"]
}
]
}
]
}

View File

@ -1,6 +1,7 @@
"use strict";
const getChannelURL = require("ember-source-channel-url");
const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
module.exports = async function () {
return {
@ -22,6 +23,30 @@ module.exports = async function () {
},
},
},
{
name: "ember-lts-3.20",
npm: {
devDependencies: {
"ember-source": "~3.20.5",
},
},
},
{
name: "ember-lts-3.24",
npm: {
devDependencies: {
"ember-source": "~3.24.3",
},
},
},
{
name: "ember-lts-3.28",
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
},
},
{
name: "ember-release",
npm: {
@ -79,11 +104,16 @@ module.exports = async function () {
}),
},
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
ember: {
edition: "classic",
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};

View File

@ -16,16 +16,17 @@
},
"dependencies": {
"ember-auto-import": "^2.4.2",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^6.1.0",
"handlebars": "^4.7.6",
"webpack": "^5.73.0"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.25.3",
"ember-cli": "~3.28.5",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
@ -33,7 +34,7 @@
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.15.0",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
"loader.js": "^4.7.0"
},

View File

@ -0,0 +1,18 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.28.5",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome"]
}
]
}
]
}

View File

@ -1,6 +1,7 @@
"use strict";
const getChannelURL = require("ember-source-channel-url");
const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
module.exports = async function () {
return {
@ -22,6 +23,30 @@ module.exports = async function () {
},
},
},
{
name: "ember-lts-3.20",
npm: {
devDependencies: {
"ember-source": "~3.20.5",
},
},
},
{
name: "ember-lts-3.24",
npm: {
devDependencies: {
"ember-source": "~3.24.3",
},
},
},
{
name: "ember-lts-3.28",
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
},
},
{
name: "ember-release",
npm: {
@ -79,11 +104,16 @@ module.exports = async function () {
}),
},
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
ember: {
edition: "classic",
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};

View File

@ -16,17 +16,18 @@
},
"dependencies": {
"ember-auto-import": "^2.4.2",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^6.1.0",
"handlebars": "^4.7.6",
"webpack": "^5.73.0"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.1.2",
"@glimmer/syntax": "^0.84.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.25.3",
"ember-cli": "~3.28.5",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
@ -34,7 +35,7 @@
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.15.0",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
"loader.js": "^4.7.0"
},

View File

@ -0,0 +1,18 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.28.5",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome"]
}
]
}
]
}

View File

@ -42,9 +42,9 @@
"ember-auto-import-chunks-json-generator": "^1.0.0",
"ember-buffered-proxy": "^2.1.1",
"ember-cached-decorator-polyfill": "^0.1.4",
"ember-cli": "~3.25.3",
"ember-cli": "~3.28.5",
"ember-cli-app-version": "^5.0.0",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.10",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-deprecation-workflow": "^2.1.0",
"ember-cli-htmlbars": "^6.1.0",
@ -56,9 +56,10 @@
"ember-load-initializers": "^2.1.1",
"ember-qunit": "^5.1.5",
"ember-rfc176-data": "^0.3.17",
"ember-source": "~3.15.0",
"ember-source": "~3.28.8",
"ember-test-selectors": "^6.0.0",
"eslint": "^7.27.0",
"eslint": "^7.32.0",
"eslint-plugin-qunit": "^6.2.0",
"html-entities": "^2.3.3",
"js-yaml": "^4.1.0",
"jsdom": "^20.0.0",
@ -94,6 +95,7 @@
},
"devDependencies": {
"ember-cached-decorator-polyfill": "^0.1.4",
"ember-cli-deprecation-workflow": "^2.1.0",
"ember-exam": "^7.0.1"
}
}

View File

@ -41,7 +41,7 @@
<body>
{{content-for "body"}} {{content-for "test-body"}}
<script src="/testem.js" integrity=""></script>
<script src="/testem.js" integrity="" data-embroider-ignore></script>
<script src="{{rootURL}}assets/vendor.js"></script>
<ember-auto-import-scripts entrypoint="app"></ember-auto-import-scripts>
<script src="{{rootURL}}assets/test-support.js"></script>

View File

@ -0,0 +1,18 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.28.5",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome"]
}
]
}
]
}

View File

@ -1,6 +1,7 @@
"use strict";
const getChannelURL = require("ember-source-channel-url");
const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
module.exports = async function () {
return {
@ -22,6 +23,30 @@ module.exports = async function () {
},
},
},
{
name: "ember-lts-3.20",
npm: {
devDependencies: {
"ember-source": "~3.20.5",
},
},
},
{
name: "ember-lts-3.24",
npm: {
devDependencies: {
"ember-source": "~3.24.3",
},
},
},
{
name: "ember-lts-3.28",
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
},
},
{
name: "ember-release",
npm: {
@ -79,11 +104,16 @@ module.exports = async function () {
}),
},
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
ember: {
edition: "classic",
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};

View File

@ -9,5 +9,19 @@ module.exports = function (defaults) {
},
});
return app.toTree();
/*
This build file specifies the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/
const { maybeEmbroider } = require("@embroider/test-setup");
return maybeEmbroider(app, {
skipBabel: [
{
package: "qunit",
},
],
});
};

View File

@ -16,16 +16,17 @@
},
"dependencies": {
"ember-auto-import": "^2.4.2",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^6.1.0",
"webpack": "^5.73.0",
"xss": "^1.0.13"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.25.3",
"ember-cli": "~3.28.5",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
@ -33,7 +34,7 @@
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.15.0",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
"loader.js": "^4.7.0"
},

View File

@ -0,0 +1,18 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.28.5",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome"]
}
]
}
]
}

View File

@ -1,6 +1,7 @@
"use strict";
const getChannelURL = require("ember-source-channel-url");
const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
module.exports = async function () {
return {
@ -22,6 +23,30 @@ module.exports = async function () {
},
},
},
{
name: "ember-lts-3.20",
npm: {
devDependencies: {
"ember-source": "~3.20.5",
},
},
},
{
name: "ember-lts-3.24",
npm: {
devDependencies: {
"ember-source": "~3.24.3",
},
},
},
{
name: "ember-lts-3.28",
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
},
},
{
name: "ember-release",
npm: {
@ -79,11 +104,16 @@ module.exports = async function () {
}),
},
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
ember: {
edition: "classic",
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};

View File

@ -9,5 +9,19 @@ module.exports = function (defaults) {
},
});
return app.toTree();
/*
This build file specifies the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/
const { maybeEmbroider } = require("@embroider/test-setup");
return maybeEmbroider(app, {
skipBabel: [
{
package: "qunit",
},
],
});
};

View File

@ -16,15 +16,16 @@
},
"dependencies": {
"ember-auto-import": "^2.4.2",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^6.1.0",
"webpack": "^5.73.0"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.25.3",
"ember-cli": "~3.28.5",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
@ -32,7 +33,7 @@
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.15.0",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
"loader.js": "^4.7.0"
},

View File

@ -0,0 +1,18 @@
{
"schemaVersion": "1.0.0",
"packages": [
{
"name": "ember-cli",
"version": "3.28.5",
"blueprints": [
{
"name": "addon",
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
"codemodsSource": "ember-addon-codemods-manifest@1",
"isBaseBlueprint": true,
"options": ["--no-welcome"]
}
]
}
]
}

View File

@ -1,24 +1,49 @@
"use strict";
const getChannelURL = require("ember-source-channel-url");
const { embroiderSafe, embroiderOptimized } = require("@embroider/test-setup");
module.exports = async function () {
return {
useYarn: true,
scenarios: [
{
name: "ember-lts-3.8",
name: "ember-lts-3.24",
npm: {
devDependencies: {
"ember-source": "~3.8.0",
"ember-source": "~3.24.3",
},
},
},
{
name: "ember-lts-3.12",
name: "ember-lts-3.28",
npm: {
devDependencies: {
"ember-source": "~3.12.0",
"ember-source": "~3.28.0",
},
},
},
{
name: "ember-lts-3.20",
npm: {
devDependencies: {
"ember-source": "~3.20.5",
},
},
},
{
name: "ember-lts-3.24",
npm: {
devDependencies: {
"ember-source": "~3.24.3",
},
},
},
{
name: "ember-lts-3.28",
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
},
},
@ -79,11 +104,16 @@ module.exports = async function () {
}),
},
npm: {
devDependencies: {
"ember-source": "~3.28.0",
},
ember: {
edition: "classic",
},
},
},
embroiderSafe(),
embroiderOptimized(),
],
};
};

View File

@ -9,5 +9,19 @@ module.exports = function (defaults) {
},
});
return app.toTree();
/*
This build file specifies the options for the dummy test app of this
addon, located in `/tests/dummy`
This build file does *not* influence how the addon or the app using it
behave. You most likely want to be modifying `./index.js` or app's build file
*/
const { maybeEmbroider } = require("@embroider/test-setup");
return maybeEmbroider(app, {
skipBabel: [
{
package: "qunit",
},
],
});
};

View File

@ -16,15 +16,16 @@
},
"dependencies": {
"ember-auto-import": "^2.4.2",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^6.1.0",
"webpack": "^5.73.0"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.25.3",
"ember-cli": "~3.28.5",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
@ -32,7 +33,7 @@
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.15.0",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
"loader.js": "^4.7.0"
},

View File

@ -9,5 +9,12 @@ module.exports = function (defaults) {
},
});
return app.toTree();
const { maybeEmbroider } = require("@embroider/test-setup");
return maybeEmbroider(app, {
skipBabel: [
{
package: "qunit",
},
],
});
};

View File

@ -16,16 +16,17 @@
},
"dependencies": {
"ember-auto-import": "^2.4.2",
"ember-cli-babel": "^7.23.1",
"ember-cli-babel": "^7.26.10",
"ember-cli-htmlbars": "^6.1.0",
"webpack": "^5.73.0",
"xss": "^1.0.13"
},
"devDependencies": {
"@ember/optional-features": "^2.0.0",
"@embroider/test-setup": "^0.48.1",
"@glimmer/component": "^1.1.2",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.25.3",
"ember-cli": "~3.28.5",
"ember-cli-dependency-checker": "^3.3.1",
"ember-cli-inject-live-reload": "^2.1.0",
"ember-cli-sri": "^2.1.1",
@ -33,7 +34,7 @@
"ember-disable-prototype-extensions": "^1.1.3",
"ember-load-initializers": "^2.1.1",
"ember-resolver": "^8.0.3",
"ember-source": "~3.15.0",
"ember-source": "~3.28.8",
"ember-source-channel-url": "^3.0.0",
"loader.js": "^4.7.0"
},

File diff suppressed because it is too large Load Diff