Canary

.gitignore

@@ -5,4 +5,5 @@ bower_components
 demo
 .idea
 .DS_Store
-release.txt
+release.txt
+static

.npmignore

@@ -1,11 +1,11 @@
-angular-fullstack-deps
-test
-.idea
-src
-scripts
-ISSUE_TEMPLATE.md
-PULL_REQUEST_TEMPLATE.md
-.travis.yml
-gulpfile.babel.js
-Gruntfile.js
-.jshintrc
+./angular-fullstack-deps
+./test
+./.idea
+./src
+./scripts
+./ISSUE_TEMPLATE.md
+./PULL_REQUEST_TEMPLATE.md
+./.travis.yml
+./gulpfile.babel.js
+./Gruntfile.js
+./.jshintrc

.travis.yml

@@ -14,7 +14,7 @@ before_install:
   - ./scripts/sauce_connect_setup.sh
   - gem update --system
   - gem install sass --version "=3.3.7"
-  - npm install -g bower grunt-cli
+  - npm install -g gulp-cli
 services: mongodb
 cache:
   directories:

Gruntfile.js

@@ -12,32 +12,11 @@ module.exports = function (grunt) {
   var gitCmd = gruntUtils.gitCmd;
   var gitCmdAsync = gruntUtils.gitCmdAsync;
 
-  // Load grunt tasks automatically, when needed
-  require('jit-grunt')(grunt, {
-    buildcontrol: 'grunt-build-control'
-  });
-
   grunt.initConfig({
     config: {
       demo: 'demo'
     },
     pkg: grunt.file.readJSON('package.json'),
-    conventionalChangelog: {
-      options: {
-        changelogOpts: {
-          // conventional-changelog options go here
-          preset: 'angular'
-        },
-        writerOpts: {
-          // conventional-changelog-writer options go here
-          finalizeContext: gruntUtils.conventionalChangelog.finalizeContext,
-          commitPartial: gruntUtils.conventionalChangelog.commitPartial
-        }
-      },
-      release: {
-        src: 'CHANGELOG.md'
-      }
-    },
     release: {
       options: {
         commitMessage: '<%= version %>',
@@ -51,17 +30,6 @@ module.exports = function (grunt) {
         npm: false
       }
     },
-    updateSubmodules: {
-      options: {
-        modules: ['angular-fullstack-deps']
-      }
-    },
-    commitNgFullstackDeps: {
-      options: {
-        cwd: 'angular-fullstack-deps',
-        files: ['package.json', 'bower.json']
-      }
-    },
     stage: {
       options: {
         files: ['CHANGELOG.md', 'angular-fullstack-deps']
@@ -82,43 +50,6 @@ module.exports = function (grunt) {
         }
       }
     },
-    jshint: {
-      options: {
-        curly: false,
-        node: true
-      },
-      all: ['Gruntfile.js', 'src/**/*.js']
-    },
-    env: {
-      fast: {
-        SKIP_E2E: true
-      }
-    },
-    mochaTest: {
-      test: {
-        src: [
-          'test/*.js'
-        ],
-        options: {
-          reporter: 'spec',
-          timeout: 120000
-        }
-      }
-    },
-    clean: {
-      demo: {
-        files: [{
-          dot: true,
-          src: [
-            '<%= config.demo %>/*',
-            '!<%= config.demo %>/readme.md',
-            '!<%= config.demo %>/node_modules',
-            '!<%= config.demo %>/.git',
-            '!<%= config.demo %>/dist'
-          ]
-        }]
-      }
-    },
     david: {
       gen: {
         options: {}
@@ -136,26 +67,6 @@ module.exports = function (grunt) {
     gitCmd(['add'].concat(files), {}, this.async());
   });
 
-  grunt.registerTask('updateSubmodules', function() {
-    grunt.config.requires('updateSubmodules.options.modules');
-    var modules = grunt.config.get('updateSubmodules').options.modules;
-
-    Q()
-      .then(gitCmdAsync(['submodule', 'update', '--init', '--recursive']))
-      .then(function() {
-        var thens = [];
-        for (var i = 0, modulesLength = modules.length; i < modulesLength; i++) {
-          var opts = {cwd: modules[i]};
-          thens.push(gitCmdAsync(['checkout', 'master'], opts));
-          thens.push(gitCmdAsync(['fetch'], opts));
-          thens.push(gitCmdAsync(['pull'], opts));
-        }
-        return thens.reduce(Q.when, Q());
-      })
-      .catch(grunt.fail.fatal.bind(grunt.fail))
-      .finally(this.async());
-  });
-
   grunt.registerTask('commitNgFullstackDeps', function() {
     grunt.config.requires(
       'commitNgFullstackDeps.options.files',
@@ -201,7 +112,7 @@ module.exports = function (grunt) {
         testing: 'jasmine',
         auth: true,
         oauth: ['googleAuth', 'twitterAuth'],
-        socketio: true
+        ws: true
       };
 
       var deps = [
@@ -261,63 +172,6 @@ module.exports = function (grunt) {
     }
   });
 
-  grunt.registerTask('updateFixtures', 'updates package and bower fixtures', function(target) {
-    var genVer = require('./package.json').version;
-    var dest = __dirname + ((target === 'deps') ? '/angular-fullstack-deps/' : '/test/fixtures/');
-    var appName = (target === 'deps') ? 'angular-fullstack-deps' : 'tempApp';
-
-    var processJson = function(s, d) {
-      // read file, strip all ejs conditionals, and parse as json
-      var json = JSON.parse(fs.readFileSync(path.resolve(s), 'utf8').replace(/<%(.*)%>/g, ''));
-      // set properties
-      json.name = appName, json.version = genVer;
-      if (target === 'deps') { json.private = false; }
-      // stringify json and write it to the destination
-      fs.writeFileSync(path.resolve(d), JSON.stringify(json, null, 2));
-    };
-
-    processJson('templates/app/_package.json', dest + 'package.json');
-    processJson('templates/app/_bower.json', dest + 'bower.json');
-  });
-
-  grunt.registerTask('installFixtures', 'install package and bower fixtures', function() {
-    var done = this.async();
-
-    shell.cd('test/fixtures');
-    grunt.log.ok('installing npm dependencies for generated app');
-    child_process.exec('npm install --quiet', {cwd: '../fixtures'}, function (error, stdout, stderr) {
-
-      grunt.log.ok('installing bower dependencies for generated app');
-      child_process.exec('bower install', {cwd: '../fixtures'}, function (error, stdout, stderr) {
-
-        if(!process.env.SAUCE_USERNAME) {
-          grunt.log.ok('running npm run-script update-webdriver');
-          child_process.exec('npm run-script update-webdriver', function() {
-            shell.cd('../../');
-            done();
-          });
-        } else {
-          shell.cd('../../');
-          done();
-        }
-      })
-    });
-  });
-
-  grunt.registerTask('test', function(target, option) {
-    if (target === 'fast') {
-      grunt.task.run([
-        'env:fast'
-      ]);
-    }
-
-    return grunt.task.run([
-      'updateFixtures',
-      'installFixtures',
-      'mochaTest'
-    ])
-  });
-
   grunt.registerTask('deps', function(target) {
     if (!target || target === 'app') grunt.task.run(['updateFixtures']);
     grunt.task.run(['david:' + (target || '')]);

ISSUE_TEMPLATE.md

@@ -1,3 +1,5 @@
+ - [ ] I understand that GitHub issues are not for tech support, but for questions specific to this generator, bug reports, and feature requests.
+
 Item | Version
 ----- | -----
 generator-angular-fullstack | x.x.x
@@ -9,10 +11,9 @@ etc | etc
 Item | Answer
 ----- | -----
 Transpiler | Babel / TypeScript
-Markup | HTML / Jade
+Markup | HTML / Pug
 CSS | CSS / LESS / SCSS / Stylus
 Router | ngRoute / ui-router
-Build Tool | Grunt / Gulp
 Client Tests | Jasmine / Mocha
 DB | MongoDB / SQL
 Auth | Y / N

circle.yml

@@ -0,0 +1,67 @@
+version: 2
+jobs:
+  build:
+    docker:
+     - image: node:8
+     - image: mongo
+       command: [mongod, --smallfiles]
+
+    working_directory: ~/generator-angular-fullstack
+
+    environment:
+      NODE_ENV: test
+
+    branches:
+      ignore:
+        - gh-pages
+
+    steps:
+      - checkout
+      - run: git submodule sync && git submodule update --init
+
+      # Global npm dependencies
+      - restore_cache:
+          keys:
+            - generator-angular-fullstack-npm-global-{{ .Branch }}
+            - generator-angular-fullstack-npm-global-
+      - run: npm install --global gulp-cli
+      - save_cache:
+          key: generator-angular-fullstack-npm-global-{{ .Branch }}
+          paths:
+            - /usr/local/lib/node_modules
+
+      # Generator npm dependencies
+      - restore_cache:
+          keys:
+            - generator-angular-fullstack-npm-{{ .Branch }}-{{ checksum "package.json" }}
+            - generator-angular-fullstack-npm-{{ .Branch }}
+            - generator-angular-fullstack-npm-
+      - run: npm install --quiet
+      - save_cache:
+          key: generator-angular-fullstack-npm-{{ .Branch }}-{{ checksum "package.json" }}
+          paths:
+            - ~/generator-angular-fullstack/node_modules
+
+      # Test fixtures
+      - run: gulp updateFixtures:test
+      - restore_cache:
+          keys:
+            - generator-angular-fullstack-npm-fixtures-{{ .Branch }}-{{ checksum "templates/app/_package.json" }}
+            - generator-angular-fullstack-npm-fixtures-{{ .Branch }}
+            - generator-angular-fullstack-npm-fixtures-
+      - run: gulp installFixtures
+      - save_cache:
+          key: generator-angular-fullstack-npm-fixtures-{{ .Branch }}-{{ checksum "templates/app/_package.json" }}
+          paths:
+            - ~/generator-angular-fullstack/test/fixtures/node_modules
+
+      - run: gulp build
+      - run: npm test
+
+      - deploy:
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              git config --global user.email "[email protected]"
+              git config --global user.name "CircleCI"
+              cd docs && npm install && npm run build && npm run deploy
+            fi

contributing.md

@@ -1,17 +1,28 @@
 # Contributing
 
-See the [contributing docs](https://github.com/yeoman/yeoman/blob/master/contributing.md)
+See the [Yeoman contributing docs](https://github.com/yeoman/yeoman/blob/master/contributing.md)
 
 Additionally for this generator:
 
-* Please submit PRs to the `canary` branch, it is the main development branch for this generator.
+* Please submit bug fix PRs to the `master` branch. Please submit large feature PRs to the `canary` branch; it is the main development branch for this generator.
 * When submitting an issue, please follow the [guidelines](https://github.com/yeoman/yeoman/blob/master/contributing.md#issue-submission). Especially important is to make sure Yeoman is up-to-date, and providing the command or commands that cause the issue.
 * When submitting a PR, make sure that the commit messages match the [AngularJS conventions][commit-message-format] (see below).
 * When submitting a bugfix, write a test that exposes the bug and fails before applying your fix. Submit the test alongside the fix.
 * When submitting a new feature, add tests that cover the feature.
 * Open Issues marked with the [EASY](https://github.com/angular-fullstack/generator-angular-fullstack/issues?q=is%3Aopen+is%3Aissue+label%3AEasy) label are believed to be easy changes, and would be good Issues to tackle for new contributors.
 
+This project has 2 main branches: `master` and `canary`. The `master` branch is where the current stable code lives and should be used for production setups. The `canary` branch is the main development branch, this is where PRs should be submitted to (backport fixes may be applied to `master`).
+
+By separating the current stable code from the cutting-edge development we hope to provide a stable and efficient workflow for users and developers alike.
+
+When submitting a PR, make sure that the commit messages match the [AngularJS conventions](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/).
+
+When submitting a bugfix, try to write a test that exposes the bug and fails before applying your fix. Submit the test alongside the fix.
+
+When submitting a new feature, add tests that cover the feature.
+
 To run the generator:
+
 1. Clone it and `cd` to its root
 2. `npm install`
 3. `npm link` (tells npm to look to your own version)

docs/.alexrc

@@ -0,0 +1,3 @@
+{
+  "allow": ["boogeyman-boogeywoman"]
+}

docs/.babelrc

@@ -0,0 +1,9 @@
+{
+  "presets": [
+    "env",
+    "react"
+  ],
+  "plugins": [
+    "transform-object-rest-spread"
+  ]
+}

docs/.editorconfig

@@ -0,0 +1,16 @@
+# Top-most EditorConfig file
+root = true
+
+# Set default charset
+[*.{js}]
+charset = utf-8
+
+# 4 space indentation
+[*.{md,js,jsx,scss,hbs}]
+indent_style = space
+indent_size = 2
+
+# Format Config
+[{package.json}]
+indent_style = space
+indent_size = 2

docs/.eslintignore

@@ -0,0 +1,2 @@
+build/
+antwar.config.js