Skip to content

Commit

Permalink
Merge branch 'master' into addon-contributing
Browse files Browse the repository at this point in the history
  • Loading branch information
elwayman02 committed Oct 9, 2021
2 parents 6178095 + 5ed515e commit 26d2ea2
Show file tree
Hide file tree
Showing 108 changed files with 3,127 additions and 1,205 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
- uses: actions/setup-node@v2.1.5
with:
node-version: 12.x
cache: 'yarn'

- run: yarn install --frozen-lockfile --non-interactive
- run: yarn lint
Expand All @@ -41,6 +42,7 @@ jobs:
- uses: actions/setup-node@v2.1.5
with:
node-version: 12.x
cache: 'yarn'

- run: yarn install --frozen-lockfile --non-interactive
- run: yarn test
Expand All @@ -62,6 +64,7 @@ jobs:
- uses: actions/setup-node@v2.1.5
with:
node-version: ${{ matrix.node-version }}
cache: 'yarn'

- run: yarn install --frozen-lockfile --non-interactive
- run: yarn test:all
Expand All @@ -86,6 +89,7 @@ jobs:
- uses: actions/setup-node@v2.1.5
with:
node-version: 12.x
cache: 'yarn'

- run: yarn install --frozen-lockfile --non-interactive
- run: yarn test:all
Expand Down
62 changes: 52 additions & 10 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,31 +1,73 @@
# ember-cli Changelog


## v3.27.0-beta.2
## v4.0.0-beta.1

#### Blueprint Changes

- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.27.0-beta.1...v3.27.0-beta.2)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.27.0-beta.1...v3.27.0-beta.2)
- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.28.0...v4.0.0-beta.1)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.28.0...v4.0.0-beta.1)

#### Changelog

