-
Notifications
You must be signed in to change notification settings - Fork 754
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4778 from bdukes/yarn-3
Use Yarn 3
- Loading branch information
Showing
51 changed files
with
25,269 additions
and
24,922 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| nodeLinker: node-modules | ||
| yarnPath: .yarn/releases/yarn-3.0.0.cjs |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6,944 changes: 0 additions & 6,944 deletions
6,944
DNN Platform/Modules/ResourceManager/ResourceManager.Web/yarn.lock
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -55,4 +55,4 @@ | |
| "webpack-cli": "3.1.2", | ||
| "webpack-dev-server": "^3.1.14" | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -69,4 +69,4 @@ | |
| "dependencies": { | ||
| "@dnnsoftware/dnn-react-common": "9.9.1" | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,4 +40,4 @@ | |
| "webpack-cli": "^3.1.2", | ||
| "webpack-dev-server": "^3.1.14" | ||
| } | ||
| } | ||
| } | ||
182 changes: 92 additions & 90 deletions
182
Dnn.AdminExperience/ClientSide/Extensions.Web/webpack.config.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,124 +1,126 @@ | ||
| const webpack = require("webpack"); | ||
| const packageJson = require("./package.json"); | ||
| const path = require("path"); | ||
| const isProduction = process.env.NODE_ENV === "production"; | ||
| const webpackExternals = require("@dnnsoftware/dnn-react-common/WebpackExternals"); | ||
| const settings = require("../../../settings.local.json"); | ||
|
|
||
| module.exports = { | ||
| entry: "./src/main.jsx", | ||
| optimization: { | ||
| const webpack = require("webpack"); | ||
| const packageJson = require("./package.json"); | ||
| const path = require("path"); | ||
| const isProduction = process.env.NODE_ENV === "production"; | ||
| const webpackExternals = require("@dnnsoftware/dnn-react-common/WebpackExternals"); | ||
| const settings = require("../../../settings.local.json"); | ||
|
|
||
| module.exports = { | ||
| entry: "./src/main.jsx", | ||
| optimization: { | ||
| minimize: isProduction | ||
| }, | ||
| output: { | ||
| path: | ||
| isProduction || settings.WebsitePath == "" | ||
| ? path.resolve( | ||
| __dirname, | ||
| "../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/" | ||
| ) | ||
| : settings.WebsitePath + | ||
| "\\DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.Extensions\\scripts\\bundles\\", | ||
| publicPath: isProduction ? "" : "http://localhost:8080/dist/", | ||
| }, | ||
| output: { | ||
| path: | ||
| isProduction || settings.WebsitePath == "" | ||
| ? path.resolve( | ||
| __dirname, | ||
| "../../Dnn.PersonaBar.Extensions/admin/personaBar/Dnn.Extensions/scripts/bundles/" | ||
| ) | ||
| : path.join( | ||
| settings.WebsitePath, | ||
| "DesktopModules\\Admin\\Dnn.PersonaBar\\Modules\\Dnn.Extensions\\scripts\\bundles\\" | ||
| ), | ||
| publicPath: isProduction ? "" : "http://localhost:8080/dist/", | ||
| filename: "extensions-bundle.js" | ||
| }, | ||
| devServer: { | ||
| }, | ||
| devServer: { | ||
| disableHostCheck: !isProduction | ||
| }, | ||
| resolve: { | ||
| extensions: ["*", ".js", ".json", ".jsx"], | ||
| modules: [ | ||
| path.resolve("./src"), // Look in src first | ||
| path.resolve("./node_modules"), // Try local node_modules | ||
| }, | ||
| resolve: { | ||
| extensions: ["*", ".js", ".json", ".jsx"], | ||
| modules: [ | ||
| path.resolve("./src"), // Look in src first | ||
| path.resolve("./node_modules"), // Try local node_modules | ||
| path.resolve("../../../node_modules") // Last fallback to workspaces node_modules | ||
| ] | ||
| }, | ||
| module: { | ||
| rules: [ | ||
| { | ||
| test: /\.(js|jsx)$/, | ||
| exclude: /node_modules/, | ||
| enforce: "pre", | ||
| }, | ||
| module: { | ||
| rules: [ | ||
| { | ||
| test: /\.(js|jsx)$/, | ||
| exclude: /node_modules/, | ||
| enforce: "pre", | ||
| use: ["eslint-loader"] | ||
| }, | ||
| { | ||
| test: /\.less$/, | ||
| use: [ | ||
| { | ||
| }, | ||
| { | ||
| test: /\.less$/, | ||
| use: [ | ||
| { | ||
| loader: "style-loader" // creates style nodes from JS strings | ||
| }, | ||
| { | ||
| loader: "css-loader", // translates CSS into CommonJS | ||
| }, | ||
| { | ||
| loader: "css-loader", // translates CSS into CommonJS | ||
| options: { modules: "global" } | ||
| }, | ||
| { | ||
| }, | ||
| { | ||
| loader: "less-loader" // compiles Less to CSS | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| test: /\.css$/, | ||
| use: [ | ||
| { | ||
| }, | ||
| { | ||
| test: /\.css$/, | ||
| use: [ | ||
| { | ||
| loader: "style-loader" | ||
| }, | ||
| { | ||
| loader: "css-loader", | ||
| }, | ||
| { | ||
| loader: "css-loader", | ||
| options: { modules: "global" } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| test: /\.(js|jsx)$/, | ||
| exclude: /node_modules/, | ||
| use: { | ||
| loader: "babel-loader", | ||
| options: { | ||
| }, | ||
| { | ||
| test: /\.(js|jsx)$/, | ||
| exclude: /node_modules/, | ||
| use: { | ||
| loader: "babel-loader", | ||
| options: { | ||
| presets: ["@babel/preset-env", "@babel/preset-react"] | ||
| } | ||
| } | ||
| }, | ||
| { | ||
| test: /\.(ttf|woff)$/, | ||
| use: { | ||
| }, | ||
| { | ||
| test: /\.(ttf|woff)$/, | ||
| use: { | ||
| loader: "url-loader?limit=8192" | ||
| } | ||
| }, | ||
| { | ||
| test: /\.(gif|png)$/, | ||
| use: { | ||
| }, | ||
| { | ||
| test: /\.(gif|png)$/, | ||
| use: { | ||
| loader: "url-loader?mimetype=image/png" | ||
| } | ||
| }, | ||
| { | ||
| test: /\.woff(2)?(\?v=[0-9].[0-9].[0-9])?$/, | ||
| use: { | ||
| }, | ||
| { | ||
| test: /\.woff(2)?(\?v=[0-9].[0-9].[0-9])?$/, | ||
| use: { | ||
| loader: "url-loader?mimetype=application/font-woff" | ||
| } | ||
| }, | ||
| { | ||
| test: /\.(ttf|eot|svg)(\?v=[0-9].[0-9].[0-9])?$/, | ||
| use: { | ||
| }, | ||
| { | ||
| test: /\.(ttf|eot|svg)(\?v=[0-9].[0-9].[0-9])?$/, | ||
| use: { | ||
| loader: "file-loader?name=[name].[ext]" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| externals: webpackExternals, | ||
|
|
||
| plugins: isProduction | ||
| ? [ | ||
| new webpack.DefinePlugin({ | ||
| VERSION: JSON.stringify(packageJson.version), | ||
| "process.env": { | ||
| }, | ||
| externals: webpackExternals, | ||
|
|
||
| plugins: isProduction | ||
| ? [ | ||
| new webpack.DefinePlugin({ | ||
| VERSION: JSON.stringify(packageJson.version), | ||
| "process.env": { | ||
| NODE_ENV: JSON.stringify("production") | ||
| } | ||
| }) | ||
| ] | ||
| : [ | ||
| new webpack.DefinePlugin({ | ||
| ] | ||
| : [ | ||
| new webpack.DefinePlugin({ | ||
| VERSION: JSON.stringify(packageJson.version) | ||
| }) | ||
| ], | ||
| ], | ||
| devtool: "source-map" | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -74,4 +74,4 @@ | |
| "react-day-picker": "^7.2.4", | ||
| "url-parse": "^1.2.0" | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,4 +76,4 @@ | |
| "dependencies": { | ||
| "html-react-parser": "^0.7.0" | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.