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

Package lock + webpack upgrades from pr#1 #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ node_modules

# Builds
dist

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"
]
}
}
}
}
Loading