Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ node_modules

# Builds
dist

package-lock.json
9 changes: 9 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.nvmrc
lerna.json
webpack.config.js
.storybook
.idea
configs
node_modules
Makefile
src/*/src
4 changes: 2 additions & 2 deletions .storybook/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { configure } from '@storybook/react';
import {configure} from "@storybook/react";

const req = require.context('../src', true, /.stories.js$/);
const req = require.context("../src", true, /.stories.js$/);

const loadStories = () => {
req.keys().forEach((filename) => req(filename))
Expand Down
7 changes: 7 additions & 0 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/**
* Created by shuieryin on Jan 27 2020, 9:06 PM.
*/

module.exports = {
addons: ["@storybook/preset-create-react-app"]
};
13 changes: 6 additions & 7 deletions .storybook/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
const rules = require('../configs/rules.config');
const { aliases } = require('../configs/aliases.config');
const {rules, aliases} = require("../configs/shared.config");

module.exports = (baseConfig, env, defaultConfig) => {
defaultConfig.module.rules = rules;
defaultConfig.resolve.alias = aliases;
module.exports = baseConfig => {
baseConfig.config.module.rules = rules;
baseConfig.config.resolve.alias = aliases;

return defaultConfig;
};
return baseConfig.config;
};
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pack:
@npm run clean:components; npm run build:components; rm -rf dist; mkdir dist; npm pack; mv *.tgz dist;
10 changes: 0 additions & 10 deletions configs/aliases.config.js

This file was deleted.

35 changes: 0 additions & 35 deletions configs/rules.config.js

This file was deleted.

46 changes: 46 additions & 0 deletions configs/shared.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
const path = require("path");
const autoprefixer = require("autoprefixer");

const rules = [
{
exclude: /node_modules/,
test: /\.(scss)$/,
use: [
"style-loader",
"css-loader",
{
loader: "postcss-loader",
options: {
plugins: [
autoprefixer({
grid: "autoplace"
})
]
}
},
"sass-loader"
]
},
{
test: /\.(js|jsx)$/,
exclude: /node_modules/,
use: {
loader: "babel-loader",
options: {
presets: [
"@babel/preset-env",
"@babel/react"
]
}
}
}
];

// __dirname gives exact path where the file is, in this case: PROJECT/configs. It is needed to add ../ at the beginning of the aliases to solve correct path.

const aliases = {
"@audnavlib/button": path.resolve(__dirname, "../src/Button/src/index"),
"@audnavlib/button-group": path.resolve(__dirname, "../src/ButtonGroup/src/index")
};

module.exports = {rules, aliases};
14 changes: 10 additions & 4 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
{
"lerna": "3.13.0",
"lerna": "3.20.2",
"npmClient": "npm",
"version": "independent",
"packages": ["src/**/*"],
"packages": [
"src/**/*"
],
"registry": "https://registry.npmjs.org/",
"command": {
"publish": {
"ignoreChanges": ["*.md", "tests/*", "ignored-files"]
"ignoreChanges": [
"*.md",
"tests/*",
"ignored-files"
]
}
}
}
}
38 changes: 20 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,27 @@
},
"author": "Audrius Navickas",
"devDependencies": {
"@babel/core": "7.2.2",
"@babel/preset-env": "7.3.1",
"@babel/preset-react": "7.0.0",
"autoprefixer": "9.4.7",
"babel-loader": "8.0.5",
"cross-env": "5.2.0",
"css-loader": "2.1.0",
"lerna": "3.13.0",
"node-sass": "4.11.0",
"postcss-loader": "3.0.0",
"sass-loader": "7.1.0",
"style-loader": "0.23.1",
"webpack": "4.29.3",
"webpack-cli": "3.2.3"
"@babel/core": "^7.8.3",
"@babel/preset-env": "^7.8.3",
"@babel/preset-react": "^7.8.3",
"@storybook/preset-create-react-app": "^1.5.2",
"autoprefixer": "^9.7.4",
"babel-loader": "^8.0.6",
"cross-env": "^7.0.0",
"css-loader": "^3.4.2",
"lerna": "^3.20.2",
"node-sass": "^4.13.0",
"postcss-loader": "^3.0.0",
"react-scripts": "^3.3.0",
"sass-loader": "^8.0.2",
"style-loader": "^1.1.3",
"webpack": "^4.41.5",
"webpack-cli": "^3.3.10"
},
"dependencies": {
"@storybook/cli": "4.1.13",
"@storybook/react": "4.1.13",
"react": "16.8.2",
"react-dom": "16.8.2"
"@storybook/cli": "5.3.9",
"@storybook/react": "5.3.9",
"react": "16.12.0",
"react-dom": "16.12.0"
}
}
4 changes: 2 additions & 2 deletions src/Button/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"peerDependencies": {
"react": "^16.8.2",
"react-dom": "^16.8.2"
"react": "^16.12.0",
"react-dom": "^16.12.0"
}
}
4 changes: 2 additions & 2 deletions src/ButtonGroup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@audnavlib/button": "^1.0.0"
},
"peerDependencies": {
"react": "^16.8.2",
"react-dom": "^16.8.2"
"react": "^16.12.0",
"react-dom": "^16.12.0"
}
}
19 changes: 9 additions & 10 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
const pkg = require('./package.json');
const rules = require('./configs/rules.config');
const { aliases } = require('./configs/aliases.config');
const pkg = require("./package.json");
const {rules, aliases} = require("./configs/shared.config");

module.exports = {
module: {
rules: rules
},
entry: './src/index.js',
entry: "./src/index.js",
output: {
filename: pkg.main,
library: '',
libraryTarget: 'commonjs'
library: "",
libraryTarget: "commonjs2"
},
resolve: {
alias: aliases,
extensions: ['.js', '.jsx', '.json' ],
modules: ['node_modules']
},
};
extensions: [".js", ".jsx", ".json"],
modules: ["node_modules"]
}
};