From d4a4100ecb39c683483eac63dc0c3db02f21aa88 Mon Sep 17 00:00:00 2001 From: Kieran Farr Date: Thu, 16 May 2024 08:02:19 -0700 Subject: [PATCH] replace core package.json with editor; add eslintignore --- .eslintignore | 2 + legacy-editor-repo/package.json | 116 ------------------------ package.json | 155 +++++++++++++++++++++----------- 3 files changed, 107 insertions(+), 166 deletions(-) create mode 100644 .eslintignore delete mode 100644 legacy-editor-repo/package.json diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 000000000..1cc754025 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,2 @@ +/src/lib/ +/dist/** \ No newline at end of file diff --git a/legacy-editor-repo/package.json b/legacy-editor-repo/package.json deleted file mode 100644 index d2141eb0b..000000000 --- a/legacy-editor-repo/package.json +++ /dev/null @@ -1,116 +0,0 @@ -{ - "name": "3dstreet-editor", - "version": "0.4.13", - "description": "An open source street editor.", - "main": "dist/3dstreet-editor.js", - "scripts": { - "start:dev": "webpack serve --config webpack.config.js --mode development --open --hot --progress", - "start:prod": "serve dist -l 3333", - "start:build": "webpack --config webpack.prod.config.js --mode production --progress", - "dist": "npm run dist:max && npm run dist:min", - "dist:max": "cross-env MINIFY=false npm run start:build", - "dist:min": "cross-env MINIFY=true npm run start:build", - "lint": "npm run lintfile 'src/**/*.js*'", - "lint:css": "stylelint src/css/main.css", - "lintfile": "eslint", - "prefirebase": "cp -R assets public && cp {index.html,favicon.ico} public && cp -R dist public", - "prepare": "husky install", - "prepublish": "npm run dist", - "prettier": "prettier --write 'src/**/*.js*'", - "test": "jest --watch", - "test:ci": "jest", - "deploy": "npm run prefirebase && cd public && firebase deploy --only hosting:app3dstreet", - "storybook": "storybook dev -p 6006", - "build-storybook": "storybook build" - }, - "repository": "3dstreet/3dstreet-editor", - "license": "AGPLv3", - "dependencies": { - "@types/uuid": "^9.0.0", - "classnames": "^2.3.2", - "clipboard": "^2.0.11", - "date-fns": "^2.30.0", - "dotenv-webpack": "^8.0.1", - "file-loader": "^6.2.0", - "firebase": "^9.23.0", - "lodash-es": "^4.17.21", - "prop-types": "^15.8.1", - "react": "^18.2.0", - "react-dom": "^18.2.0", - "react-ga4": "^2.1.0", - "react-select": "^5.4.0", - "sass": "^1.69.5", - "serve": "^14.2.1", - "three": "0.145.0", - "uuid": "^9.0.0" - }, - "devDependencies": { - "@babel/core": "^7.17.10", - "@babel/eslint-parser": "7.19.1", - "@babel/preset-env": "^7.17.10", - "@babel/preset-react": "^7.17.12", - "@storybook/addon-essentials": "^7.6.3", - "@storybook/addon-interactions": "^7.6.3", - "@storybook/addon-links": "^7.6.3", - "@storybook/addon-onboarding": "^1.0.9", - "@storybook/addon-styling-webpack": "^0.0.5", - "@storybook/blocks": "^7.6.3", - "@storybook/react": "^7.6.3", - "@storybook/react-webpack5": "^7.6.3", - "@storybook/test": "^7.6.3", - "autoprefixer": "^10.4.12", - "babel-jest": "^29.1.2", - "babel-loader": "^8.2.5", - "clean-webpack-plugin": "^4.0.0", - "cross-env": "^7.0.3", - "css-loader": "^6.8.1", - "css-minimizer-webpack-plugin": "^5.0.1", - "eslint": "^8.18.0", - "eslint-config-standard": "^17.0.0", - "eslint-plugin-react": "^7.30.1", - "eslint-plugin-storybook": "^0.6.15", - "html-webpack-plugin": "^5.5.3", - "husky": "^8.0.1", - "jest": "^29.1.2", - "lint-staged": "^13.0.3", - "mini-css-extract-plugin": "^2.7.2", - "node-sass": "^8.0.0", - "postcss-loader": "^7.0.0", - "prettier": "^2.7.1", - "react-test-renderer": "^18.2.0", - "resolve-url-loader": "^5.0.0", - "sass": "^1.69.5", - "sass-loader": "^13.3.2", - "storybook": "^7.6.3", - "style-loader": "^3.3.3", - "stylelint": "^14.13.0", - "stylelint-config-standard": "^28.0.0", - "stylelint-order": "^5.0.0", - "stylus": "^0.59.0", - "stylus-loader": "^7.1.0", - "webpack": "^5.73.0", - "webpack-cli": "^4.10.0", - "webpack-dev-server": "^4.11.0" - }, - "keywords": [ - "3d", - "aframe", - "editor", - "inspector", - "three.js", - "tool", - "unity", - "vr", - "virtualreality", - "webvr", - "wysiwyg" - ], - "lint-staged": { - "*.js*": "prettier --write" - }, - "eslintConfig": { - "extends": [ - "plugin:storybook/recommended" - ] - } -} diff --git a/package.json b/package.json index de6bd5183..440af618a 100644 --- a/package.json +++ b/package.json @@ -2,67 +2,122 @@ "name": "3dstreet", "version": "0.4.15", "description": "Web-based 3D visualization of streets using A-Frame and WebXR", - "main": "dist/aframe-street-component.js", + "main": "dist/3dstreet-editor.js", "scripts": { - "dev": "webpack serve --config webpack.config.js", - "dist": "webpack", + "start": "webpack serve --config webpack.config.js --mode development --open --hot --progress", + "start:prod": "serve dist -l 3333", + "start:build": "webpack --config webpack.prod.config.js --mode production --progress", + "dist": "npm run dist:max && npm run dist:min", + "dist:max": "cross-env MINIFY=false npm run start:build", + "dist:min": "cross-env MINIFY=true npm run start:build", + "lint": "eslint 'src/**/*.js*'", + "lint:fix": "eslint 'src/**/*.js*' --fix", + "prefirebase": "cp -R assets public && cp {index.html,favicon.ico} public && cp -R dist public", + "prepare": "husky install", "prepublish": "npm run dist", + "prettier": "prettier --write 'src/**/*.js*'", "test": "nyc --reporter=lcov --reporter=text mocha --recursive --full-trace", "test:watch": "mocha --recursive --full-trace --watch", - "lint": "semistandard -v | snazzy", - "lint:tested": "semistandard -v 'src/tested/**/*.js' 'test/**/*.js' | snazzy", - "lint:fix": "semistandard --fix", - "start": "npm run dev" + "deploy": "npm run prefirebase && cd public && firebase deploy --only hosting:app3dstreet", + "storybook": "storybook dev -p 6006", + "build-storybook": "storybook build" }, - "repository": { - "type": "git", - "url": "git+https://github.com/kfarr/3dstreet.git" - }, - "keywords": [ - "aframe", - "aframe-component", - "aframe-vr", - "vr", - "webxr" - ], + "repository": "3dstreet/3dstreet", "author": "kieran.farr@gmail.com", + "homepage": "https://github.com/3dstreet/3dstreet/", "license": "AGPLv3", - "bugs": { - "url": "https://github.com/kfarr/3dstreet/issues" - }, - "homepage": "https://github.com/kfarr/3dstreet#readme", - "babel": { - "presets": [ - "@babel/preset-env" - ] - }, - "semistandard": { - "ignore": [ - "/src/lib/", - "/dist/**" - ] + "dependencies": { + "@types/uuid": "^9.0.0", + "classnames": "^2.3.2", + "clipboard": "^2.0.11", + "date-fns": "^2.30.0", + "dotenv-webpack": "^8.0.1", + "file-loader": "^6.2.0", + "firebase": "^9.23.0", + "lodash-es": "^4.17.21", + "prop-types": "^15.8.1", + "react": "^18.2.0", + "react-dom": "^18.2.0", + "react-ga4": "^2.1.0", + "react-select": "^5.4.0", + "sass": "^1.69.5", + "serve": "^14.2.1", + "three": "0.145.0", + "uuid": "^9.0.0", + "aframe-atlas-uvs-component": "^3.0.0" }, "devDependencies": { - "@babel/core": "^7.12.7", - "@babel/preset-env": "^7.12.7", - "approvals": "^6.0.0", - "babel-loader": "^8.2.1", - "jsdom": "^16.2.2", - "jsdom-global": "^3.0.2", + "@babel/core": "^7.17.10", + "@babel/eslint-parser": "7.19.1", + "@babel/preset-env": "^7.17.10", + "@babel/preset-react": "^7.17.12", + "@storybook/addon-essentials": "^7.6.3", + "@storybook/addon-interactions": "^7.6.3", + "@storybook/addon-links": "^7.6.3", + "@storybook/addon-onboarding": "^1.0.9", + "@storybook/addon-styling-webpack": "^0.0.5", + "@storybook/blocks": "^7.6.3", + "@storybook/react": "^7.6.3", + "@storybook/react-webpack5": "^7.6.3", + "@storybook/test": "^7.6.3", + "autoprefixer": "^10.4.12", + "babel-jest": "^29.1.2", + "babel-loader": "^8.2.5", + "clean-webpack-plugin": "^4.0.0", + "cross-env": "^7.0.3", + "css-loader": "^6.8.1", + "css-minimizer-webpack-plugin": "^5.0.1", + "eslint": "^8.18.0", + "eslint-config-standard": "^17.0.0", + "eslint-plugin-react": "^7.30.1", + "eslint-plugin-storybook": "^0.6.15", + "html-webpack-plugin": "^5.5.3", + "husky": "^8.0.1", + "lint-staged": "^13.0.3", + "mini-css-extract-plugin": "^2.7.2", + "node-sass": "^8.0.0", + "postcss-loader": "^7.0.0", + "prettier": "^2.7.1", + "pretty": "^2.0.0", + "resolve-url-loader": "^5.0.0", + "sass": "^1.69.5", + "sass-loader": "^13.3.2", + "storybook": "^7.6.3", + "style-loader": "^3.3.3", + "stylelint": "^14.13.0", + "stylelint-config-standard": "^28.0.0", + "stylelint-order": "^5.0.0", + "stylus": "^0.59.0", + "stylus-loader": "^7.1.0", + "webpack": "^5.73.0", + "webpack-cli": "^4.10.0", + "webpack-dev-server": "^4.11.0", "mocha": "^10.1.0", "nyc": "^15.0.1", - "pretty": "^2.0.0", - "rewire": "^5.0.0", - "semistandard": "^14.2.0", - "snazzy": "^8.0.0", - "terser-webpack-plugin": "^5.3.9", - "webpack": "^5.75.0", - "webpack-cli": "^4.7.0" + "jsdom": "^16.2.2", + "jsdom-global": "^3.0.2", + "approvals": "^6.0.0", + "rewire": "^5.0.0" }, - "dependencies": { - "aframe-atlas-uvs-component": "^3.0.0", - "babel-polyfill": "^6.26.0", - "latest": "^0.2.0", - "webpack-dev-server": "^4.11.0" + "keywords": [ + "3d", + "aframe", + "editor", + "inspector", + "three.js", + "tool", + "unity", + "vr", + "virtualreality", + "webvr", + "wysiwyg" + ], + "lint-staged": { + "*.js*": "prettier --write" + }, + "eslintConfig": { + "extends": [ + "plugin:storybook/recommended" + ] } }