Skip to content

Commit d6acfe9

Browse files
mcgruemcgrue
committed
add support for project-relative paths and json-relative paths to chr json files, superceding whatever garbage there was before
1 parent b68b793 commit d6acfe9

File tree

9 files changed

+5012
-4008
lines changed

9 files changed

+5012
-4008
lines changed

‎.babelrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"presets": ["@babel/preset-env"],
3+
"plugins": [["@babel/plugin-transform-runtime"]]
4+
}

‎.vscode/settings.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"workbench.colorCustomizations": {
3+
"activityBar.background": "#60090E",
4+
"titleBar.activeBackground": "#860C14",
5+
"titleBar.activeForeground": "#FFFBFB"
6+
}
7+
}

‎package-lock.json

Lines changed: 455 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 167 additions & 164 deletions
Original file line numberDiff line numberDiff line change
@@ -1,172 +1,175 @@
11
{
2-
"name": "Breaditor",
3-
"version": "2.0.1",
4-
"description": "",
5-
"main": "./dist/main.js",
6-
"scripts": {
7-
"build-main": "cross-env NODE_ENV=production webpack --config webpack.main.prod.config.js",
8-
"build-renderer": "cross-env NODE_ENV=production webpack --config webpack.renderer.prod.config.js",
9-
"build": "npm run build-main && npm run build-renderer",
10-
"start-renderer-dev": "webpack-dev-server --config webpack.renderer.dev.config.js",
11-
"start-main-dev": "webpack --config webpack.main.config.js && electron ./dist/main.js",
12-
"start-dev": "cross-env NODE_ENV=test START_HOT=1 npm run start-renderer-dev",
13-
"dev": "npm run start-dev",
14-
"prestart": "npm run build",
15-
"start": "electron .",
16-
"lint": "eslint --ext=jsx,js,tsx,ts src",
17-
"lint-fix": "eslint --fix --ext=jsx,js,tsx,ts src",
18-
"test": "jest --detectOpenHandles",
19-
"watch": "jest --detectOpenHandles --watchAll",
20-
"pretest:e2e": "npm run build",
21-
"test:e2e": "jest --testMatch '**/?(*.)+(e2etest).[tj]s?(x)'",
22-
"test-circle": "npm test && npm run test:e2e",
23-
"pack": "npm run build && electron-builder --dir",
24-
"dist": "npm run build && electron-builder",
25-
"postinstall": "electron-builder install-app-deps"
26-
},
27-
"husky": {
28-
"hooks": {
29-
"pre-commit": "lint-staged"
30-
}
31-
},
32-
"lint-staged": {
33-
"{src,test,mocks}/**/*.{json,css,scss,md}": [
34-
"prettier --config ./.prettierrc --write"
35-
],
36-
"{src,test,mocks}/**/*.{js,ts,tsx}": [
37-
"prettier --config ./.prettierrc --write",
38-
"eslint --ext=jsx,js,ts,tsx --fix src"
39-
]
40-
},
41-
"jest": {
42-
"transform": {
43-
"^.+\\.(j|t)sx?$": "ts-jest"
2+
"name": "breaditor",
3+
"version": "2.0.2",
4+
"description": "",
5+
"main": "./dist/main.js",
6+
"scripts": {
7+
"build-main": "cross-env NODE_ENV=production webpack --config webpack.main.prod.config.js",
8+
"build-renderer": "cross-env NODE_ENV=production webpack --config webpack.renderer.prod.config.js",
9+
"build": "npm run build-main && npm run build-renderer",
10+
"start-renderer-dev": "webpack-dev-server --config webpack.renderer.dev.config.js",
11+
"start-main-dev": "webpack --config webpack.main.config.js && electron ./dist/main.js",
12+
"start-dev": "cross-env NODE_ENV=test START_HOT=1 npm run start-renderer-dev",
13+
"dev": "npm run start-dev",
14+
"prestart": "npm run build",
15+
"start": "electron .",
16+
"lint": "eslint --ext=jsx,js,tsx,ts src",
17+
"lint-fix": "eslint --fix --ext=jsx,js,tsx,ts src",
18+
"test": "jest --detectOpenHandles",
19+
"watch": "jest --detectOpenHandles --watchAll",
20+
"pretest:e2e": "npm run build",
21+
"test:e2e": "jest --testMatch '**/?(*.)+(e2etest).[tj]s?(x)'",
22+
"test-circle": "npm test && npm run test:e2e",
23+
"pack": "npm run build && electron-builder --dir",
24+
"dist": "npm run build && electron-builder",
25+
"postinstall": "electron-builder install-app-deps"
26+
},
27+
"husky": {
28+
"hooks": {
29+
"pre-commit": "lint-staged"
30+
}
31+
},
32+
"lint-staged": {
33+
"{src,test,mocks}/**/*.{json,css,scss,md}": [
34+
"prettier --config ./.prettierrc --write"
35+
],
36+
"{src,test,mocks}/**/*.{js,ts,tsx}": [
37+
"prettier --config ./.prettierrc --write",
38+
"eslint --ext=jsx,js,ts,tsx --fix src"
39+
]
40+
},
41+
"jest": {
42+
"transform": {
43+
"^.+\\.(j|t)sx?$": "ts-jest"
44+
},
45+
"moduleFileExtensions": [
46+
"ts",
47+
"tsx",
48+
"js",
49+
"json",
50+
"node"
51+
],
52+
"moduleNameMapper": {
53+
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/mocks/fileMock.js",
54+
"\\.(s?css|sass)$": "<rootDir>/mocks/styleMock.js"
55+
},
56+
"setupFiles": [
57+
"./setup-jest.js"
58+
]
59+
},
60+
"build": {
61+
"productName": "Breaditor",
62+
"appId": "com.breadbros.breaditor",
63+
"mac": {
64+
"category": "public.app-category.developer-tools"
65+
},
66+
"directories": {
67+
"output": "release"
68+
},
69+
"files": [
70+
"dist/",
71+
"node_modules/",
72+
"package.json"
73+
],
74+
"linux": {
75+
"target": "deb"
76+
},
77+
"win": {
78+
"target": "nsis"
79+
}
4480
},
45-
"moduleFileExtensions": [
46-
"ts",
47-
"tsx",
48-
"js",
49-
"json",
50-
"node"
51-
],
52-
"moduleNameMapper": {
53-
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/mocks/fileMock.js",
54-
"\\.(s?css|sass)$": "<rootDir>/mocks/styleMock.js"
81+
"repository": {
82+
"type": "git",
83+
"url": "git+ssh://[email protected]:Robinfr/electron-react-typescript.git"
5584
},
56-
"setupFiles": [
57-
"./setup-jest.js"
58-
]
59-
},
60-
"build": {
61-
"productName": "Breaditor",
62-
"appId": "com.breadbros.breaditor",
63-
"mac": {
64-
"category": "public.app-category.developer-tools"
85+
"author": {
86+
"name": "Ben McGraw",
87+
"email": "[email protected]"
6588
},
66-
"directories": {
67-
"output": "release"
89+
"license": "MIT License",
90+
"bugs": {
91+
"url": "https://github.com/mcgrue/breaditor/issues"
6892
},
69-
"files": [
70-
"dist/",
71-
"node_modules/",
72-
"package.json"
73-
],
74-
"linux": {
75-
"target": "deb"
93+
"homepage": "https://breaditor.com",
94+
"devDependencies": {
95+
"@babel/core": "^7.4.5",
96+
"@babel/plugin-proposal-class-properties": "^7.4.4",
97+
"@babel/plugin-transform-runtime": "^7.18.6",
98+
"@babel/polyfill": "^7.4.4",
99+
"@babel/preset-env": "^7.4.5",
100+
"@babel/preset-react": "^7.0.0",
101+
"@babel/preset-typescript": "^7.3.3",
102+
"@hot-loader/react-dom": "^16.8.6",
103+
"@types/electron-devtools-installer": "^2.2.0",
104+
"@types/jest": "^24.0.13",
105+
"@types/react": "^16.8.18",
106+
"@types/react-dom": "^16.8.4",
107+
"@types/react-redux": "^7.0.9",
108+
"@types/react-test-renderer": "^16.8.1",
109+
"@types/webdriverio": "^4.8.7",
110+
"@types/webpack-env": "^1.13.3",
111+
"@typescript-eslint/eslint-plugin": "^2.4.0",
112+
"@typescript-eslint/parser": "^2.4.0",
113+
"babel-loader": "^8.0.6",
114+
"clean-webpack-plugin": "^3.0.0",
115+
"copy-webpack-plugin": "^6.3.2",
116+
"cross-env": "^5.1.3",
117+
"css-loader": "^2.1.1",
118+
"electron": "^3.1.9",
119+
"electron-builder": "^22.3.2",
120+
"electron-devtools-installer": "^2.2.4",
121+
"eslint": "^6.5.1",
122+
"eslint-config-airbnb": "^18.0.1",
123+
"eslint-config-prettier": "^6.4.0",
124+
"eslint-plugin-import": "^2.18.2",
125+
"eslint-plugin-jsx-a11y": "^6.2.3",
126+
"eslint-plugin-prettier": "^3.1.1",
127+
"eslint-plugin-react": "^7.16.0",
128+
"eslint-plugin-react-hooks": "^1.7.0",
129+
"file-loader": "^3.0.1",
130+
"fork-ts-checker-webpack-plugin": "^1.3.4",
131+
"html-webpack-plugin": "^3.2.0",
132+
"husky": "^4.2.1",
133+
"image-webpack-loader": "^4.6.0",
134+
"jest": "^24.8.0",
135+
"lint-staged": "^10.0.7",
136+
"node-sass": "^4.12.0",
137+
"prettier": "^1.18.2",
138+
"react-hot-loader": "^4.8.8",
139+
"react-test-renderer": "^16.8.6",
140+
"redux-devtools-extension": "^2.13.5",
141+
"sass-loader": "^7.1.0",
142+
"source-map-loader": "^0.2.4",
143+
"spectron": "^5.0.0",
144+
"style-loader": "^0.23.1",
145+
"ts-jest": "^24.0.2",
146+
"typescript": "^3.4.5",
147+
"webpack": "^4.32.2",
148+
"webpack-cli": "^3.3.2",
149+
"webpack-dev-server": "^3.11.2",
150+
"webpack-merge": "^4.2.1"
76151
},
77-
"win": {
78-
"target": "nsis"
152+
"dependencies": {
153+
"@babel/runtime": "^7.18.6",
154+
"@sphinxxxx/color-conversion": "^2.2.2",
155+
"@types/jquery": "^3.5.5",
156+
"@types/react-panelgroup": "^1.0.1",
157+
"@types/source-map-support": "^0.5.3",
158+
"babel-polyfill": "^6.26.0",
159+
"electron-canvas-to-buffer": "^2.0.0",
160+
"fs-jetpack": "^1.3.1",
161+
"jquery": "^3.6.0",
162+
"lodash": "^4.17.20",
163+
"natives": "^1.1.6",
164+
"pngjs": "^6.0.0",
165+
"react": "^16.8.6",
166+
"react-dom": "^16.8.6",
167+
"react-panelgroup": "^1.0.12",
168+
"react-redux": "^7.0.3",
169+
"redux": "^4.0.1",
170+
"source-map-support": "^0.5.19",
171+
"sprintf-js": "^1.0.3",
172+
"ui-contextmenu": "^1.18.1",
173+
"uuid": "^8.0.0"
79174
}
80-
},
81-
"repository": {
82-
"type": "git",
83-
"url": "git+ssh://[email protected]:Robinfr/electron-react-typescript.git"
84-
},
85-
"author": {
86-
"name": "Ben McGraw",
87-
"email": "[email protected]"
88-
},
89-
"license": "MIT License",
90-
"bugs": {
91-
"url": "https://github.com/mcgrue/breaditor/issues"
92-
},
93-
"homepage": "https://breaditor.com",
94-
"devDependencies": {
95-
"@babel/core": "^7.4.5",
96-
"@babel/plugin-proposal-class-properties": "^7.4.4",
97-
"@babel/polyfill": "^7.4.4",
98-
"@babel/preset-env": "^7.4.5",
99-
"@babel/preset-react": "^7.0.0",
100-
"@babel/preset-typescript": "^7.3.3",
101-
"@hot-loader/react-dom": "^16.8.6",
102-
"@types/electron-devtools-installer": "^2.2.0",
103-
"@types/jest": "^24.0.13",
104-
"@types/react": "^16.8.18",
105-
"@types/react-dom": "^16.8.4",
106-
"@types/react-redux": "^7.0.9",
107-
"@types/react-test-renderer": "^16.8.1",
108-
"@types/webdriverio": "^4.8.7",
109-
"@types/webpack-env": "^1.13.3",
110-
"@typescript-eslint/eslint-plugin": "^2.4.0",
111-
"@typescript-eslint/parser": "^2.4.0",
112-
"babel-loader": "^8.0.6",
113-
"clean-webpack-plugin": "^3.0.0",
114-
"copy-webpack-plugin": "^6.3.2",
115-
"cross-env": "^5.1.3",
116-
"css-loader": "^2.1.1",
117-
"electron": "^3.1.9",
118-
"electron-builder": "^22.3.2",
119-
"electron-devtools-installer": "^2.2.4",
120-
"eslint": "^6.5.1",
121-
"eslint-config-airbnb": "^18.0.1",
122-
"eslint-config-prettier": "^6.4.0",
123-
"eslint-plugin-import": "^2.18.2",
124-
"eslint-plugin-jsx-a11y": "^6.2.3",
125-
"eslint-plugin-prettier": "^3.1.1",
126-
"eslint-plugin-react": "^7.16.0",
127-
"eslint-plugin-react-hooks": "^1.7.0",
128-
"file-loader": "^3.0.1",
129-
"fork-ts-checker-webpack-plugin": "^1.3.4",
130-
"html-webpack-plugin": "^3.2.0",
131-
"husky": "^4.2.1",
132-
"image-webpack-loader": "^4.6.0",
133-
"jest": "^24.8.0",
134-
"lint-staged": "^10.0.7",
135-
"node-sass": "^4.12.0",
136-
"prettier": "^1.18.2",
137-
"react-hot-loader": "^4.8.8",
138-
"react-test-renderer": "^16.8.6",
139-
"redux-devtools-extension": "^2.13.5",
140-
"sass-loader": "^7.1.0",
141-
"source-map-loader": "^0.2.4",
142-
"spectron": "^5.0.0",
143-
"style-loader": "^0.23.1",
144-
"ts-jest": "^24.0.2",
145-
"typescript": "^3.4.5",
146-
"webpack": "^4.32.2",
147-
"webpack-cli": "^3.3.2",
148-
"webpack-dev-server": "^3.11.2",
149-
"webpack-merge": "^4.2.1"
150-
},
151-
"dependencies": {
152-
"@sphinxxxx/color-conversion": "^2.2.2",
153-
"@types/jquery": "^3.5.5",
154-
"@types/react-panelgroup": "^1.0.1",
155-
"@types/source-map-support": "^0.5.3",
156-
"electron-canvas-to-buffer": "^2.0.0",
157-
"fs-jetpack": "^1.3.1",
158-
"jquery": "^3.6.0",
159-
"lodash": "^4.17.20",
160-
"natives": "^1.1.6",
161-
"pngjs": "^6.0.0",
162-
"react": "^16.8.6",
163-
"react-dom": "^16.8.6",
164-
"react-panelgroup": "^1.0.12",
165-
"react-redux": "^7.0.3",
166-
"redux": "^4.0.1",
167-
"source-map-support": "^0.5.19",
168-
"sprintf-js": "^1.0.3",
169-
"ui-contextmenu": "^1.18.1",
170-
"uuid": "^8.0.0"
171-
}
172175
}

0 commit comments

Comments
 (0)