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

fix: Refactor a lot of build things for icons #58

Merged
merged 2 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
6 changes: 1 addition & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,4 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
run: npx semantic-release
- name: Eik login and publish
run: pnpm eik login -k $EIK_TOKEN && pnpm eik publish || true
env:
EIK_TOKEN: ${{ secrets.EIK_TOKEN }}
run: npx semantic-release
File renamed without changes.
2 changes: 1 addition & 1 deletion elements.eik.js → buildElements.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ files.forEach(async (filePath) => {
format: "esm",
sourcemap: true,
target: "es2017",
minify: true,
minify: false,
external: ["lit", "@lingui/core"],
});
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion react.eik.js → buildReact.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ files.forEach(async (filePath) => {
format: "esm",
sourcemap: true,
target: "es2017",
minify: true,
minify: false,
external: ["react", "@lingui/core"],
});
} catch (err) {
Expand Down
2 changes: 1 addition & 1 deletion vue.eik.js → buildVue.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ files.forEach(async (filePath) => {
format: "esm",
sourcemap: true,
target: "es2017",
minify: true,
minify: false,
external: ["vue", "@lingui/core"],
});
} catch (err) {
Expand Down
33 changes: 27 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,32 @@
"version": "1.2.0",
"repository": "git@github.com:warp-ds/icons.git",
"description": "WARP's icon set",
"main": "index.js",
"main": "main.js",
"files": [
"dist"
],
"types": "./dist/types",
"typesVersions": {
"*": {
"./react": [
"./dist/react/index.d.ts"
],
"./react/*": [
"./dist/react/*.d.ts"
],
"./vue": [
"./dist/vue/index.d.ts"
],
"./vue/*": [
"./dist/vue/*.d.ts"
],
"./elements": [
"./dist/elements/index.d.ts"
],
"./elements/*": [
"./dist/elements/*.d.ts"
]
}
},
"exports": {
"./react": "./dist/react/index.js",
"./react/*": "./dist/react/*.js",
Expand All @@ -30,9 +51,9 @@
"build:release": "rimraf dist && pnpm build && pnpm build:vue && pnpm build:react && pnpm build:elements && tsc",
"vite:build": "vite build",
"preview": "pnpm run build && vite build && vite preview",
"build:react": "rimraf react && mkdir react && lingui extract && lingui compile && node ./scripts/output/react.js && node ./react.eik.js",
"build:vue": "rimraf vue && mkdir vue && lingui extract && lingui compile && node ./scripts/output/vue.js && node ./vue.eik.js",
"build:elements": "rimraf elements && mkdir elements && lingui extract && lingui compile && node ./scripts/output/elements.js && node ./elements.eik.js",
"build:react": "rimraf react && mkdir react && lingui extract && lingui compile && node ./scripts/output/react.js && node ./buildReact.js",
"build:vue": "rimraf vue && mkdir vue && lingui extract && lingui compile && node ./scripts/output/vue.js && node ./buildVue.js",
"build:elements": "rimraf elements && mkdir elements && lingui extract && lingui compile && node ./scripts/output/elements.js && node ./buildElements.js",
"build:all": "lingui extract && lingui compile && rimraf react && mkdir react && rimraf vue && mkdir vue && rimraf elements && mkdir elements && node ./scripts/output/react.js && node ./react.eik.js && node ./scripts/output/vue.js && node ./vue.eik.js && node ./scripts/output/elements.js && node ./elements.eik.js"
},
"license": "Apache-2.0",
Expand Down Expand Up @@ -91,4 +112,4 @@
"dependencies": {
"@lingui/core": "^4.4.2"
}
}
}
2 changes: 1 addition & 1 deletion scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { nanoid } from "nanoid";
import { getElement, getNameAndSize, pascalCase } from './util/helpers.js'
import { readFileSync } from 'node:fs'
import yaml from 'js-yaml'
import { basedir } from "../index.js";
import { basedir } from "../base.js";
const descriptionsFile = readFileSync(path.join(basedir, 'icon-descriptions.yml'))
const descriptions = yaml.load(descriptionsFile)

Expand Down
2 changes: 1 addition & 1 deletion scripts/import.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import fetch from "node-fetch";
import path from "node:path";
import ora from "ora";
import prompts from "prompts";
import { basedir } from "../index.js";
import { basedir } from "../base.js";
import { getNameAndSize } from "./util/helpers.js";


Expand Down
3 changes: 2 additions & 1 deletion scripts/output/react.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ getSVGs().forEach(({ svg, filename, exportName, name }) => {
`import { activateI18n } from '../src/utils/i18n';`,
`activateI18n(enMessages, nbMessages, fiMessages);`,
`const title = i18n.t({ message: \`${message}\`, id: '${id}', comment: '${comment}' });`,
`export const ${exportName} = (attrs) => React.createElement('svg', { ${attrs.join(", ")}, dangerouslySetInnerHTML: { __html: ${'`'}${titleHtml}${svg.html}${'`'} }, ...attrs, });`,
`const ${exportName} = (attrs) => React.createElement('svg', { ${attrs.join(", ")}, dangerouslySetInnerHTML: { __html: ${'`'}${titleHtml}${svg.html}${'`'} }, ...attrs, });`,
`export default ${exportName};`
].join("\n");

const path = joinPath(basepath, filename)
Expand Down
15 changes: 8 additions & 7 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{
"compilerOptions": {
"target": "esnext",
"module": "NodeNext",
"moduleResolution": "node",
"allowJs": true,
"strictNullChecks": false,
"emitDeclarationOnly": true,
"declaration": true,
"outDir": "./dist/types",
"removeComments": false
"outDir": "./dist/",
"removeComments": false,
"allowSyntheticDefaultImports": true,
},
"files": [
"./react/index.js",
"./vue/index.js",
"./elements/index.js",
"include": [
"./react/*.js",
"./vue/*.js",
"./elements/*.js",
],
"exclude": [
"node_modules",
Expand Down