Skip to content

Commit

Permalink
using final version of synergy
Browse files Browse the repository at this point in the history
  • Loading branch information
esr360 committed Jan 11, 2018
1 parent d893655 commit b94c76a
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 19 deletions.
6 changes: 0 additions & 6 deletions .travis.yml
@@ -1,12 +1,6 @@
language: node_js
node_js:
- 6
before_install:
- rvm install 2.2.4
- gem install sass
- gem install scss_lint
- gem install sass-json-vars
- npm install -g grunt-cli
install:
- npm install
before_script:
Expand Down
2 changes: 1 addition & 1 deletion build/plugins/static-site-generator.js
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom';
import { Module, Component } from '../../../../Synergy/src/js/synergy';
import { Module, Component } from 'Synergy';
import jsdom from 'jsdom-global';
import StaticSiteGeneratorPlugin from 'static-site-generator-webpack-plugin';

Expand Down
19 changes: 11 additions & 8 deletions package.json
@@ -1,6 +1,6 @@
{
"name": "one-nexus",
"version": "3.0.0",
"version": "3.1.0",
"description": "A toolkit for architecting and constructing modular front-end user-interfaces",
"keywords": [
"css",
Expand All @@ -26,7 +26,7 @@
"dependencies": {
"Kayzen-GS": "^2.4.0",
"Sass-Boost": "^1.1.1",
"Synergy": "git+https://github.com/esr360/Synergy.git",
"Synergy": "3.9.1",
"deep-extend": "^0.5.0",
"detect-browser": "^2.0.0",
"flickity": "^2.0.8",
Expand All @@ -43,8 +43,6 @@
"autoprefixer": "^6.7.7",
"babel-core": "^6.24.1",
"babel-loader": "^7.1.2",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
"babel-preset-es2015": "^6.24.1",
"babel-preset-react": "^6.24.1",
"babel-register": "^6.26.0",
Expand All @@ -56,17 +54,18 @@
"eslint-plugin-react": "^7.5.1",
"html-webpack-plugin": "^2.30.1",
"imports-loader": "^0.7.1",
"jsdoc": "^3.5.5",
"jsdom": "^11.0.0",
"jsdom-global": "^3.0.2",
"mocha": "^3.4.2",
"node-sass": "^4.7.2",
"node-sass-json-importer": "^3.0.2",
"postcss-loader": "^2.0.10",
"react-element-to-string": "^1.0.2",
"react-hot-loader": "^3.1.3",
"react-router": "^4.2.0",
"sass-loader": "^6.0.6",
"sass-true": "^3.0.0-beta.1",
"sassdoc": "^2.5.0",
"static-site-generator-webpack-plugin": "^3.4.1",
"style-loader": "^0.19.1",
"stylelint": "^8.4.0",
Expand All @@ -82,11 +81,15 @@
"build:dev": "webpack --env.build=development",
"build:prod": "webpack --env.build=production",
"build:static": "webpack --env.static=true --env.build=development && npm run sass:dev",
"lint": "",
"docs": "",
"test": "mocha unit-testing/js/tests.js unit-testing/scss/tests.js --require babel-register",
"lint": "npm run lint:js && npm run lint:scss",
"lint:js": "eslint './src/js/**/*.js'",
"lint:scss": "stylelint src/scss/**/*.scss",
"test": "npm run test:js && npm run test:scss",
"test:js": "mocha unit-testing/js/tests.js --require babel-register",
"test:scss": "mocha unit-testing/scss/tests.js --require babel-register",
"docs": "npm run docs:js && npm run docs:sass",
"docs:js": "jsdoc src/ui -r -d docs/js",
"docs:sass": "sassdoc src/ui -d docs/sass",
"sass:dev": "node-sass src/app.scss dist/assets/styles/app.css --output-style=expanded --importer=node_modules/node-sass-json-importer/dist/node-sass-json-importer.js"
}
}
2 changes: 1 addition & 1 deletion src/app.js
Expand Up @@ -28,7 +28,7 @@ export { UI };
// Synergy
//*****************************************************************

import { Module, Component } from '../../../Synergy/src/js/synergy';
import { Module, Component } from 'Synergy';

[window.Module, window.Component] = [Module, Component];

Expand Down
2 changes: 1 addition & 1 deletion src/ui/ui.js
Expand Up @@ -16,7 +16,7 @@ import deepextend from 'deep-extend';
import Browser from 'detect-browser';
import Flickity from 'flickity';
import PubSub from 'pubsub-js';
import Synergy from '../../../../Synergy/src/js/synergy';
import { Synergy } from 'Synergy';

export {
Browser,
Expand Down
3 changes: 1 addition & 2 deletions src/ui/ui.scss
Expand Up @@ -14,8 +14,7 @@
@import '../../node_modules/Kayzen-GS/dist/kayzen-gs.scss';
@import '../../node_modules/Sass-Boost/dist/sass-boost';
@import '../../node_modules/spinners/stylesheets/spinners';
//@import '../../node_modules/Synergy/dist/synergy';
@import '../../../../Synergy/src/scss/synergy';
@import '../../node_modules/Synergy/dist/synergy';

// CSS librarys
@import '../../node_modules/flickity/dist/flickity';
Expand Down

0 comments on commit b94c76a

Please sign in to comment.