diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4343a6673..fbbc942da 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -43,15 +43,9 @@ jobs: node-version-file: '.nvmrc' - name: Install dependencies run: npm install - - name: Build @maxgraph/core - umd - working-directory: packages/core - run: npm run build - name: Build @maxgraph/core - esm working-directory: packages/core - run: npm run generate-esm - - name: Generate @maxgraph/core types - working-directory: packages/core - run: npm run generate-types + run: npm run build - name: Test @maxgraph/core working-directory: packages/core run: npm test diff --git a/babel.config.js b/babel.config.js deleted file mode 100644 index 3a3083b98..000000000 --- a/babel.config.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - presets: [ - '@babel/preset-env', - '@babel/preset-react', - '@babel/preset-typescript' - ], - plugins: [ - '@babel/plugin-proposal-class-properties' - ] -}; \ No newline at end of file diff --git a/package.json b/package.json index 1dbf7e4f0..10aa3975f 100644 --- a/package.json +++ b/package.json @@ -20,31 +20,15 @@ "prettier": "prettier --write packages/*/src/**/*.ts" }, "devDependencies": { - "@babel/core": "^7.16.0", - "@babel/plugin-proposal-class-properties": "^7.16.0", - "@babel/preset-env": "^7.16.4", - "@babel/preset-react": "^7.16.0", - "@babel/preset-typescript": "^7.16.0", "@lerna/filter-options": "^4.0.0", "@typescript-eslint/eslint-plugin": "^5.39.0", "@typescript-eslint/parser": "^5.39.0", - "babel-loader": "^8.2.3", - "better-docs": "^2.3.2", - "cross-env": "~7.0.3", - "css-loader": "^6.5.1", "eslint": "^8.26.0", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", - "file-loader": "^6.2.0", "lerna": "^4.0.0", "prettier": "^2.7.1", - "style-loader": "^3.3.1", - "typedoc": "^0.23.21", - "typescript": "^4.9.5", - "url-loader": "^4.1.1", - "webpack": "^5.64.4", - "webpack-cli": "^4.9.1", - "webpack-merge": "^5.8.0" + "typescript": "^4.9.5" }, "overrides": { "@types/node": "^16.18.0" diff --git a/packages/core/package.json b/packages/core/package.json index f013cbabd..b84c4cced 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -11,9 +11,8 @@ "graph", "svg" ], - "main": "dist/maxgraph.js", - "module": "dist/esm/index.js", - "types": "dist/types/index.d.ts", + "module": "dist/index.js", + "types": "dist/index.d.ts", "files": [ "css", "dist", @@ -29,19 +28,17 @@ }, "scripts": { "dev": "tsc --watch", - "build": "cross-env NODE_ENV=production webpack --mode=production", + "build": "tsc --version && tsc", "docs:api": "typedoc src/index.ts", - "generate-types": "tsc --version && tsc --emitDeclarationOnly", - "generate-esm": "tsc --version && tsc --emitDeclarationOnly false --declaration false --declarationDir null", - "prepack": "run-s generate-types generate-esm build", + "prepack": "run-s build", "test": "jest" }, "devDependencies": { - "circular-dependency-plugin": "^5.2.2", "jest": "^29.3.1", "jest-environment-jsdom": "^29.3.1", "npm-run-all": "~4.1.5", "ts-jest": "^29.0.3", + "typedoc": "^0.23.21", "typescript": "^4.9.5" }, "sideEffects": true diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json index dc87f39b0..a0b057119 100644 --- a/packages/core/tsconfig.json +++ b/packages/core/tsconfig.json @@ -3,10 +3,9 @@ "compilerOptions": { "allowSyntheticDefaultImports": true, "declaration": true, - "declarationDir": "./dist/types", "declarationMap": false, - "emitDeclarationOnly": true, - "outDir": "./dist/esm", + "emitDeclarationOnly": false, + "outDir": "./dist", "strict": true, "skipLibCheck": false, "forceConsistentCasingInFileNames": true diff --git a/packages/core/webpack.config.js b/packages/core/webpack.config.js deleted file mode 100644 index 5aeadfe4c..000000000 --- a/packages/core/webpack.config.js +++ /dev/null @@ -1,49 +0,0 @@ -const path = require('path'); -const webpack = require('webpack'); -const { merge } = require('webpack-merge'); -const base = require('../../webpack.config'); -const CircularDependencyPlugin = require('circular-dependency-plugin'); - -module.exports = merge(base, { - entry: './src/index.ts', - output: { - filename: 'maxgraph.js', - path: path.resolve(__dirname, 'dist'), - library: 'maxgraph', - libraryTarget: 'umd', - }, - module: { - rules: [ - { - test: /\.(sa|sc|c)ss$/, - use: ['style-loader', 'css-loader'], - }, - { - test: /\.(ico|png|jpg|jpeg|gif|svg|woff|woff2|ttf|eot)$/, - loader: 'url-loader', - options: { - name: 'images/[hash].[ext]', - limit: 10000, - }, - }, - ], - }, - plugins: [ - new webpack.optimize.LimitChunkCountPlugin({ - maxChunks: 1, - }), - new CircularDependencyPlugin({ - // exclude detection of files based on a RegExp - exclude: /a\.js|node_modules/, - // include specific files based on a RegExp - // include: /dir/, - // add errors to webpack instead of warnings - failOnError: true, - // allow import cycles that include an asynchronous import, - // e.g. via import(/* webpackMode: "weak" */ './file.js') - allowAsyncCycles: false, - // set the current working directory for displaying module paths - cwd: process.cwd(), - }), - ], -}); diff --git a/webpack.config.js b/webpack.config.js deleted file mode 100644 index 9d683835b..000000000 --- a/webpack.config.js +++ /dev/null @@ -1,20 +0,0 @@ -module.exports = { - devtool: 'inline-source-map', - module: { - rules: [ - { - test: /\.(js|ts)$/, - use: { - loader: 'babel-loader', - options: { - rootMode: 'upward', - }, - }, - exclude: /node_modules/, - }, - ], - }, - resolve: { - extensions: ['.ts', '.js', '.css'], - }, -};