Skip to content

Commit

Permalink
Merge pull request #4 from helloproclub/master
Browse files Browse the repository at this point in the history
Updated
  • Loading branch information
lovanto authored May 21, 2020
2 parents e34d59d + b329eca commit 9fb8cd5
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -83,4 +83,4 @@ typings/

# remove build product
/build/
/dist/
/dist/
106 changes: 51 additions & 55 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,57 +1,53 @@
{
"name": "pinoccio",
"version": "1.0.0",
"description": "Proclub Design System written in React; may you bring your idea to life",
"main": "build/index.js",
"engines": {
"node": ">=12.16.2"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build": "webpack --config webpack.config.build.js",
"storybook": "start-storybook"
},
"repository": {
"type": "git",
"url": "git+https://github.com/helloproclub/Pinoccio.git"
},
"keywords": [
"design",
"system",
"react",
"component"
],
"author": "blinfoldking",
"license": "MIT",
"bugs": {
"url": "https://github.com/helloproclub/Pinoccio/issues"
},
"homepage": "https://github.com/helloproclub/Pinoccio#readme",
"dependencies": {
"create-react-app": "^2.1.8",
"prop-types": "^15.7.2",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"webpack": "^4.29.6"
},
"devDependencies": {
"@babel/core": "^7.3.4",
"@babel/plugin-proposal-class-properties": "^7.3.4",
"@babel/preset-env": "^7.3.4",
"@babel/preset-react": "^7.0.0",
"@storybook/addon-info": "^5.0.1",
"@storybook/react": "^5.0.1",
"babel-cli": "^6.26.0",
"babel-loader": "^8.0.5",
"css-loader": "^2.1.1",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^6.0.0",
"node-sass": "^4.11.0",
"react-scripts": "^3.4.1",
"sass-loader": "^7.1.0",
"storybook": "^5.3.18",
"style-loader": "^0.23.1",
"ttf-loader": "^1.0.2",
"webpack-cli": "^3.2.3"
}
"name": "pinoccio",
"version": "1.0.0",
"description": "Proclub Design System written in React; may you bring your idea to life",
"main": "build/index.js",
"engines": {
"node": ">=12.16.2"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build": "webpack --config webpack.config.build.js",
"build-storybook": "build-storybook -c .storybook -o dist",
"storybook": "start-storybook"
},
"repository": {
"type": "git",
"url": "git+https://github.com/helloproclub/Pinoccio.git"
},
"keywords": ["design", "system", "react", "component"],
"author": "blinfoldking",
"license": "MIT",
"bugs": {
"url": "https://github.com/helloproclub/Pinoccio/issues"
},
"homepage": "https://github.com/helloproclub/Pinoccio#readme",
"dependencies": {
"create-react-app": "^2.1.8",
"prop-types": "^15.7.2",
"react": "^16.8.4",
"react-dom": "^16.8.4",
"webpack": "^4.29.6"
},
"devDependencies": {
"@babel/core": "^7.3.4",
"@babel/plugin-proposal-class-properties": "^7.3.4",
"@babel/preset-env": "^7.3.4",
"@babel/preset-react": "^7.0.0",
"@storybook/addon-info": "^5.0.1",
"@storybook/react": "^5.0.1",
"babel-cli": "^6.26.0",
"babel-loader": "^8.0.5",
"css-loader": "^2.1.1",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^6.0.0",
"node-sass": "^4.11.0",
"react-scripts": "^3.4.1",
"sass-loader": "^7.1.0",
"storybook": "^5.3.18",
"style-loader": "^0.23.1",
"ttf-loader": "^1.0.2",
"webpack-cli": "^3.2.3"
}
}
7 changes: 3 additions & 4 deletions webpack.config.build.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var path = require("path");
const base = require('./webpack.config.base')
const base = require("./webpack.config.base");

module.exports = {
entry: "./src/index.js",
Expand All @@ -13,12 +13,11 @@ module.exports = {
...base.module.rules,
{
test: /\.scss$/,
loaders: ["style-loader", "css-loader", "sass-loader"],
},
loaders: ["style-loader", "css-loader", "sass-loader"]
}
]
},
externals: {
react: "commonjs react"
}
};

0 comments on commit 9fb8cd5

Please sign in to comment.