Skip to content

Webpack #1971

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.

Sign up for GitHub

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

Merged
merged 54 commits into from
Jun 20, 2016
Merged

Webpack #1971

Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
f9e64e2
feat(gen:app): remove bower, initial webpack support
Awk34 May 7, 2016
0f73fac
refactor(gen/test): use gulp for all tests
Awk34 Jun 6, 2016
5151127
test(gen:pre): remove bower pre-tests
Awk34 Jun 6, 2016
af7a6e6
test(gen:get-expected-files): fix expected files
Awk34 Jun 6, 2016
97cc341
refactor(gen:test): don't symlink `bower_components` anymore
Awk34 Jun 6, 2016
1327d0b
fix(e2e): get e2e tests running
Awk34 Jun 6, 2016
445435e
fix(jscs):
Awk34 Jun 6, 2016
dd73e59
fix(gulp): uncomment `open(...)`
Awk34 Jun 6, 2016
f7cae15
fix(e2e): fix some webpack config for e2e
Awk34 Jun 10, 2016
536e9a1
fix(webpack): fix ng-annotate for e2e
Awk34 Jun 10, 2016
4e3f59f
fix(e2e): fix some async quirks
Awk34 Jun 10, 2016
c94f5f2
fix(gen:test): index.html -> _index.html
Awk34 Jun 10, 2016
da9a1ee
chore(package): add jade-loader
Awk34 Jun 11, 2016
e1b2b7e
fix(gen:app): don't run bower after scaffold
Awk34 Jun 11, 2016
f5302a7
chore(package): replace jade-loader with pug-html-loader
Awk34 Jun 11, 2016
ee1a4b1
fix(jade): fix navbar jade template
Awk34 Jun 11, 2016
57a16dd
fix(client): fix template requires
Awk34 Jun 11, 2016
3e65d90
fix(webpack): fix jade/html config
Awk34 Jun 11, 2016
0f4abd9
fix(gulp-protractor): throw on error
Awk34 Jun 11, 2016
1e2311e
fix(client): exclude oauthButtons import if !oauth
Awk34 Jun 11, 2016
e3047a8
chore(circle): remove grunt-cli, wiredep; add sauce-connect
Awk34 Jun 11, 2016
b45af55
test(gen): comment e2e for now
Awk34 Jun 12, 2016
c67572e
chore(package): remove wiredep things
Awk34 Jun 16, 2016
881d170
fix(test:client): fix client tests for TS
Awk34 Jun 16, 2016
03d1c95
fix(gulp): process.exit on karma errors, remove wiredep import
Awk34 Jun 16, 2016
2274545
fix(client): fix ngRoute imports
Koslun Jun 16, 2016
9d95083
fix(client): fix css/font paths
Awk34 Jun 16, 2016
c3b41ef
fix(webpack): use raw loader with jade
Awk34 Jun 16, 2016
718bbd6
feat(client:karma): add karma-sourcemap-loader
Awk34 Jun 16, 2016
523abf4
fix(test:client): require angular in mocks
Awk34 Jun 16, 2016
7960c35
fix(test:client): fix for ts + sprint-js
Awk34 Jun 16, 2016
2dd7987
fix(webpack): don't use `exclude` in ts
Awk34 Jun 16, 2016
edf5524
feat(gulp): separate reg and coverage server tests
Awk34 Jun 16, 2016
e59864e
chore(package): add version numbers for less-loader, stylus-loader
Awk34 Jun 16, 2016
8fa3e0a
fix(server): exclude session code if noModels
Awk34 Jun 16, 2016
34dd31e
fix(webpack): fix some conditionals
Awk34 Jun 16, 2016
86a8fa3
fix(stylus): use bootstrap-styl, font-awesome-stylus
Awk34 Jun 16, 2016
9df7265
refactor(client): `~` in css-loader requires will find `node_modules`…
Awk34 Jun 16, 2016
8bce0f2
fix(webpack): fix style `include`s
Awk34 Jun 16, 2016
b152a77
fix(webpack): fix file-loader regex for versioned font imports
Awk34 Jun 16, 2016
ce0533f
fix(gulp): always use `{bootstrap,font-awesome}`
Awk34 Jun 16, 2016
51e8c6b
fix(tsconfig): fix loading of typings
Koslun Jun 16, 2016
93eea9e
fix(routerDecorator): fix lodash import
Koslun Jun 17, 2016
8f47652
feat(typings): add angular-resource typings
Koslun Jun 17, 2016
98add1d
feat(polyfills): set type for Error
Koslun Jun 17, 2016
d8346f9
fix(webpack): we don't need the raw loader with the pug-html loader
Awk34 Jun 18, 2016
7db19e2
feat(flow): add Flow support
Awk34 Jun 20, 2016
e44cb04
feat(package): refactor EJS, add `flow` command
Awk34 Jun 20, 2016
5b00977
feat(webpack): improve comment stripping config
Awk34 Jun 20, 2016
fd99da8
test(gen): add `.flowconfig` file expectation
Awk34 Jun 20, 2016
7f0e1c8
fix(gen): fix flow regex
Awk34 Jun 20, 2016
4350dc3
feat(gen): default flow to false
Awk34 Jun 20, 2016
4da3072
Merge remote-tracking branch 'origin/canary' into webpack
Awk34 Jun 20, 2016
869acf1
Merge branch 'canary' of https://github.com/angular-fullstack/generat…
Awk34 Jun 20, 2016
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
2 changes: 1 addition & 1 deletion templates/app/client/components/auth(auth)/router.decorator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
'use strict';
import _ from 'lodash';
import * as _ from 'lodash';
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How does this change anything? Shouldn't the same methods be available on both the default export and the named exports?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well yes, I believe if there is a default export, there should be no difference. Lodash does however not appear to have one. Visual studio code warned me about that particular fact and I think it was among the typings error spam.

As far as I've read elsewhere you need to import it like above when there is no default export. Or use a require.

Before the above fix I also get the following error in the browser when changing route. I.e. going from home to admin or settings:

angular.js:13708 TypeError: Cannot read property 'noop' of undefined
    at router.decorator.ts:25
    at Scope.$broadcast (angular.js:17767)
    at Object.transitionTo (angular-ui-router.js:3272)
    at Object.go (angular-ui-router.js:3107)
    at angular-ui-router.js:4143
    at angular.js:19374
    at completeOutstandingRequest (angular.js:5955)
    at angular.js:6234

After the change the error does not appear again. Failing checks have me nervous but tests seem to pass with "gulp test" locally for me at least. Though there was a too long timeout (5000+ ms) on the server 1 out of 2 times.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, I believe that's where Babel & TypeScript differ with modules. I believe this is the same reason why I had to use requires for angular modules when using TS. It works with Babel.


export function routerDecorator($rootScope<% if(filters.ngroute) { %>, $location<% } if(filters.uirouter) { %>, $state<% } %>, Auth) {
'ngInject';
Expand Down