- [#9504](https://github.com/ember-cli/ember-cli/pull/9504) Update minimum version of broccoli-concat to address a major issue with cache invalidation [@brendenpalmer](https://github.com/brendenpalmer)
- [#9535](https://github.com/ember-cli/ember-cli/pull/9535) Disable Embroider by default. [@rwjblue](https://github.com/rwjblue)
- [#9557](https://github.com/ember-cli/ember-cli/pull/9557) Update app and addon blueprint dependencies to latest. [@rwjblue](https://github.com/rwjblue)
- [#9558](https://github.com/ember-cli/ember-cli/pull/9558) Switch from `octane` template lint config to `recommended` [@bmish](https://github.com/bmish)
- [#9574](https://github.com/ember-cli/ember-cli/pull/9574) Update link to Discord in README.md [@MelSumner](https://github.com/MelSumner)
- [#9613](https://github.com/ember-cli/ember-cli/pull/9613) Fix test that started failing with v2.17.0 of qunit [@kategengler](https://github.com/kategengler)
- [#9579](https://github.com/ember-cli/ember-cli/pull/9579) Add `--ci-provider` option to `ember new` and `ember addon` [@snewcomer](https://github.com/snewcomer)
- [#9618](https://github.com/ember-cli/ember-cli/pull/9618) Reload `_packageInfo` as part of `reloadPkg` [@brendenpalmer](https://github.com/brendenpalmer)
- [#9563](https://github.com/ember-cli/ember-cli/pull/9563) Add `pnpm` support to `ember install` command [@Turbo87](https://github.com/Turbo87)
- [#9580](https://github.com/ember-cli/ember-cli/pull/9580) Add `.lint-todo` to prettier ignore [@elwayman02](https://github.com/elwayman02)
- [#9589](https://github.com/ember-cli/ember-cli/pull/9589) Add link to visualizer to perf guide [@mehulkar](https://github.com/mehulkar)
- [#9595](https://github.com/ember-cli/ember-cli/pull/9595) Add support for `addons.exclude` and `addons.include` options [@bertdeblock](https://github.com/bertdeblock)
- [#9623](https://github.com/ember-cli/ember-cli/pull/9623) Update app/addon blueprints to use ember-auto-import@2 [@rwjblue](https://github.com/rwjblue)
- [#9619](https://github.com/ember-cli/ember-cli/pull/9619) Update watch-detector to 1.0.1 [@colenso](https://github.com/colenso)
- [#9627](https://github.com/ember-cli/ember-cli/pull/9627) Update app & addon blueprint dependencies to latest [@rwjblue](https://github.com/rwjblue)
- [#9605](https://github.com/ember-cli/ember-cli/pull/9605) Properly set `loglevel` flag for npm [@jrvidal](https://github.com/jrvidal)
- [#9609](https://github.com/ember-cli/ember-cli/pull/9609) Ignore additional `ember-try` files for apps and addons [@bertdeblock](https://github.com/bertdeblock)
- [#9644](https://github.com/ember-cli/ember-cli/pull/9644) Default `ember new` and `ember addon` to use GitHub Actions [@rwjblue](https://github.com/rwjblue)

Thank you to all who took the time to contribute!

## v3.28.0

#### Blueprint Changes

- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.27.0...v3.28.0)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.27.0...v3.28.0)

#### Changelog

- [#9505](https://github.com/ember-cli/ember-cli/pull/9505) Pass `realPath` as `root` rather than the dirname for `addonMainPath` [@brendenpalmer](https://github.com/brendenpalmer)
- [#9507](https://github.com/ember-cli/ember-cli/pull/9507) Add a new config, `ember-addon.projectRoot`, to specify the location of the project [@brendenpalmer](https://github.com/brendenpalmer)
- [#9530](https://github.com/ember-cli/ember-cli/pull/9530) Drop Node 10 support [@rwjblue](https://github.com/rwjblue)
- [#9487](https://github.com/ember-cli/ember-cli/pull/9487) Add support for creating a single addon instance per bundle root (which enables dramatically reducing the total number of addon instances) [@davecombs](https://github.com/davecombs)
- [#9524](https://github.com/ember-cli/ember-cli/pull/9524) Update CONTRIBUTING.md to reference cli.emberjs.com [@loganrosen](https://github.com/loganrosen)
- [#9533](https://github.com/ember-cli/ember-cli/pull/9533) Ensure package-info objects are stable when they represent the same addon [@brendenpalmer](https://github.com/brendenpalmer)
- [#9538](https://github.com/ember-cli/ember-cli/pull/9538) ensure backwards compatibility is maintained with `packageRoot` and `root` [@brendenpalmer](https://github.com/brendenpalmer)
- [#9539](https://github.com/ember-cli/ember-cli/pull/9539) avoid setting `root` as `realPath` from the package-info object [@brendenpalmer](https://github.com/brendenpalmer)
- [#9537](https://github.com/ember-cli/ember-cli/pull/9537) Implement LCA host/host addons logic in `ember-cli` [@brendenpalmer](https://github.com/brendenpalmer)
- [#9540](https://github.com/ember-cli/ember-cli/pull/9540) Use relative override paths in blueprint ESLint config [@loganrosen](https://github.com/loganrosen)
- [#9542](https://github.com/ember-cli/ember-cli/pull/9542) Add validation checks for addon instance bundle caching [@brendenpalmer](https://github.com/brendenpalmer)
- [#9543](https://github.com/ember-cli/ember-cli/pull/9543) Add ability to specify a custom `ember-addon.perBundleAddonCacheUtil` utility [@brendenpalmer](https://github.com/brendenpalmer)
- [#9562](https://github.com/ember-cli/ember-cli/pull/9562) Update `addon-proxy` to support Embroider [@brendenpalmer](https://github.com/brendenpalmer)
- [#9565](https://github.com/ember-cli/ember-cli/pull/9565) Drop Node 10 support in blueprint engine spec [@elwayman02](https://github.com/elwayman02)
- [#9568](https://github.com/ember-cli/ember-cli/pull/9568) [BUGFIX release] Skip babel for qunit with embroider [@ctjhoa](https://github.com/ctjhoa)

Thank you to all who took the time to contribute!

## v3.27.1-beta.1

## v3.27.0

#### Blueprint Changes

- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.26.0...v3.27.0-beta.1)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.26.0...v3.27.0-beta.1)
- [`ember new` diff](https://github.com/ember-cli/ember-new-output/compare/v3.26.0...v3.27.0)
- [`ember addon` diff](https://github.com/ember-cli/ember-addon-output/compare/v3.26.0-beta.2...v3.27.0)

#### Changelog

- [#9504](https://github.com/ember-cli/ember-cli/pull/9504) Update minimum version of broccoli-concat to address a major issue with cache invalidation [@brendenpalmer](https://github.com/brendenpalmer)
- [#9535](https://github.com/ember-cli/ember-cli/pull/9535) Disable Embroider by default. [@rwjblue](https://github.com/rwjblue)
- [#9557](https://github.com/ember-cli/ember-cli/pull/9557) Update app and addon blueprint dependencies to latest. [@rwjblue](https://github.com/rwjblue)
- [#9558](https://github.com/ember-cli/ember-cli/pull/9558) Switch from `octane` template lint config to `recommended` [@bmish](https://github.com/bmish)
- [#9453](https://github.com/ember-cli/ember-cli/pull/9453) Prevent "yarn-error.log" files being published for addons [@bertdeblock](https://github.com/bertdeblock)
- [#9392](https://github.com/ember-cli/ember-cli/pull/9392) / [#9484](https://github.com/ember-cli/ember-cli/pull/9484) Add eslint-plugin-qunit to blueprint [@bmish](https://github.com/bmish)
- [#9454](https://github.com/ember-cli/ember-cli/pull/9454) / [#9492](https://github.com/ember-cli/ember-cli/pull/9492) Add --embroider as an option for new and init [@thoov](https://github.com/thoov)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Please see the [contributing guidelines](https://github.com/ember-cli/ember-cli/
Community
------------------------------------------------------------------------------

- Discord: [Get your invite](https://discordapp.com/invite/zT3asNS)
- Discord: [Get your invite](https://discord.gg/emberjs)
- Issues: [ember-cli/issues](https://github.com/ember-cli/ember-cli/issues)
- Documentation: [ember-cli.com](https://cli.emberjs.com/release/)

Expand Down
2 changes: 1 addition & 1 deletion blueprints/addon/additional-dev-dependencies.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"@embroider/test-setup": "^0.41.0",
"@embroider/test-setup": "^0.44.1",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-try": "^1.4.0",
"ember-source-channel-url": "^3.0.0"
Expand Down
73 changes: 73 additions & 0 deletions blueprints/addon/files/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: CI

on:
push:
branches:
- main
- master
pull_request: {}

jobs:
test:
name: "Tests"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: <%= yarn ? 'yarn' : 'npm' %>
- name: Install Dependencies
run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
- name: Lint
run: <%= yarn ? 'yarn' : 'npm run' %> lint
- name: Run Tests
run: <%= yarn ? 'yarn' : 'npm run' %> test:ember

floating:
name: "Floating Dependencies"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 12.x
cache: <%= yarn ? 'yarn' : 'npm' %>
- name: Install Dependencies
run: <%= yarn ? 'yarn install --no-lockfile' : 'npm install --no-shrinkwrap' %>
- name: Run Tests
run: <%= yarn ? 'yarn' : 'npm run' %> test:ember

try-scenarios:
name: ${{ matrix.try-scenario }}
runs-on: ubuntu-latest
needs: 'test'

strategy:
fail-fast: true
matrix:
try-scenario:
- ember-lts-3.20
- ember-lts-3.24
- ember-release
- ember-beta
- ember-canary
- ember-classic
- ember-default-with-jquery
- embroider-safe
- embroider-optimized

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: <%= yarn ? 'yarn' : 'npm' %>
- name: Install Dependencies
run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
- name: Run Tests
run: ./node_modules/.bin/ember try:one ${{ matrix.try-scenario }}
8 changes: 7 additions & 1 deletion blueprints/addon/files/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,11 @@ module.exports = function (defaults) {
*/

const { maybeEmbroider } = require('@embroider/test-setup');
return maybeEmbroider(app);
return maybeEmbroider(app, {
skipBabel: [
{
package: 'qunit',
},
],
});
};
4 changes: 4 additions & 0 deletions blueprints/addon/files/npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
/.eslintignore
/.eslintrc.js
/.git/
/.github/
/.gitignore
/.prettierignore
/.prettierrc.js
Expand All @@ -33,4 +34,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
19 changes: 14 additions & 5 deletions blueprints/addon/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,15 +132,21 @@ module.exports = {
let addonName = stringUtil.dasherize(addonRawName);
let addonNamespace = stringUtil.classify(addonRawName);

let hasOptions = options.welcome || options.yarn;
let hasOptions = options.welcome || options.yarn || options.ciProvider;
let blueprintOptions = '';
if (hasOptions) {
let indent = `\n `;
let outdent = `\n `;

blueprintOptions =
indent +
[options.welcome && '"--welcome"', options.yarn && '"--yarn"'].filter(Boolean).join(',\n ') +
[
options.welcome && '"--welcome"',
options.yarn && '"--yarn"',
options.ciProvider && `"--ci-provider=${options.ciProvider}"`,
]
.filter(Boolean)
.join(',\n ') +
outdent;
}

Expand All @@ -158,13 +164,16 @@ module.exports = {
blueprintOptions,
embroider: false,
lang: options.lang,
ciProvider: options.ciProvider,
};
},

files() {
let appFiles = this.lookupBlueprint(this.appBlueprintName).files();
files(options) {
let appFiles = this.lookupBlueprint(this.appBlueprintName).files(options);
let addonFilesPath = this.filesPath(this.options);
let addonFiles = walkSync(addonFilesPath);
let ignoredCITemplate = this.options.ciProvider !== 'travis' ? '.travis.yml' : '.github';

let addonFiles = walkSync(addonFilesPath, { ignore: [ignoredCITemplate] });

return uniq(appFiles.concat(addonFiles));
},
Expand Down
3 changes: 3 additions & 0 deletions blueprints/app/files/.eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion blueprints/app/files/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module.exports = {
},<% } %>
},
{
// Test files:
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
},
Expand Down
41 changes: 41 additions & 0 deletions blueprints/app/files/.github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: CI

on:
push:
branches:
- main
- master
pull_request: {}

jobs:
lint:
name: "Lint"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: <%= yarn ? 'yarn' : 'npm' %>
- name: Install Dependencies
run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
- name: Lint
run: <%= yarn ? 'yarn' : 'npm run' %> lint

test:
name: "Test"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v2
with:
node-version: 12.x
cache: <%= yarn ? 'yarn' : 'npm' %>
- name: Install Dependencies
run: <%= yarn ? 'yarn install --frozen-lockfile' : 'npm ci' %>
- name: Run Tests
run: <%= yarn ? 'yarn' : 'npm' %> test
4 changes: 4 additions & 0 deletions blueprints/app/files/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,12 @@
/coverage/
!.*
.eslintcache
.lint-todo/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
20 changes: 14 additions & 6 deletions blueprints/app/files/config/targets.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,20 @@ const browsers = [
'last 1 Safari versions',
];

const isCI = Boolean(process.env.CI);
const isProduction = process.env.EMBER_ENV === 'production';

if (isCI || isProduction) {
browsers.push('ie 11');
}
// Ember's browser support policy is changing, and IE11 support will end in
// v4.0 onwards.
//
// See https://deprecations.emberjs.com/v3.x#toc_3-0-browser-support-policy
//
// If you need IE11 support on a version of Ember that still offers support
// for it, uncomment the code block below.
//
// const isCI = Boolean(process.env.CI);
// const isProduction = process.env.EMBER_ENV === 'production';
//
// if (isCI || isProduction) {
// browsers.push('ie 11');
// }

module.exports = {
browsers,
Expand Down
3 changes: 3 additions & 0 deletions blueprints/app/files/gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@
# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try

0 comments on commit 26d2ea2

Please sign in to comment.