Skip to content

Commit

Permalink
Merge pull request #1363 from leanupjs/chore/merge-1.2-in-1.1
Browse files Browse the repository at this point in the history
Chore/merge 1.2 in 1.1
  • Loading branch information
deleonio authored Mar 21, 2021
2 parents 402e52e + 91450e4 commit 04f8b2b
Show file tree
Hide file tree
Showing 23 changed files with 388 additions and 93 deletions.
5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
"type": "git",
"url": "https://github.com/leanupjs/leanup.git"
},
"auto-changelog": {
"template": "keepachangelog",
"unreleased": true,
"commitLimit": false
},
"devDependencies": {
"@commitlint/cli": "12.1.0",
"@commitlint/config-conventional": "12.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/core/template/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
<div id="vue3"></div>

<!-- Vite -->
<script type="module" src="/src/main.ts"></script>
<script type="module" async src="/src/main.ts"></script>
</body>
</html>
1 change: 1 addition & 0 deletions packages/cli/core/template/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
"@leanup/stack-snowpack": "1.1.8",
"@leanup/stack-vite": "1.1.8",
"@leanup/stack-webpack": "1.1.8",
"@tailwindcss/jit": "0.1.4",
"chromedriver": "89.0.0",
"cssnano": "4.1.10",
"npm-check-updates": "11.3.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/core/template/postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const config = require('@leanup/stack/postcss.config');

config.plugins.unshift(require('tailwindcss'));
config.plugins.unshift(require('@tailwindcss/jit'));
config.plugins.push(
require('cssnano')({
preset: 'default',
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/core/template/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div id="vue3"></div>

<!-- Snowpack, Webpack -->
<script nomodule src="main.js"></script>
<script type="module" src="main.js"></script>
<script nomodule async src="main.js"></script>
<script type="module" async src="main.js"></script>
</body>
</html>
4 changes: 2 additions & 2 deletions packages/cli/frameworks/react/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = (env, argv) => {
module.exports = (...args) => {
const { webpackReactConfig } = require('./lib/webpack.config');
return webpackReactConfig(env, argv);
return webpackReactConfig(...args);
};
2 changes: 1 addition & 1 deletion packages/stack/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
"autoprefixer": "10.2.5",
"chai": "4.3.4",
"cross-env": "7.0.3",
"esbuild": "0.9.6",
"esbuild-register": "2.3.0",
"eslint": "7.22.0",
"eslint-plugin-html": "6.1.2",
Expand All @@ -72,6 +71,7 @@
},
"peerDependencies": {
"chromedriver": ">=87",
"esbuild": "^0",
"geckodriver": "^1",
"selenium-server": "^3",
"typescript": "^4"
Expand Down
4 changes: 2 additions & 2 deletions packages/stack/frameworks/angular/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = (env, argv) => {
module.exports = (...args) => {
const { webpackAngularConfig } = require('./lib/webpack.config');
return webpackAngularConfig(env, argv);
return webpackAngularConfig(...args);
};
4 changes: 2 additions & 2 deletions packages/stack/frameworks/angularjs/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = (env, argv) => {
module.exports = (...args) => {
const { webpackAngularJSConfig } = require('./lib/webpack.config');
return webpackAngularJSConfig(env, argv);
return webpackAngularJSConfig(...args);
};
4 changes: 2 additions & 2 deletions packages/stack/frameworks/aurelia/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = (env, argv) => {
module.exports = (...args) => {
const { webpackAureliaConfig } = require('./lib/webpack.config');
return webpackAureliaConfig(env, argv);
return webpackAureliaConfig(...args);
};
4 changes: 2 additions & 2 deletions packages/stack/frameworks/inferno/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = (env, argv) => {
module.exports = (...args) => {
const { webpackInfernoConfig } = require('./lib/webpack.config');
return webpackInfernoConfig(env, argv);
return webpackInfernoConfig(...args);
};
Loading

0 comments on commit 04f8b2b

Please sign in to comment.