Update package.json by sivakumar-kailasam · Pull Request #124 · ember-cli/ember-cli

sivakumar-kailasam · 2014-03-20T18:59:38Z

Fixes #122.

MajorBreakfast · 2014-03-20T19:09:21Z

Added a comment.

This PR is based on an outdated version of ember-cli. We now call it "blueprint" instead of "skeleton" (my idea :)

But you're totally right. We should add ember-cli as a dep.

@MajorBreakfast

updated as per @MajorBreakfast's comments

MajorBreakfast · 2014-03-20T19:13:32Z

Could you rebase? I can't merge it :S

sivakumar-kailasam · 2014-03-20T19:14:05Z

Doing it now

On Mar 21, 2014 12:43 AM, "MajorBreakfast" notifications@github.com wrote:

Could you rebase? I can't merge it :S

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/124#issuecomment-38209050
.

sivakumar-kailasam · 2014-03-20T19:17:15Z

@MajorBreakfast Can you try it now?

MajorBreakfast · 2014-03-20T19:20:41Z

3 Options:

git rebase -i HEAD~3 to squash commits (good execise, but tricky if you're new to this)
redo it with one commit
I do the change :), but that's cheating

Cannot specify --strict-mode flag to node otherwise it will require strict-mode in node_modules, which we don't really want.

Since this is included in app/utils/ajax.js it seems justified to make sure it works without configuration changes.

I guess this is necessary for mocha to be able to run tests. Boo.

…et though)

Nested elements should be indented once (two spaces). http://mdo.github.io/code-guide/#html-syntax I saw [this commit](https://github.com/frabrunelle/ember-cli/commit/d72da9cd9990a07c5dd652bb758b595fea2bb45d) called "quote consistency" but for HTML it's more common to have double quotes. So I would suggest having double quotes for HTML and single quotes for JavaScript. Also, shouldn't the content of title be `<%= namespace %>` instead of `App`?

Now that we have internal support for preprocessors, we can remove the Brocfile from the generated build, thus addressing #75 & #96. As people try it out and open issues for things they wish were more configurable, I think we'll start to get a better idea for what we need to include.

This reverts commit 16385cd. Conflicts: blueprint/Brocfile.js lib/adapters/broccoli/builder.js

sivakumar-kailasam · 2014-03-20T19:33:29Z

did I just screw this up, you might have guessed it, this is my first rebase :(

sivakumar-kailasam · 2014-03-20T19:34:58Z

should I close this PR and new one instead?

stefanpenner · 2014-03-20T19:34:58Z

yup, you did.

It should only be 1 commit

sivakumar-kailasam · 2014-03-20T19:36:08Z

closing this will send a new one

MajorBreakfast · 2014-03-20T20:19:22Z

Don't worry: Rebasing is super hard at first :D But you'll get the hang of it eventually.

sivakumar-kailasam · 2014-03-20T20:21:23Z

Will take your word for it :)
On Mar 21, 2014 1:49 AM, "MajorBreakfast" notifications@github.com wrote:

Don't worry: Rebasing is super hard at first :D But you'll get the hang of
it eventually.

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/124#issuecomment-38216044
.

Update package.json

4d98691

Update package.json

2f340b8

updated as per @MajorBreakfast's comments

Merge remote-tracking branch 'upstream/master'

6a1aefd

sivakumar-kailasam and others added 22 commits March 21, 2014 01:00

Update package.json

bd082b7

[Fix] Add express as dependency

28ba7a0

ember server and build set the broccoli env

bbd17bb

remove test description typo

e926db4

gitignore tmp

50230f4

remove bower-file resolution

1ec6c6d

verison bump

51b0a09

Rename history support middleware

3d3ee38

Improve checks for rewriting in middleware

ba0699e

Remove 'use strict', modifications to joefiorini's server code

ecc625c

Move use strict into hashbang, dasherize files

4581d28

Rename skeleton to blueprint

fceeff0

Use strict mode on a per-file basis

27e4dc6

Cannot specify --strict-mode flag to node otherwise it will require strict-mode in node_modules, which we don't really want.

Bump version

6a9cc6a

Add config directory to Brocfile [Fixes #81]

bf86d81

Always include ic-ajax in builds by default

3dcb54c

Since this is included in app/utils/ajax.js it seems justified to make sure it works without configuration changes.

Remove unnecessary dependency [Fixes #108]

f912bf4

Remove styles from blueprint [Fixes #101]

72d2bca

Revert "Remove unnecessary dependency [Fixes #108]"

ea70593

I guess this is necessary for mocha to be able to run tests. Boo.

Added livereload support (livereload script injection doesn't work, y…

7509d9f

…et though)

Offset live-reload port

5a56658

MajorBreakfast and others added 17 commits March 21, 2014 01:01

Use ui.write in server, move ui.js into ui folder as index.js

8e4db3b

Remove extra lodash dependency [Fixes #108 for reals]

d6bc021

small typo fix

4e575b9

Implement preprocessors for CSS

43665e3

Cleanup css preprocessors

d9330e2

Implement template preprocessors

c3edc63

Add support for CoffeeScript and sweetjs

f06f7f7

Test fixin

3bebb34

bump 0.0.10

a6eb65e

broccoli-env is a dep

092d20c

bump version

5c0435d

correct the blueprint repository.url

87be18e

Revert "Remove Brocfile from blueprint"

9457999

This reverts commit 16385cd. Conflicts: blueprint/Brocfile.js lib/adapters/broccoli/builder.js

Take use strict out of blueprint Brocfile

6f06a9a

Bump version

2b325cc

Merge branch 'master' of https://github.com/sivakumar-kailasam/ember-cli

3148c0d

sivakumar-kailasam closed this Mar 20, 2014

Copilot AI mentioned this pull request Feb 3, 2026

Add warpDrive support to app-blueprint #10939

Open

28 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update package.json#124

Update package.json#124
sivakumar-kailasam wants to merge 42 commits intoember-cli:masterfrom
sivakumar-kailasam:master

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

MajorBreakfast commented Mar 20, 2014

Uh oh!

MajorBreakfast commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

MajorBreakfast commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

stefanpenner commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

MajorBreakfast commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

MajorBreakfast commented Mar 20, 2014

Uh oh!

MajorBreakfast commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

MajorBreakfast commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

stefanpenner commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

MajorBreakfast commented Mar 20, 2014

Uh oh!

sivakumar-kailasam commented Mar 20, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants