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

Feature/webpack #211

Merged
merged 13 commits into from
Aug 14, 2018
2 changes: 1 addition & 1 deletion .stylelintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: 'stylelint-config-ship-shape'
};
};
151 changes: 96 additions & 55 deletions docs/welcome/css/welcome.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 0 additions & 9 deletions docs/welcome/css/welcome.css.map

This file was deleted.

20 changes: 11 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,26 +17,23 @@
"Chuck Carpenter <charleswcarpenter3@gmail.com>"
],
"scripts": {
"build": "webpack && yarn copy-deps",
"build": "yarn clean && webpack --mode production",
"postbuild": "rm -f dist/removable-*",
"clean": "rm -rf dist",
Copy link
Member

Choose a reason for hiding this comment

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

hadn't you suggested a cross platform option for this?

Copy link
Member

Choose a reason for hiding this comment

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

I don't think we need anything cross platform. Everything is generally UNIX based.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Closed this PR #205 by myself. Adding Git to PATH seems to be a good solution.

"copy-deps": "cp -R ./node_modules/popper.js/dist/umd/. dist/js",
"cy:open": "./node_modules/.bin/cypress open",
"cy:run": "./node_modules/.bin/cypress run",
"prebuild:css": "node-sass --source-map true ./docs/welcome/sass/*.scss -o ./docs/welcome/css",
"prefix:css": "postcss --use autoprefixer -b 'last 2 versions' < ./docs/welcome/css/welcome.css",
"docs": "yarn build && yarn prebuild:css && yarn prefix:css",
"lint:js": "eslint .",
"lint:styles": "stylelint ./src/css/**/*.scss ./docs/welcome/sass/welcome.scss",
"lint": "yarn lint:js && yarn lint:styles",
"start": "webpack-dev-server --open",
"start": "yarn watch",
"start-test-server": "http-server",
"test:ci": "yarn test:unit:ci && yarn test:cy:ci",
"test:cy:ci": "start-server-and-test start-test-server http://localhost:8080 cy:run",
"test:cy:watch": "start-server-and-test start-test-server http://localhost:8080 cy:open",
"test:unit:ci": "karma start --single-run --browsers ChromeHeadlessNoSandbox",
"test:unit:watch": "karma start --browsers Chrome",
"test": "mocha",
"watch": "webpack --watch"
"watch": "yarn clean && webpack --watch --mode development"
},
"homepage": "http://shipshapecode.github.io/shepherd/docs/welcome/",
"license": "MIT",
Expand All @@ -53,14 +50,19 @@
"babel-loader": "^7.1.4",
"babel-plugin-add-module-exports": "^0.2.1",
"babel-preset-env": "^1.6.1",
"browser-sync": "^2.24.6",
"browser-sync-webpack-plugin": "^2.2.2",
"chai": "^4.1.2",
"codeclimate-test-reporter": "^0.5.0",
"copy-webpack-plugin": "^4.5.2",
"css-loader": "^1.0.0",
"cypress": "^3.0.3",
"del": "^3.0.0",
"eslint": "^5.1.0",
"eslint-plugin-mocha": "^5.1.0",
"eslint-plugin-ship-shape": "^0.6.0",
"extract-loader": "^2.0.1",
"file-loader": "^1.1.11",
"glob": "^7.1.2",
"http-server": "^0.11.1",
"istanbul-instrumenter-loader": "^3.0.1",
Expand All @@ -73,7 +75,6 @@
"karma-mocha-reporter": "^2.2.5",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^3.0.0",
"mini-css-extract-plugin": "^0.4.1",
"mocha": "^5.2.0",
"node-sass": "^4.9.2",
"postcss": "^7.0.2",
Expand All @@ -82,8 +83,9 @@
"source-map-loader": "^0.2.3",
"start-server-and-test": "^1.7.0",
"style-loader": "^0.21.0",
"stylelint": "^9.3.0",
"stylelint": "^9.4.0",
"stylelint-config-ship-shape": "^0.4.0",
"stylelint-webpack-plugin": "^0.10.5",
"uglifyjs-webpack-plugin": "^1.2.7",
"webpack": "^4.16.3",
"webpack-cli": "^3.1.0",
Expand Down
2 changes: 1 addition & 1 deletion src/css/_rounded.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/css/_square.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@

.shepherd-start-tour-button.shepherd-element {
@include start-tour-button;
}
}
2 changes: 1 addition & 1 deletion src/js/shepherd.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Popper from 'popper.js/dist/umd/popper';
import Popper from 'popper.js';

const uniqueId = (function() {
let id = 0;
Expand Down
Loading