Skip to content
Merged
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
504 changes: 501 additions & 3 deletions package-lock.json

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@tikui/cli",
"version": "3.1.1",
"version": "3.2.0",
"description": "Command lines tool for Tikui",
"main": "index.js",
"files": [
Expand Down Expand Up @@ -53,6 +53,7 @@
},
"devDependencies": {
"@eslint/js": "^9.9.0",
"@prettier/plugin-pug": "^3.4.2",
"@types/jest": "^30.0.0",
"eslint": "^9.9.0",
"eslint-plugin-jest": "^29.0.0",
Expand Down
4 changes: 2 additions & 2 deletions src/cli/generate-project/atomic/src/atom/atom.pug
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
extends /layout-documentation

block append vars
-active='atom'
- active = 'atom';

block title
title Tikui - Atoms

block content
.tikui-vertical-spacing.-s32
.tikui-vertical-spacing--line
h1.tikui-title-main#atoms Atoms
h1#atoms.tikui-title-main Atoms
.tikui-vertical-spacing--line
include /documentation/atomic-design/quote/atom
.tikui-vertical-spacing--line
Expand Down
10 changes: 5 additions & 5 deletions src/cli/generate-project/atomic/src/index.pug
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ block content
em HTML
.tikui-vertical-spacing--line
pre
code.language-html.
#{'<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />'}
#{''}
#{'<link rel="stylesheet" href="{DOMAIN}/tikui.css" />'}
code.language-html
| #{ '<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />' }
|
| #{ '<link rel="stylesheet" href="{DOMAIN}/tikui.css" />' }
.tikui-vertical-spacing--line
p.tikui-paragraph
em Pug
Expand All @@ -34,7 +34,7 @@ block content
.tikui-vertical-spacing--line
h2.tikui-title-section Documentation
.tikui-vertical-spacing--line
p.tikui-paragraph The Style have an #[a.tikui-link(href='http://atomicdesign.bradfrost.com' target='_blank') Atomic Design] structure.
p.tikui-paragraph The Style have an #[a.tikui-link(href='http://atomicdesign.bradfrost.com', target='_blank') Atomic Design] structure.
.tikui-vertical-spacing--line
ul.tikui-list
li
Expand Down
4 changes: 2 additions & 2 deletions src/cli/generate-project/atomic/src/layout-documentation.pug
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ include /documentation/mixin

block header
block vars
-let active='';
-const isActive = current => current === active;
- let active = '';
- const isActive = (current) => current === active;
+tikui-navbar('[[TIKUI_BASEPATH]]index.html', 'Tikui')
+tikui-navbar-item('[[TIKUI_BASEPATH]]atom/atom.html', 'Atoms', isActive('atom'))
+tikui-navbar-item('[[TIKUI_BASEPATH]]molecule/molecule.html', 'Molecules', isActive('molecule'))
Expand Down
4 changes: 2 additions & 2 deletions src/cli/generate-project/atomic/src/molecule/molecule.pug
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
extends /layout-documentation

block append vars
-active='molecule'
- active = 'molecule';

block title
title Tikui - Molecules

block content
.tikui-vertical-spacing.-s32
.tikui-vertical-spacing--line
h1.tikui-title-main#molecules Molecules
h1#molecules.tikui-title-main Molecules
.tikui-vertical-spacing--line
include /documentation/atomic-design/quote/molecule
.tikui-vertical-spacing--line
Expand Down
4 changes: 2 additions & 2 deletions src/cli/generate-project/atomic/src/organism/organism.pug
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
extends /layout-documentation

block append vars
-active='organism'
- active = 'organism';

block title
title Tikui - Organisms

block content
.tikui-vertical-spacing.-s32
.tikui-vertical-spacing--line
h1.tikui-title-main#organisms Organisms
h1#organisms.tikui-title-main Organisms
.tikui-vertical-spacing--line
include /documentation/atomic-design/quote/organism
.tikui-vertical-spacing--line
Expand Down
4 changes: 2 additions & 2 deletions src/cli/generate-project/atomic/src/template/template.pug
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
extends /layout-documentation

block append vars
-active='template'
- active = 'template';

block title
title Tikui - Templates

block content
.tikui-vertical-spacing.-s32
.tikui-vertical-spacing--line
h1.tikui-title-main#templates Templates
h1#templates.tikui-title-main Templates
.tikui-vertical-spacing--line
include /documentation/atomic-design/quote/template
.tikui-vertical-spacing--line
Expand Down
1 change: 1 addition & 0 deletions src/cli/generate-project/common/.prettierrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"plugins": ["@prettier/plugin-pug"],
"singleQuote": true,
"trailingComma": "all",
"printWidth": 100
Expand Down
16 changes: 0 additions & 16 deletions src/cli/generate-project/common/.pug-lintrc.json

This file was deleted.

4 changes: 2 additions & 2 deletions src/cli/generate-project/common/src/layout.pug
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ doctype html
html
head
meta(charset='utf-8')
meta(name='viewport' content='width=device-width, initial-scale=1, shrink-to-fit=no')
meta(name='viewport', content='width=device-width, initial-scale=1, shrink-to-fit=no')
block title
title Tikui
link(href='[[TIKUI_BASEPATH]]tikui.css' rel='stylesheet')
link(href='[[TIKUI_BASEPATH]]tikui.css', rel='stylesheet')
body
block body
p Please include a body here.
13 changes: 5 additions & 8 deletions src/cli/generate-project/templated/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,16 @@
"serve": "tikui-core serve",
"build": "tikui-core build",
"preview": "tikui-core preview",
"lint": "concurrently npm:sass:lint npm:pug:lint",
"format": "prettier . --check",
"format:fix": "prettier . --write",
"pug:lint": "pug-lint src",
"sass:lint": "stylelint \"src/**/*.scss\"",
"sass:lint:fix": "stylelint \"src/**/*.scss\" --fix"
"lint": "stylelint \"src/**/*.scss\" --fix",
"lint:ci": "stylelint \"src/**/*.scss\"",
"format": "prettier . --write",
"format:ci": "prettier . --check"
},
"devDependencies": {
"@prettier/plugin-pug": "^3.4.2",
"@tikui/core": "^7.0.0",
"concurrently": "^9.0.0",
"postcss-scss": "^4.0.5",
"prettier": "3.8.0",
"pug-lint": "^2.6.0",
"sass": "^1.77.8",
"stylelint": "^16.7.0",
"stylelint-config-concentric-order": "^5.2.0",
Expand Down
1 change: 0 additions & 1 deletion test/cli/generate-project.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ const expectAssetCreatedFor = (name: string) => {
['src/favicon.ico'].forEach(expectSameBinaryFileForCategory('common'));
[
'.editorconfig',
'.pug-lintrc.json',
'.stylelintrc.json',
'logo.svg',
'README.md',
Expand Down