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

Adding monorepo tests apps #768

Closed
wants to merge 24 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
97 changes: 97 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
name: CI

# These trigger patterns courtesy of https://github.com/broccolijs/broccoli/pull/436
on:
pull_request:
push:
# filtering branches here prevents duplicate builds from pull_request and push
branches:
- master
- 'v*'
# always run CI for tags
tags:
- '*'

# early issue detection: run CI weekly on Sundays
schedule:
- cron: '0 6 * * 0'

env:
CI: true

jobs:
test-locked-deps:
name: Locked Deps
runs-on: ubuntu-latest
steps:
- name: Checkout Code
uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v1
with:
node-version: 12
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Lint
run: yarn workspace ember-cli-fastboot lint:js
- name: Browser Tests
run: yarn workspace ember-cli-fastboot test:ember


test-latest-ember-cli:
name: Latest CLI
runs-on: ubuntu-latest
needs: [test-locked-deps]
steps:
- name: Checkout Code
uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v1
with:
node-version: 12
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Install Latest `ember-cli`
run: yarn workspace ember-cli-fastboot add --dev ember-cli@latest
- name: Run Tests
run: yarn workspace ember-cli-fastboot test:ember


test-windows:
name: Windows
runs-on: windows-latest
needs: [test-locked-deps]
steps:
- name: Checkout Code
uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v1
with:
node-version: 12
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Run Tests
run: yarn workspace ember-cli-fastboot test:ember


test-packages:
name: Test Packages
runs-on: ubuntu-latest
needs: [test-locked-deps]
steps:
- name: Checkout Code
uses: actions/checkout@v2
- name: Install Node
uses: actions/setup-node@v1
with:
node-version: 12
- name: Install Dependencies
run: yarn install --frozen-lockfile
- name: Basic app
run: yarn workspace basic-app test:node
- name: Custom finger print app
run: yarn workspace custom-finger-print-app test:node
- name: Custom html app
run: yarn workspace custom-html-app test:node
- name: Custom output path app
run: yarn workspace custom-output-path-app test:node
25 changes: 3 additions & 22 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,4 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
node_modules/
packages/*/node_modules/
test-packages/*/node_modules/
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,11 @@ before_install:
- npm config set spin false
- npm install -g npm@4

# We need to remove test-packages so that the node_modules
# don't interfere with the npm install.
- rm -rf test-packages
- cd packages/ember-cli-fastboot

install:
- npm install
- yarn --ignore-engines
5 changes: 5 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ branches:
install:
- ps: Install-Product node $env:nodejs_version
- npm config set spin false

# We need to remove test-packages so that the node_modules
# don't interfere with the npm install
- rm -rf test-packages
- cd packages/ember-cli-fastboot
- appveyor-retry npm install -g npm@^3
- appveyor-retry npm i -g bower # for ember-cli-addon-tests
- npm --version
Expand Down
123 changes: 11 additions & 112 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,113 +1,12 @@

{
"name": "ember-cli-fastboot",
"version": "2.2.3",
"description": "Server-side rendering for Ember.js apps",
"keywords": [
"ember-addon"
],
"repository": "https://github.com/ember-fastboot/ember-cli-fastboot",
"license": "MIT",
"author": "Tom Dale & Yehuda Katz <[email protected]>",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "ember build",
"lint:js": "eslint ./*.js addon addon-test-support app config lib server test-support tests",
"release": "release-it",
"start": "ember serve",
"test": "mocha && ember test",
"test:precook": "node node_modules/ember-cli-addon-tests/scripts/precook-node-modules.js"
},
"dependencies": {
"broccoli-concat": "^3.7.1",
"broccoli-file-creator": "^2.1.1",
"broccoli-funnel": "^2.0.1",
"broccoli-merge-trees": "^3.0.1",
"broccoli-plugin": "^1.3.1",
"chalk": "^2.4.1",
"ember-cli-babel": "^7.1.0",
"ember-cli-lodash-subset": "2.0.1",
"ember-cli-preprocess-registry": "^3.1.2",
"ember-cli-version-checker": "^3.0.0",
"fastboot": "^2.0.0",
"fastboot-express-middleware": "^2.0.0",
"fastboot-transform": "^0.1.3",
"fs-extra": "^7.0.0",
"json-stable-stringify": "^1.0.1",
"md5-hex": "^2.0.0",
"silent-error": "^1.1.0"
},
"devDependencies": {
"body-parser": "^1.18.3",
"broccoli-asset-rev": "^3.0.0",
"broccoli-file-creator": "^1.1.1",
"broccoli-test-helper": "^1.5.0",
"chai": "^4.1.2",
"chai-fs": "^2.0.0",
"chai-string": "^1.4.0",
"co": "^4.6.0",
"ember-ajax": "^3.1.0",
"ember-cli": "~3.3.0",
"ember-cli-addon-tests": "^0.11.1",
"ember-cli-dependency-checker": "^3.0.0",
"ember-cli-eslint": "^4.2.3",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
"ember-cli-inject-live-reload": "^1.8.2",
"ember-cli-qunit": "^4.3.2",
"ember-cli-shims": "^1.2.0",
"ember-cli-sri": "^2.1.1",
"ember-cli-uglify": "^2.1.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^1.1.0",
"ember-maybe-import-regenerator-for-testing": "^1.0.0",
"ember-resolver": "^5.0.1",
"ember-sinon": "^2.2.0",
"ember-source": "~3.8.0",
"eslint-plugin-ember": "^7.0.0",
"eslint-plugin-node": "^7.0.1",
"glob": "^7.1.3",
"loader.js": "^4.7.0",
"mocha": "^5.2.0",
"qunit-dom": "^0.8.0",
"release-it": "^12.0.1",
"release-it-lerna-changelog": "^1.0.2",
"request": "^2.88.0",
"rsvp": "^4.8.3"
},
"resolutions": {
"**/engine.io": "~3.3.0"
},
"engines": {
"node": "6.* || 8.* || >= 10.*"
},
"publishConfig": {
"registry": "https://registry.npmjs.org/"
},
"ember-addon": {
"configPath": "tests/dummy/config",
"before": [
"broccoli-serve-files"
]
},
"release-it": {
"plugins": {
"release-it-lerna-changelog": {
"infile": "CHANGELOG.md"
}
},
"git": {
"tagName": "v${version}"
},
"github": {
"release": true
}
},
"volta": {
"node": "8.16.1",
"yarn": "1.17.3"
}
}
"private": true,
"workspaces": [
"packages/ember-cli-fastboot",
"test-packages/basic-app",
"test-packages/custom-finger-print-app",
"test-packages/custom-html-app",
"test-packages/custom-output-path-app",
"test-packages/*"
]
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
23 changes: 23 additions & 0 deletions packages/ember-cli-fastboot/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/.sass-cache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/package.json.ember-try
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 0 additions & 1 deletion index.js → packages/ember-cli-fastboot/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ module.exports = {
*/
_getFastbootTree() {
const appName = this._name;
const isModuleUnification = this._isModuleUnification();

let fastbootTrees = [];

Expand Down
Loading